Move properties into separate files

crates/caldav/src/calendar_object/resource.rs

@@ -1,66 +1,14 @@
-// use super::methods::{get_event, put_event};
-use crate::{
-    CalDavPrincipalUri, Error,
-    calendar_object::methods::{get_event, put_event},
-};
-use async_trait::async_trait;
-use axum::{extract::Request, handler::Handler, response::Response};
+use super::prop::*;
+use crate::Error;
 use derive_more::derive::{From, Into};
-use futures_util::future::BoxFuture;
 use rustical_dav::{
-    extensions::{CommonPropertiesExtension, CommonPropertiesProp},
+    extensions::CommonPropertiesExtension,
     privileges::UserPrivilegeSet,
-    resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService},
+    resource::{PrincipalUri, Resource, ResourceName},
     xml::Resourcetype,
 };
-use rustical_ical::{CalendarObject, UtcDateTime};
-use rustical_store::{CalendarStore, auth::User};
-use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
-use serde::{Deserialize, Deserializer};
-use std::{convert::Infallible, sync::Arc};
-use tower::Service;
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq, Hash)]
-pub(crate) struct ExpandElement {
-    #[xml(ty = "attr")]
-    pub(crate) start: UtcDateTime,
-    #[xml(ty = "attr")]
-    pub(crate) end: UtcDateTime,
-}
-
-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Default, Eq, Hash)]
-pub struct CalendarData {
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) comp: Option<()>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) expand: Option<ExpandElement>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) limit_recurrence_set: Option<()>,
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) limit_freebusy_set: Option<()>,
-}
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
-#[xml(unit_variants_ident = "CalendarObjectPropName")]
-pub enum CalendarObjectProp {
-    // WebDAV (RFC 2518)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
-    Getetag(String),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", skip_deserializing)]
-    Getcontenttype(&'static str),
-
-    // CalDAV (RFC 4791)
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    #[xml(prop = "CalendarData")]
-    CalendarData(String),
-}
-
-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
-#[xml(unit_variants_ident = "CalendarObjectPropWrapperName", untagged)]
-pub enum CalendarObjectPropWrapper {
-    CalendarObject(CalendarObjectProp),
-    Common(CommonPropertiesProp),
-}
+use rustical_ical::CalendarObject;
+use rustical_store::auth::User;
 
 #[derive(Clone, From, Into)]
 pub struct CalendarObjectResource {
@@ -130,101 +78,3 @@ impl Resource for CalendarObjectResource {
         ))
     }
 }
-
-fn deserialize_ics_name<'de, D>(deserializer: D) -> Result<String, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let name: String = Deserialize::deserialize(deserializer)?;
-    if let Some(object_id) = name.strip_suffix(".ics") {
-        Ok(object_id.to_owned())
-    } else {
-        Err(serde::de::Error::custom("Missing .ics extension"))
-    }
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct CalendarObjectPathComponents {
-    pub principal: String,
-    pub calendar_id: String,
-    #[serde(deserialize_with = "deserialize_ics_name")]
-    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;
-    type Resource = CalendarObjectResource;
-    type MemberType = CalendarObjectResource;
-    type Error = Error;
-    type Principal = User;
-    type PrincipalUri = CalDavPrincipalUri;
-
-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
-
-    async fn get_resource(
-        &self,
-        CalendarObjectPathComponents {
-            principal,
-            calendar_id,
-            object_id,
-        }: &Self::PathComponents,
-    ) -> Result<Self::Resource, Self::Error> {
-        let object = self
-            .cal_store
-            .get_object(principal, calendar_id, object_id)
-            .await?;
-        Ok(CalendarObjectResource {
-            object,
-            principal: principal.to_owned(),
-        })
-    }
-
-    async fn delete_resource(
-        &self,
-        CalendarObjectPathComponents {
-            principal,
-            calendar_id,
-            object_id,
-        }: &Self::PathComponents,
-        use_trashbin: bool,
-    ) -> Result<(), Self::Error> {
-        self.cal_store
-            .delete_object(principal, calendar_id, object_id, use_trashbin)
-            .await?;
-        Ok(())
-    }
-}
-
-impl<C: CalendarStore> AxumMethods for CalendarObjectResourceService<C> {
-    fn get() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
-        Some(|state, req| {
-            let mut service = Handler::with_state(get_event::<C>, state);
-            Box::pin(Service::call(&mut service, req))
-        })
-    }
-    fn put() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
-        Some(|state, req| {
-            let mut service = Handler::with_state(put_event::<C>, state);
-            Box::pin(Service::call(&mut service, req))
-        })
-    }
-}