Refactor store crate

crates/caldav/src/calendar/methods/mkcalendar.rs

@@ -3,7 +3,7 @@ use crate::Error;
 use actix_web::web::{Data, Path};
 use actix_web::HttpResponse;
 use rustical_auth::{AuthInfoExtractor, CheckAuthentication};
-use rustical_store::calendar::Calendar;
+use rustical_store::model::Calendar;
 use rustical_store::CalendarStore;
 use serde::{Deserialize, Serialize};
 

crates/caldav/src/calendar/methods/report/calendar_multiget.rs

@@ -11,7 +11,7 @@ use rustical_dav::{
     resource::HandlePropfind,
     xml::{multistatus::PropstatWrapper, MultistatusElement},
 };
-use rustical_store::{event::Event, CalendarStore};
+use rustical_store::{model::Event, CalendarStore};
 use serde::Deserialize;
 use tokio::sync::RwLock;
 

crates/caldav/src/calendar/methods/report/calendar_query.rs

@@ -4,7 +4,7 @@ use rustical_dav::{
     resource::HandlePropfind,
     xml::{multistatus::PropstatWrapper, MultistatusElement},
 };
-use rustical_store::{event::Event, CalendarStore};
+use rustical_store::{model::Event, CalendarStore};
 use serde::Deserialize;
 use tokio::sync::RwLock;
 

crates/caldav/src/calendar/methods/report/sync_collection.rs

@@ -8,7 +8,7 @@ use rustical_dav::{
     },
 };
 use rustical_store::{
-    calendar::{format_synctoken, parse_synctoken},
+    model::calendar::{format_synctoken, parse_synctoken},
     CalendarStore,
 };
 use serde::Deserialize;

crates/caldav/src/calendar/resource.rs

@@ -5,7 +5,7 @@ use async_trait::async_trait;
 use derive_more::derive::{From, Into};
 use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
 use rustical_dav::xml::HrefElement;
-use rustical_store::calendar::Calendar;
+use rustical_store::model::Calendar;
 use rustical_store::CalendarStore;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;

crates/caldav/src/event/resource.rs

@@ -3,7 +3,7 @@ use actix_web::{web::Data, HttpRequest};
 use async_trait::async_trait;
 use derive_more::derive::{From, Into};
 use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
-use rustical_store::event::Event;
+use rustical_store::model::Event;
 use rustical_store::CalendarStore;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;

crates/store/src/lib.rs

@@ -1,8 +1,7 @@
-pub mod calendar;
 pub mod error;
-pub mod event;
+pub mod model;
 pub mod sqlite_store;
 pub mod store;
-pub mod timestamps;
+pub mod timestamp;
 pub use error::Error;
 pub use store::CalendarStore;

crates/store/src/model/event.rs

@@ -1,5 +1,5 @@
 use crate::{
-    timestamps::{parse_duration, CalDateTime},
+    timestamp::{parse_duration, CalDateTime},
     Error,
 };
 use anyhow::{anyhow, Result};

crates/store/src/model/mod.rs

@@ -0,0 +1,5 @@
+pub mod calendar;
+pub mod event;
+
+pub use calendar::Calendar;
+pub use event::Event;

crates/store/src/sqlite_store.rs

@@ -1,5 +1,5 @@
-use crate::calendar::Calendar;
+use crate::model::Calendar;
-use crate::event::Event;
+use crate::model::Event;
 use crate::{CalendarStore, Error};
 use anyhow::Result;
 use async_trait::async_trait;

crates/store/src/store.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use async_trait::async_trait;
 
 use crate::error::Error;
-use crate::{calendar::Calendar, event::Event};
+use crate::model::{Calendar, Event};
 
 #[async_trait]
 pub trait CalendarStore: Send + Sync + 'static {

crates/store/tests/test_calendar.rs

@@ -26,7 +26,7 @@ async fn test_init<CS: CalendarStore>(_store: CS) {
 #[tokio::test]
 async fn test_create_event<CS: CalendarStore>(mut store: CS) {
     store
-        .insert_calendar(rustical_store::calendar::Calendar {
+        .insert_calendar(rustical_store::model::Calendar {
             id: "test".to_owned(),
             displayname: Some("Test Calendar".to_owned()),
             principal: "testuser".to_owned(),