From acc47e4e24cf48bb8b1948a7446e97026f02fd88 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:23:30 +0200 Subject: [PATCH] Refactor store crate --- crates/caldav/src/calendar/methods/mkcalendar.rs | 2 +- .../caldav/src/calendar/methods/report/calendar_multiget.rs | 2 +- crates/caldav/src/calendar/methods/report/calendar_query.rs | 2 +- crates/caldav/src/calendar/methods/report/sync_collection.rs | 2 +- crates/caldav/src/calendar/resource.rs | 2 +- crates/caldav/src/event/resource.rs | 2 +- crates/store/src/lib.rs | 5 ++--- crates/store/src/{ => model}/calendar.rs | 0 crates/store/src/{ => model}/event.rs | 2 +- crates/store/src/model/mod.rs | 5 +++++ crates/store/src/sqlite_store.rs | 4 ++-- crates/store/src/store.rs | 2 +- crates/store/src/{timestamps.rs => timestamp.rs} | 0 crates/store/tests/test_calendar.rs | 2 +- 14 files changed, 18 insertions(+), 14 deletions(-) rename crates/store/src/{ => model}/calendar.rs (100%) rename crates/store/src/{ => model}/event.rs (98%) create mode 100644 crates/store/src/model/mod.rs rename crates/store/src/{timestamps.rs => timestamp.rs} (100%) diff --git a/crates/caldav/src/calendar/methods/mkcalendar.rs b/crates/caldav/src/calendar/methods/mkcalendar.rs index 543af28..f46adef 100644 --- a/crates/caldav/src/calendar/methods/mkcalendar.rs +++ b/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}; diff --git a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs index d53bc92..184defb 100644 --- a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs +++ b/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; diff --git a/crates/caldav/src/calendar/methods/report/calendar_query.rs b/crates/caldav/src/calendar/methods/report/calendar_query.rs index f0351d0..a34b1c5 100644 --- a/crates/caldav/src/calendar/methods/report/calendar_query.rs +++ b/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; diff --git a/crates/caldav/src/calendar/methods/report/sync_collection.rs b/crates/caldav/src/calendar/methods/report/sync_collection.rs index 68cdad0..596c9d8 100644 --- a/crates/caldav/src/calendar/methods/report/sync_collection.rs +++ b/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; diff --git a/crates/caldav/src/calendar/resource.rs b/crates/caldav/src/calendar/resource.rs index d06da3a..2fd0c87 100644 --- a/crates/caldav/src/calendar/resource.rs +++ b/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; diff --git a/crates/caldav/src/event/resource.rs b/crates/caldav/src/event/resource.rs index a9cb96b..db36514 100644 --- a/crates/caldav/src/event/resource.rs +++ b/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; diff --git a/crates/store/src/lib.rs b/crates/store/src/lib.rs index bf460f5..f3eeafd 100644 --- a/crates/store/src/lib.rs +++ b/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; diff --git a/crates/store/src/calendar.rs b/crates/store/src/model/calendar.rs similarity index 100% rename from crates/store/src/calendar.rs rename to crates/store/src/model/calendar.rs diff --git a/crates/store/src/event.rs b/crates/store/src/model/event.rs similarity index 98% rename from crates/store/src/event.rs rename to crates/store/src/model/event.rs index f77e925..94b84a0 100644 --- a/crates/store/src/event.rs +++ b/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}; diff --git a/crates/store/src/model/mod.rs b/crates/store/src/model/mod.rs new file mode 100644 index 0000000..53a4e42 --- /dev/null +++ b/crates/store/src/model/mod.rs @@ -0,0 +1,5 @@ +pub mod calendar; +pub mod event; + +pub use calendar::Calendar; +pub use event::Event; diff --git a/crates/store/src/sqlite_store.rs b/crates/store/src/sqlite_store.rs index 6a3fe78..873d951 100644 --- a/crates/store/src/sqlite_store.rs +++ b/crates/store/src/sqlite_store.rs @@ -1,5 +1,5 @@ -use crate::calendar::Calendar; -use crate::event::Event; +use crate::model::Calendar; +use crate::model::Event; use crate::{CalendarStore, Error}; use anyhow::Result; use async_trait::async_trait; diff --git a/crates/store/src/store.rs b/crates/store/src/store.rs index 2c3bc67..abf0dc7 100644 --- a/crates/store/src/store.rs +++ b/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 { diff --git a/crates/store/src/timestamps.rs b/crates/store/src/timestamp.rs similarity index 100% rename from crates/store/src/timestamps.rs rename to crates/store/src/timestamp.rs diff --git a/crates/store/tests/test_calendar.rs b/crates/store/tests/test_calendar.rs index b6468b4..b346b12 100644 --- a/crates/store/tests/test_calendar.rs +++ b/crates/store/tests/test_calendar.rs @@ -26,7 +26,7 @@ async fn test_init(_store: CS) { #[tokio::test] async fn test_create_event(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(),