Migrate propfind and report to rustical_xml

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

@@ -6,7 +6,7 @@ use actix_web::{
 use calendar_multiget::{handle_calendar_multiget, CalendarMultigetRequest};
 use calendar_query::{handle_calendar_query, CalendarQueryRequest};
 use rustical_store::{auth::User, CalendarStore};
-use serde::{Deserialize, Serialize};
+use rustical_xml::{XmlDeserialize, XmlDocument};
 use sync_collection::{handle_sync_collection, SyncCollectionRequest};
 use tracing::instrument;
 
@@ -14,17 +14,8 @@ mod calendar_multiget;
 mod calendar_query;
 mod sync_collection;
 
-#[derive(Deserialize, Serialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
-pub enum PropQuery {
-    Allprop,
-    Prop,
-    Propname,
-}
-
-#[derive(Deserialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
-pub enum ReportRequest {
+#[derive(XmlDeserialize, XmlDocument, Clone, Debug, PartialEq)]
+pub(crate) enum ReportRequest {
     CalendarMultiget(CalendarMultigetRequest),
     CalendarQuery(CalendarQueryRequest),
     SyncCollection(SyncCollectionRequest),
@@ -43,7 +34,7 @@ pub async fn route_report_calendar<C: CalendarStore + ?Sized>(
         return Err(Error::Unauthorized);
     }
 
-    let request: ReportRequest = quick_xml::de::from_str(&body)?;
+    let request = ReportRequest::parse_str(&body)?;
 
     Ok(match request.clone() {
         ReportRequest::CalendarQuery(cal_query) => {
@@ -81,3 +72,66 @@ pub async fn route_report_calendar<C: CalendarStore + ?Sized>(
         }
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use calendar_query::{CompFilterElement, FilterElement, TimeRangeElement};
+    use rustical_dav::xml::{PropElement, PropfindType, Propname};
+    use rustical_store::calendar::UtcDateTime;
+    use rustical_xml::Value;
+
+    use super::*;
+
+    #[test]
+    fn test_xml_sync_collection() {
+        let report_request = ReportRequest::parse_str(
+            r#"
+            <?xml version='1.0' encoding='UTF-8' ?>
+            <CAL:calendar-query xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav">
+                <prop>
+                    <getetag />
+                </prop>
+                <CAL:filter>
+                    <CAL:comp-filter name="VCALENDAR">
+                        <CAL:comp-filter name="VEVENT">
+                            <CAL:time-range start="20240924T143437Z" />
+                        </CAL:comp-filter>
+                    </CAL:comp-filter>
+                </CAL:filter>
+            </CAL:calendar-query>"#,
+        )
+        .unwrap();
+        assert_eq!(
+            report_request,
+            ReportRequest::CalendarQuery(CalendarQueryRequest {
+                prop: PropfindType::Prop(PropElement {
+                    prop: vec![Propname {
+                        name: "getetag".to_owned()
+                    }]
+                }),
+                filter: Some(FilterElement {
+                    comp_filter: CompFilterElement {
+                        is_not_defined: None,
+                        time_range: None,
+                        prop_filter: vec![],
+                        comp_filter: vec![CompFilterElement {
+                            is_not_defined: None,
+                            time_range: Some(TimeRangeElement {
+                                start: Some(
+                                    <UtcDateTime as Value>::deserialize("20240924T143437Z")
+                                        .unwrap()
+                                ),
+                                end: None
+                            }),
+                            prop_filter: vec![],
+                            comp_filter: vec![],
+                            name: "VEVENT".to_owned()
+                        }],
+                        name: "VCALENDAR".to_owned()
+                    }
+                }),
+                timezone: None,
+            })
+        )
+    }
+}