prop: implement InvalidProperty with Default

crates/caldav/src/calendar/prop.rs

@@ -1,20 +1,20 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct SupportedCalendarComponent {
     #[serde(rename = "@name")]
     pub name: String,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct SupportedCalendarComponentSet {
     #[serde(rename = "C:comp")]
     pub comp: Vec<SupportedCalendarComponent>,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct CalendarData {
     #[serde(rename = "@content-type")]
@@ -32,14 +32,14 @@ impl Default for CalendarData {
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct SupportedCalendarData {
     #[serde(rename = "C:calendar-data", alias = "calendar-data")]
     calendar_data: CalendarData,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct Resourcetype {
     #[serde(rename = "C:calendar", alias = "calendar")]
@@ -47,7 +47,7 @@ pub struct Resourcetype {
     collection: (),
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum ReportMethod {
     CalendarQuery,
@@ -55,14 +55,14 @@ pub enum ReportMethod {
     SyncCollection,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct ReportWrapper {
     #[serde(rename = "$value")]
     report: ReportMethod,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct SupportedReportWrapper {
     report: ReportWrapper,
@@ -77,7 +77,7 @@ impl From<ReportMethod> for SupportedReportWrapper {
 }
 
 // RFC 3253 section-3.1.5
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct SupportedReportSet {
     supported_report: Vec<SupportedReportWrapper>,

crates/caldav/src/calendar/resource.rs

@@ -12,10 +12,10 @@ use actix_web::http::Method;
 use actix_web::web;
 use actix_web::{web::Data, HttpRequest};
 use async_trait::async_trait;
-use derive_more::derive::{From, Into, TryInto};
+use derive_more::derive::{From, Into};
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
+use rustical_dav::resource::{Resource, ResourceService};
 use rustical_store::auth::User;
 use rustical_store::{Calendar, CalendarStore};
 use serde::{Deserialize, Serialize};
@@ -47,7 +47,7 @@ pub enum CalendarPropName {
     Getctag,
 }
 
-#[derive(Deserialize, Serialize, From, TryInto)]
+#[derive(Default, Deserialize, Serialize, From, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum CalendarProp {
     // WebDAV (RFC 2518)
@@ -84,19 +84,13 @@ pub enum CalendarProp {
 
     #[serde(skip_deserializing, untagged)]
     #[from]
-    #[try_into]
     ExtCommonProperties(CommonPropertiesProp<Resourcetype>),
 
     #[serde(untagged)]
+    #[default]
     Invalid,
 }
 
-impl InvalidProperty for CalendarProp {
-    fn invalid_property(&self) -> bool {
-        matches!(self, Self::Invalid)
-    }
-}
-
 #[derive(Clone, Debug, From, Into)]
 pub struct CalendarResource(Calendar);
 

crates/caldav/src/calendar_object/resource.rs

@@ -2,11 +2,11 @@ use super::methods::{get_event, put_event};
 use crate::{principal::PrincipalResource, Error};
 use actix_web::{dev::ResourceMap, web::Data, HttpRequest};
 use async_trait::async_trait;
-use derive_more::derive::{From, Into, TryInto};
+use derive_more::derive::{From, Into};
 use rustical_dav::{
     extensions::CommonPropertiesProp,
     privileges::UserPrivilegeSet,
-    resource::{InvalidProperty, Resource, ResourceService},
+    resource::{Resource, ResourceService},
 };
 use rustical_store::{auth::User, CalendarObject, CalendarStore};
 use serde::{Deserialize, Serialize};
@@ -29,7 +29,7 @@ pub enum CalendarObjectPropName {
     Getcontenttype,
 }
 
-#[derive(Deserialize, Serialize, From, TryInto)]
+#[derive(Default, Deserialize, Serialize, From, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum CalendarObjectProp {
     // WebDAV (RFC 2518)
@@ -42,19 +42,13 @@ pub enum CalendarObjectProp {
 
     #[serde(skip_deserializing, untagged)]
     #[from]
-    #[try_into]
     ExtCommonProperties(CommonPropertiesProp<Resourcetype>),
 
     #[serde(untagged)]
+    #[default]
     Invalid,
 }
 
-impl InvalidProperty for CalendarObjectProp {
-    fn invalid_property(&self) -> bool {
-        matches!(self, Self::Invalid)
-    }
-}
-
 #[derive(Clone, From, Into)]
 pub struct CalendarObjectResource {
     pub object: CalendarObject,
@@ -62,7 +56,7 @@ pub struct CalendarObjectResource {
 }
 
 // TODO: set correct resourcetype
-#[derive(Debug, Clone, Deserialize, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct Resourcetype {
     collection: (),

crates/caldav/src/principal/mod.rs

@@ -4,10 +4,10 @@ use actix_web::dev::ResourceMap;
 use actix_web::web::Data;
 use actix_web::HttpRequest;
 use async_trait::async_trait;
-use derive_more::derive::{From, TryInto};
+use derive_more::derive::From;
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
+use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml::HrefElement;
 use rustical_store::auth::User;
 use rustical_store::CalendarStore;
@@ -25,14 +25,14 @@ pub struct PrincipalResource {
     principal: String,
 }
 
-#[derive(Deserialize, Serialize, Default, Debug)]
+#[derive(Deserialize, Serialize, Default, Debug, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct Resourcetype {
     principal: (),
     collection: (),
 }
 
-#[derive(Deserialize, Serialize, From, TryInto)]
+#[derive(Default, Deserialize, Serialize, From, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
@@ -47,19 +47,13 @@ pub enum PrincipalProp {
 
     #[serde(skip_deserializing, untagged)]
     #[from]
-    #[try_into]
     ExtCommonProperties(CommonPropertiesProp<Resourcetype>),
 
     #[serde(untagged)]
+    #[default]
     Invalid,
 }
 
-impl InvalidProperty for PrincipalProp {
-    fn invalid_property(&self) -> bool {
-        matches!(self, Self::Invalid)
-    }
-}
-
 #[derive(EnumString, VariantNames, Clone)]
 #[strum(serialize_all = "kebab-case")]
 pub enum PrincipalPropName {