From b910fd461c52853368155ba3b2b3dce43429e5b2 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Mon, 27 May 2024 15:10:26 +0200
Subject: [PATCH] refactor(caldav)

---
 crates/caldav/src/calendar/mod.rs              |  2 ++
 .../calendar.rs => calendar/resource.rs}       |  0
 .../{routes/calendar.rs => calendar/route.rs}  |  0
 .../src/{routes/event.rs => event/mod.rs}      |  0
 crates/caldav/src/lib.rs                       | 18 ++++++++++--------
 .../principal.rs => principal/mod.rs}          |  2 +-
 crates/caldav/src/resources/mod.rs             |  3 ---
 .../src/{resources/root.rs => root/mod.rs}     |  0
 crates/caldav/src/routes/mod.rs                |  2 --
 9 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 crates/caldav/src/calendar/mod.rs
 rename crates/caldav/src/{resources/calendar.rs => calendar/resource.rs} (100%)
 rename crates/caldav/src/{routes/calendar.rs => calendar/route.rs} (100%)
 rename crates/caldav/src/{routes/event.rs => event/mod.rs} (100%)
 rename crates/caldav/src/{resources/principal.rs => principal/mod.rs} (98%)
 rename crates/caldav/src/{resources/root.rs => root/mod.rs} (100%)
 delete mode 100644 crates/caldav/src/routes/mod.rs

diff --git a/crates/caldav/src/calendar/mod.rs b/crates/caldav/src/calendar/mod.rs
new file mode 100644
index 0000000..e5fe9f1
--- /dev/null
+++ b/crates/caldav/src/calendar/mod.rs
@@ -0,0 +1,2 @@
+pub mod resource;
+pub mod route;
diff --git a/crates/caldav/src/resources/calendar.rs b/crates/caldav/src/calendar/resource.rs
similarity index 100%
rename from crates/caldav/src/resources/calendar.rs
rename to crates/caldav/src/calendar/resource.rs
diff --git a/crates/caldav/src/routes/calendar.rs b/crates/caldav/src/calendar/route.rs
similarity index 100%
rename from crates/caldav/src/routes/calendar.rs
rename to crates/caldav/src/calendar/route.rs
diff --git a/crates/caldav/src/routes/event.rs b/crates/caldav/src/event/mod.rs
similarity index 100%
rename from crates/caldav/src/routes/event.rs
rename to crates/caldav/src/event/mod.rs
diff --git a/crates/caldav/src/lib.rs b/crates/caldav/src/lib.rs
index d3cc7ad..82b4d30 100644
--- a/crates/caldav/src/lib.rs
+++ b/crates/caldav/src/lib.rs
@@ -1,11 +1,10 @@
 use actix_web::http::Method;
 use actix_web::web::{self, Data};
 use actix_web::{guard, HttpResponse, Responder};
-use resources::calendar::CalendarResource;
+use calendar::resource::CalendarResource;
+use principal::PrincipalResource;
 use resources::event::EventResource;
-use resources::principal::PrincipalResource;
-use resources::root::RootResource;
-use routes::{calendar, event};
+use root::RootResource;
 use rustical_auth::CheckAuthentication;
 use rustical_dav::error::Error;
 use rustical_dav::propfind::{handle_propfind, ServicePrefix};
@@ -13,9 +12,12 @@ use rustical_store::calendar::CalendarStore;
 use std::str::FromStr;
 use std::sync::Arc;
 use tokio::sync::RwLock;
+pub mod calendar;
 
+pub mod event;
+pub mod principal;
 pub mod resources;
-pub mod routes;
+pub mod root;
 
 pub struct CalDavContext<C: CalendarStore + ?Sized> {
     pub store: Arc<RwLock<C>>,
@@ -55,11 +57,11 @@ pub fn configure_dav<A: CheckAuthentication, C: CalendarStore + ?Sized>(
     // .service(DavResourceService::<PrincipalResource>::new("/{principal}"))
     .service(
         web::resource("/{principal}/{calendar}")
-            .route(report_method().to(calendar::route_report_calendar::<A, C>))
+            .route(report_method().to(calendar::route::route_report_calendar::<A, C>))
             // .route(web::method(propfind_method()).to(route_propfind::<A, CalendarResource<C>, C>))
             .route(propfind_method().to(handle_propfind::<A, CalendarResource<C>>))
-            .route(mkcol_method().to(calendar::route_mkcol_calendar::<A, C>))
-            .route(web::method(Method::DELETE).to(calendar::delete_calendar::<A, C>)),
+            .route(mkcol_method().to(calendar::route::route_mkcol_calendar::<A, C>))
+            .route(web::method(Method::DELETE).to(calendar::route::delete_calendar::<A, C>)),
     )
     // .service(web::resource("/{principal}/{calendar}").route(route))
     .service(
diff --git a/crates/caldav/src/resources/principal.rs b/crates/caldav/src/principal/mod.rs
similarity index 98%
rename from crates/caldav/src/resources/principal.rs
rename to crates/caldav/src/principal/mod.rs
index 22d3980..e6d993d 100644
--- a/crates/caldav/src/resources/principal.rs
+++ b/crates/caldav/src/principal/mod.rs
@@ -12,7 +12,7 @@ use serde::Serialize;
 use strum::{EnumString, IntoStaticStr, VariantNames};
 use tokio::sync::RwLock;
 
-use super::calendar::CalendarFile;
+use crate::calendar::resource::CalendarFile;
 
 pub struct PrincipalResource<C: CalendarStore + ?Sized> {
     principal: String,
diff --git a/crates/caldav/src/resources/mod.rs b/crates/caldav/src/resources/mod.rs
index 563b948..53f1126 100644
--- a/crates/caldav/src/resources/mod.rs
+++ b/crates/caldav/src/resources/mod.rs
@@ -1,4 +1 @@
-pub mod calendar;
 pub mod event;
-pub mod principal;
-pub mod root;
diff --git a/crates/caldav/src/resources/root.rs b/crates/caldav/src/root/mod.rs
similarity index 100%
rename from crates/caldav/src/resources/root.rs
rename to crates/caldav/src/root/mod.rs
diff --git a/crates/caldav/src/routes/mod.rs b/crates/caldav/src/routes/mod.rs
deleted file mode 100644
index ec0aeac..0000000
--- a/crates/caldav/src/routes/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod calendar;
-pub mod event;