dav: Make the get_members function more ergonomic

crates/caldav/src/calendar/resource.rs

@@ -15,7 +15,7 @@ use rustical_dav::extensions::{
     CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
 use rustical_dav_push::DavPushExtension;
 use rustical_ical::CalDateTime;
@@ -83,6 +83,12 @@ pub struct CalendarResource {
     pub read_only: bool,
 }
 
+impl ResourceName for CalendarResource {
+    fn get_name(&self) -> String {
+        self.cal.id.to_owned()
+    }
+}
+
 impl From<CalendarResource> for Calendar {
     fn from(value: CalendarResource) -> Self {
         value.cal
@@ -360,20 +366,15 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
     async fn get_members(
         &self,
         (principal, cal_id): &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         Ok(self
             .cal_store
             .get_objects(principal, cal_id)
             .await?
             .into_iter()
-            .map(|object| {
-                (
-                    format!("{}.ics", object.get_id()),
-                    CalendarObjectResource {
-                        object,
-                        principal: principal.to_owned(),
-                    },
-                )
+            .map(|object| CalendarObjectResource {
+                object,
+                principal: principal.to_owned(),
             })
             .collect())
     }

crates/caldav/src/calendar_object/resource.rs

@@ -10,7 +10,7 @@ use futures_util::future::BoxFuture;
 use rustical_dav::{
     extensions::{CommonPropertiesExtension, CommonPropertiesProp},
     privileges::UserPrivilegeSet,
-    resource::{AxumMethods, PrincipalUri, Resource, ResourceService},
+    resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService},
     xml::Resourcetype,
 };
 use rustical_ical::{CalendarObject, UtcDateTime};
@@ -20,24 +20,6 @@ use serde::{Deserialize, Deserializer};
 use std::{convert::Infallible, sync::Arc};
 use tower::Service;
 
-pub struct CalendarObjectResourceService<C: CalendarStore> {
-    pub(crate) cal_store: Arc<C>,
-}
-
-impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
-    fn clone(&self) -> Self {
-        Self {
-            cal_store: self.cal_store.clone(),
-        }
-    }
-}
-
-impl<C: CalendarStore> CalendarObjectResourceService<C> {
-    pub fn new(cal_store: Arc<C>) -> Self {
-        Self { cal_store }
-    }
-}
-
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq, Hash)]
 pub(crate) struct ExpandElement {
     #[xml(ty = "attr")]
@@ -86,6 +68,12 @@ pub struct CalendarObjectResource {
     pub principal: String,
 }
 
+impl ResourceName for CalendarObjectResource {
+    fn get_name(&self) -> String {
+        format!("{}.ics", self.object.get_id())
+    }
+}
+
 impl Resource for CalendarObjectResource {
     type Prop = CalendarObjectPropWrapper;
     type Error = Error;
@@ -163,6 +151,24 @@ pub struct CalendarObjectPathComponents {
     pub object_id: String,
 }
 
+pub struct CalendarObjectResourceService<C: CalendarStore> {
+    pub(crate) cal_store: Arc<C>,
+}
+
+impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
+    fn clone(&self) -> Self {
+        Self {
+            cal_store: self.cal_store.clone(),
+        }
+    }
+}
+
+impl<C: CalendarStore> CalendarObjectResourceService<C> {
+    pub fn new(cal_store: Arc<C>) -> Self {
+        Self { cal_store }
+    }
+}
+
 #[async_trait]
 impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
     type PathComponents = CalendarObjectPathComponents;

crates/caldav/src/calendar_set/mod.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use rustical_dav::xml::{Resourcetype, ResourcetypeInner};
 use rustical_store::auth::User;
 use rustical_store::{CalendarStore, SubscriptionStore};
@@ -15,6 +15,13 @@ use std::sync::Arc;
 pub struct CalendarSetResource {
     pub(crate) principal: String,
     pub(crate) read_only: bool,
+    pub(crate) name: &'static str,
+}
+
+impl ResourceName for CalendarSetResource {
+    fn get_name(&self) -> String {
+        self.name.to_owned()
+    }
 }
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
@@ -105,24 +112,20 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarSetReso
         Ok(CalendarSetResource {
             principal: principal.to_owned(),
             read_only: self.cal_store.is_read_only(),
+            name: self.name,
         })
     }
 
     async fn get_members(
         &self,
         (principal,): &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         let calendars = self.cal_store.get_calendars(principal).await?;
         Ok(calendars
             .into_iter()
-            .map(|cal| {
-                (
-                    cal.id.to_owned(),
-                    CalendarResource {
-                        cal,
-                        read_only: self.cal_store.is_read_only(),
-                    },
-                )
+            .map(|cal| CalendarResource {
+                cal,
+                read_only: self.cal_store.is_read_only(),
             })
             .collect())
     }

crates/caldav/src/principal/mod.rs

@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use axum::Router;
 use rustical_dav::extensions::{CommonPropertiesExtension, CommonPropertiesProp};
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
+use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
 use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
 use rustical_store::auth::user::PrincipalType;
 use rustical_store::auth::{AuthenticationProvider, User};
@@ -18,6 +18,12 @@ pub struct PrincipalResource {
     home_set: &'static [&'static str],
 }
 
+impl ResourceName for PrincipalResource {
+    fn get_name(&self) -> String {
+        self.principal.id.to_owned()
+    }
+}
+
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
 pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] Vec<HrefElement>);
 
@@ -176,22 +182,18 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore, BS: Ca
     async fn get_members(
         &self,
         (principal,): &Self::PathComponents,
-    ) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
+    ) -> Result<Vec<Self::MemberType>, Self::Error> {
         Ok(vec![
-            (
-                "calendar".to_owned(),
-                CalendarSetResource {
-                    principal: principal.to_owned(),
-                    read_only: false,
-                },
-            ),
-            (
-                "birthdays".to_owned(),
-                CalendarSetResource {
-                    principal: principal.to_owned(),
-                    read_only: true,
-                },
-            ),
+            CalendarSetResource {
+                name: "calendar",
+                principal: principal.to_owned(),
+                read_only: false,
+            },
+            CalendarSetResource {
+                name: "birthdays",
+                principal: principal.to_owned(),
+                read_only: true,
+            },
         ])
     }