birthday calendar, lots of refactoring

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

@@ -1,6 +1,5 @@
 use crate::{
     calendar_object::resource::{CalendarObjectProp, CalendarObjectResource},
-    principal::PrincipalResource,
     Error,
 };
 use actix_web::{
@@ -27,13 +26,12 @@ pub(crate) struct CalendarMultigetRequest {
 
 pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
     cal_query: &CalendarMultigetRequest,
-    principal_url: &str,
+    path: &str,
     principal: &str,
     cal_id: &str,
     store: &C,
 ) -> Result<(Vec<CalendarObject>, Vec<String>), Error> {
-    let resource_def =
-        ResourceDef::prefix(principal_url).join(&ResourceDef::new("/{cal_id}/{object_id}"));
+    let resource_def = ResourceDef::prefix(path).join(&ResourceDef::new("/{object_id}"));
 
     let mut result = vec![];
     let mut not_found = vec![];
@@ -43,9 +41,6 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore + ?Sized>(
         if !resource_def.capture_match_info(&mut path) {
             not_found.push(href.to_owned());
         };
-        if path.get("cal_id").unwrap() != cal_id {
-            not_found.push(href.to_owned());
-        }
         let object_id = path.get("object_id").unwrap();
         match store.get_object(principal, cal_id, object_id).await {
             Ok(object) => result.push(object),
@@ -66,9 +61,8 @@ pub async fn handle_calendar_multiget<C: CalendarStore + ?Sized>(
     cal_store: &C,
 ) -> Result<MultistatusElement<EitherProp<CalendarObjectProp, CommonPropertiesProp>, String>, Error>
 {
-    let principal_url = PrincipalResource::get_url(req.resource_map(), vec![principal]).unwrap();
     let (objects, not_found) =
-        get_objects_calendar_multiget(&cal_multiget, &principal_url, principal, cal_id, cal_store)
+        get_objects_calendar_multiget(&cal_multiget, req.path(), principal, cal_id, cal_store)
             .await?;
 
     let props = match cal_multiget.prop {

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

@@ -110,8 +110,7 @@ impl CompFilterElement {
         if self
             .comp_filter
             .iter()
-            .map(|filter| filter.matches(cal_object))
-            .all(|x| x)
+            .all(|filter| filter.matches(cal_object))
         {
             return true;
         }
@@ -215,11 +214,7 @@ pub async fn handle_calendar_query<C: CalendarStore + ?Sized>(
 
     let mut responses = Vec::new();
     for object in objects {
-        let path = CalendarObjectResource::get_url(
-            req.resource_map(),
-            vec![principal, cal_id, object.get_id()],
-        )
-        .unwrap();
+        let path = format!("{}/{}", req.path().trim_end_matches('/'), object.get_id());
         responses.push(
             CalendarObjectResource {
                 object,

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

@@ -86,11 +86,7 @@ pub async fn handle_sync_collection<C: CalendarStore + ?Sized>(
 
     let mut responses = Vec::new();
     for object in new_objects {
-        let path = CalendarObjectResource::get_url(
-            req.resource_map(),
-            vec![principal, cal_id, &object.get_id()],
-        )
-        .unwrap();
+        let path = format!("{}/{}", req.path().trim_end_matches('/'), object.get_id());
         responses.push(
             CalendarObjectResource {
                 object,
@@ -101,11 +97,7 @@ pub async fn handle_sync_collection<C: CalendarStore + ?Sized>(
     }
 
     for object_id in deleted_objects {
-        let path = CalendarObjectResource::get_url(
-            req.resource_map(),
-            vec![principal, cal_id, &object_id],
-        )
-        .unwrap();
+        let path = format!("{}/{}", req.path().trim_end_matches('/'), object_id);
         responses.push(ResponseElement {
             href: path,
             status: Some(StatusCode::NOT_FOUND),

crates/caldav/src/calendar/resource.rs

@@ -22,16 +22,6 @@ use std::str::FromStr;
 use std::sync::Arc;
 use strum::{EnumDiscriminants, EnumString, IntoStaticStr, VariantNames};
 
-pub struct CalendarResourceService<C: CalendarStore + ?Sized> {
-    cal_store: Arc<C>,
-}
-
-impl<C: CalendarStore + ?Sized> CalendarResourceService<C> {
-    pub fn new(cal_store: Arc<C>) -> Self {
-        Self { cal_store }
-    }
-}
-
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, EnumDiscriminants, Clone)]
 #[strum_discriminants(
     name(CalendarPropName),
@@ -122,7 +112,7 @@ impl Resource for CalendarResource {
 
     fn get_prop(
         &self,
-        rmap: &ResourceMap,
+        _rmap: &ResourceMap,
         _user: &User,
         prop: &Self::PropName,
     ) -> Result<Self::Prop, Self::Error> {
@@ -153,8 +143,9 @@ impl Resource for CalendarResource {
             CalendarPropName::Transports => CalendarProp::Transports(Default::default()),
             CalendarPropName::Topic => {
                 // TODO: Add salt since this could be public
-                let url =
-                    CalendarResource::get_url(rmap, [&self.cal.principal, &self.cal.id]).unwrap();
+                // let url =
+                //     CalendarResource::get_url(rmap, [&self.cal.principal, &self.cal.id]).unwrap();
+                let url = "TODO!".to_owned();
                 let mut hasher = Sha256::new();
                 hasher.update(url);
                 let topic = format!("{:x}", hasher.finalize());
@@ -263,11 +254,6 @@ impl Resource for CalendarResource {
         }
     }
 
-    #[inline]
-    fn resource_name() -> &'static str {
-        "caldav_calendar"
-    }
-
     fn get_owner(&self) -> Option<&str> {
         Some(&self.cal.principal)
     }
@@ -281,6 +267,16 @@ impl Resource for CalendarResource {
     }
 }
 
+pub struct CalendarResourceService<C: CalendarStore + ?Sized> {
+    cal_store: Arc<C>,
+}
+
+impl<C: CalendarStore + ?Sized> CalendarResourceService<C> {
+    pub fn new(cal_store: Arc<C>) -> Self {
+        Self { cal_store }
+    }
+}
+
 #[async_trait(?Send)]
 impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
     type MemberType = CalendarObjectResource;
@@ -292,11 +288,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
         &self,
         (principal, cal_id): &Self::PathComponents,
     ) -> Result<Self::Resource, Error> {
-        let calendar = self
-            .cal_store
-            .get_calendar(principal, cal_id)
-            .await
-            .map_err(|_e| Error::NotFound)?;
+        let calendar = self.cal_store.get_calendar(principal, cal_id).await?;
         Ok(CalendarResource {
             cal: calendar,
             read_only: self.cal_store.is_read_only(),
@@ -306,7 +298,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
     async fn get_members(
         &self,
         (principal, cal_id): &Self::PathComponents,
-        rmap: &ResourceMap,
     ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
         Ok(self
             .cal_store
@@ -315,8 +306,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
             .into_iter()
             .map(|object| {
                 (
-                    CalendarObjectResource::get_url(rmap, vec![principal, cal_id, object.get_id()])
-                        .unwrap(),
+                    object.get_id().to_string(),
                     CalendarObjectResource {
                         object,
                         principal: principal.to_owned(),