Migrate propfind and report to rustical_xml

crates/carddav/src/addressbook/methods/report/sync_collection.rs

@@ -13,28 +13,42 @@ use rustical_store::{
     synctoken::{format_synctoken, parse_synctoken},
     AddressbookStore,
 };
-use serde::Deserialize;
+use rustical_xml::{Value, XmlDeserialize};
 
-#[derive(Deserialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
-enum SyncLevel {
-    #[serde(rename = "1")]
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) enum SyncLevel {
     One,
     Infinity,
 }
 
-#[derive(Deserialize, Clone, Debug)]
-#[serde(rename_all = "kebab-case")]
-#[allow(dead_code)]
+impl Value for SyncLevel {
+    fn deserialize(val: &str) -> Result<Self, rustical_xml::XmlDeError> {
+        Ok(match val {
+            "1" => Self::One,
+            "Infinity" => Self::Infinity,
+            // TODO: proper error
+            _ => return Err(rustical_xml::XmlDeError::UnknownError),
+        })
+    }
+    fn serialize(&self) -> String {
+        match self {
+            SyncLevel::One => "1",
+            SyncLevel::Infinity => "Infinity",
+        }
+        .to_owned()
+    }
+}
+
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 // <!ELEMENT sync-collection (sync-token, sync-level, limit?, prop)>
 //    <!-- DAV:limit defined in RFC 5323, Section 5.17 -->
 //    <!-- DAV:prop defined in RFC 4918, Section 14.18 -->
-pub struct SyncCollectionRequest {
-    sync_token: String,
-    sync_level: SyncLevel,
-    #[serde(flatten)]
+pub(crate) struct SyncCollectionRequest {
+    pub(crate) sync_token: String,
+    pub(crate) sync_level: SyncLevel,
+    #[xml(ty = "untagged")]
     pub prop: PropfindType,
-    limit: Option<u64>,
+    pub(crate) limit: Option<u64>,
 }
 
 pub async fn handle_sync_collection<AS: AddressbookStore + ?Sized>(
@@ -53,7 +67,10 @@ pub async fn handle_sync_collection<AS: AddressbookStore + ?Sized>(
         PropfindType::Propname => {
             vec!["propname".to_owned()]
         }
-        PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags.into_inner(),
+        PropfindType::Prop(PropElement { prop: prop_tags }) => prop_tags
+            .into_iter()
+            .map(|propname| propname.name)
+            .collect(),
     };
     let props: Vec<&str> = props.iter().map(String::as_str).collect();