From 6b8af308edd6d86a5372d389d712fd3279c3b312 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Tue, 31 Dec 2024 20:12:03 +0100
Subject: [PATCH] Add namespaces

---
 crates/caldav/src/calendar/prop.rs     | 13 ++++++-------
 crates/caldav/src/calendar/resource.rs |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/crates/caldav/src/calendar/prop.rs b/crates/caldav/src/calendar/prop.rs
index 5eb38a2..54aff13 100644
--- a/crates/caldav/src/calendar/prop.rs
+++ b/crates/caldav/src/calendar/prop.rs
@@ -1,14 +1,13 @@
-use rustical_xml::XmlSerialize;
+use rustical_xml::{XmlDeserialize, XmlSerialize};
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlDeserialize, XmlSerialize, PartialEq)]
 pub struct SupportedCalendarComponent {
     #[xml(ty = "attr")]
     pub name: String,
 }
 
-#[derive(Debug, Clone, XmlSerialize, PartialEq)]
+#[derive(Debug, Clone, XmlDeserialize, XmlSerialize, PartialEq)]
 pub struct SupportedCalendarComponentSet {
-    // #[serde(rename = "C:comp")]
     #[xml(flatten)]
     pub comp: Vec<SupportedCalendarComponent>,
 }
@@ -32,7 +31,7 @@ impl Default for CalendarData {
 
 #[derive(Debug, Clone, XmlSerialize, Default, PartialEq)]
 pub struct SupportedCalendarData {
-    // #[serde(rename = "C:calendar-data", alias = "calendar-data")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     calendar_data: CalendarData,
 }
 
@@ -75,7 +74,7 @@ impl Default for SupportedReportSet {
 
 #[derive(Debug, Clone, XmlSerialize, PartialEq)]
 pub enum Transport {
-    // #[serde(rename = "P:web-push")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
     WebPush,
 }
 
@@ -90,8 +89,8 @@ pub struct Transports {
     // NOTE: Here we implement an older version of the spec since the new property name is not reflected
     // in DAVx5 yet
     // https://github.com/bitfireAT/webdav-push/commit/461259a2f2174454b2b00033419b11fac52b79e3
-    // #[serde(rename = "P:transport")]
     #[xml(flatten, rename = b"transport")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
     transports: Vec<TransportWrapper>,
 }
 
diff --git a/crates/caldav/src/calendar/resource.rs b/crates/caldav/src/calendar/resource.rs
index 8b59c6b..dc9075a 100644
--- a/crates/caldav/src/calendar/resource.rs
+++ b/crates/caldav/src/calendar/resource.rs
@@ -64,7 +64,6 @@ pub enum CalendarProp {
     CalendarOrder(Option<i64>),
     // TODO: Re-add
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    #[xml(skip_deserializing)]
     SupportedCalendarComponentSet(SupportedCalendarComponentSet),
     #[xml(skip_deserializing)]
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]