From ff0c5697cf6f5e730bc7c10b70b1f5c9bdaba6d2 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Wed, 31 Dec 2025 19:47:13 +0100
Subject: [PATCH] caldav expand: accept <prop>

---
 crates/caldav/src/calendar/methods/report/mod.rs | 2 +-
 crates/caldav/src/calendar_object/prop.rs        | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/caldav/src/calendar/methods/report/mod.rs b/crates/caldav/src/calendar/methods/report/mod.rs
index 4d7ef6b..b6b4bce 100644
--- a/crates/caldav/src/calendar/methods/report/mod.rs
+++ b/crates/caldav/src/calendar/methods/report/mod.rs
@@ -174,7 +174,7 @@ mod tests {
                 prop: rustical_dav::xml::PropfindType::Prop(PropElement(vec![
                     CalendarObjectPropWrapperName::CalendarObject(CalendarObjectPropName::Getetag),
                     CalendarObjectPropWrapperName::CalendarObject(CalendarObjectPropName::CalendarData(
-                        CalendarData { comp: None, expand: Some(ExpandElement {
+                        CalendarData { comp: None, prop: None, expand: Some(ExpandElement {
                         start: <UtcDateTime as ValueDeserialize>::deserialize("20250426T220000Z").unwrap(),
                         end: <UtcDateTime as ValueDeserialize>::deserialize("20250503T220000Z").unwrap(),
                     }), limit_recurrence_set: None, limit_freebusy_set: None }
diff --git a/crates/caldav/src/calendar_object/prop.rs b/crates/caldav/src/calendar_object/prop.rs
index bea5c68..68058c2 100644
--- a/crates/caldav/src/calendar_object/prop.rs
+++ b/crates/caldav/src/calendar_object/prop.rs
@@ -1,6 +1,6 @@
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_ical::UtcDateTime;
-use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
+use rustical_xml::{EnumVariants, PropName, Unparsed, XmlDeserialize, XmlSerialize};
 
 #[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarObjectPropName")]
@@ -35,7 +35,9 @@ pub struct ExpandElement {
 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Default, Eq, Hash)]
 pub struct CalendarData {
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) comp: Option<()>,
+    pub(crate) comp: Option<Unparsed>,
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    pub(crate) prop: Option<Unparsed>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
     pub(crate) expand: Option<ExpandElement>,
     #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]