adding card dav and cald dav

src/domain/entities/calendar_event.rs

@@ -10,7 +10,7 @@
  */
 
 use uuid::Uuid;
-use chrono::{DateTime, Utc, Duration};
+use chrono::{DateTime, Utc, Duration, TimeZone};
 use thiserror::Error;
 
 use crate::common::errors::{Result, DomainError, ErrorKind};
@@ -404,11 +404,13 @@ impl CalendarEvent {
             ));
         }
         
+        // Clone the summary before updating the struct
+        let summary_clone = summary.clone();
         self.summary = summary;
         self.updated_at = Utc::now();
         
-        // Update iCalendar data
-        self.update_ical_property("SUMMARY", &self.summary);
+        // Update iCalendar data using the cloned value
+        self.update_ical_property("SUMMARY", &summary_clone);
         
         Ok(())
     }
@@ -613,7 +615,7 @@ impl CalendarEvent {
      */
     pub fn occurs_in_range(&self, start: &DateTime<Utc>, end: &DateTime<Utc>) -> bool {
         // Basic case: event directly overlaps with range
-        if (self.start_time <= *end && self.end_time >= *start) {
+        if self.start_time <= *end && self.end_time >= *start {
             return true;
         }
         
@@ -708,7 +710,7 @@ impl CalendarEvent {
                 .map_err(|_| "Invalid day".to_string())?;
             
             return match chrono::NaiveDate::from_ymd_opt(year, month, day) {
-                Some(date) => Ok(DateTime::<Utc>::from_utc(date.and_hms_opt(0, 0, 0).unwrap(), Utc)),
+                Some(date) => Ok(Utc.from_utc_datetime(&date.and_hms_opt(0, 0, 0).unwrap())),
                 None => Err("Invalid date components".to_string()),
             };
         }
@@ -735,7 +737,7 @@ impl CalendarEvent {
         
         match chrono::NaiveDate::from_ymd_opt(year, month, day) {
             Some(date) => match date.and_hms_opt(hour, minute, second) {
-                Some(datetime) => Ok(DateTime::<Utc>::from_utc(datetime, Utc)),
+                Some(datetime) => Ok(Utc.from_utc_datetime(&datetime)),
                 None => Err("Invalid time components".to_string()),
             },
             None => Err("Invalid date components".to_string()),

src/domain/entities/contact.rs

@@ -0,0 +1,127 @@
+use chrono::{DateTime, NaiveDate, Utc};
+use serde::{Deserialize, Serialize};
+use sqlx::types::Uuid;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct AddressBook {
+    pub id: Uuid,
+    pub name: String,
+    pub owner_id: String,
+    pub description: Option<String>,
+    pub color: Option<String>,
+    pub is_public: bool,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+impl Default for AddressBook {
+    fn default() -> Self {
+        Self {
+            id: Uuid::new_v4(),
+            name: "Default Address Book".to_string(),
+            owner_id: "default".to_string(),
+            description: None,
+            color: None,
+            is_public: false,
+            created_at: Utc::now(),
+            updated_at: Utc::now(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Email {
+    pub email: String,
+    pub r#type: String, // home, work, other
+    pub is_primary: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Phone {
+    pub number: String,
+    pub r#type: String, // mobile, home, work, fax, other
+    pub is_primary: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Address {
+    pub street: Option<String>,
+    pub city: Option<String>,
+    pub state: Option<String>,
+    pub postal_code: Option<String>,
+    pub country: Option<String>,
+    pub r#type: String, // home, work, other
+    pub is_primary: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Contact {
+    pub id: Uuid,
+    pub address_book_id: Uuid,
+    pub uid: String,
+    pub full_name: Option<String>,
+    pub first_name: Option<String>,
+    pub last_name: Option<String>,
+    pub nickname: Option<String>,
+    pub email: Vec<Email>,
+    pub phone: Vec<Phone>,
+    pub address: Vec<Address>,
+    pub organization: Option<String>,
+    pub title: Option<String>,
+    pub notes: Option<String>,
+    pub photo_url: Option<String>,
+    pub birthday: Option<NaiveDate>,
+    pub anniversary: Option<NaiveDate>,
+    pub vcard: String,
+    pub etag: String,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+impl Default for Contact {
+    fn default() -> Self {
+        Self {
+            id: Uuid::new_v4(),
+            address_book_id: Uuid::new_v4(),
+            uid: format!("{}@oxicloud", Uuid::new_v4()),
+            full_name: None,
+            first_name: None,
+            last_name: None,
+            nickname: None,
+            email: Vec::new(),
+            phone: Vec::new(),
+            address: Vec::new(),
+            organization: None,
+            title: None,
+            notes: None,
+            photo_url: None,
+            birthday: None,
+            anniversary: None,
+            vcard: "BEGIN:VCARD\nVERSION:3.0\nEND:VCARD".to_string(),
+            etag: Uuid::new_v4().to_string(),
+            created_at: Utc::now(),
+            updated_at: Utc::now(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ContactGroup {
+    pub id: Uuid,
+    pub address_book_id: Uuid,
+    pub name: String,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
+}
+
+impl Default for ContactGroup {
+    fn default() -> Self {
+        Self {
+            id: Uuid::new_v4(),
+            address_book_id: Uuid::new_v4(),
+            name: "New Group".to_string(),
+            created_at: Utc::now(),
+            updated_at: Utc::now(),
+        }
+    }
+}

src/domain/entities/mod.rs

@@ -1,3 +1,6 @@
+pub mod calendar;
+pub mod calendar_event;
+pub mod contact;
 pub mod file;
 pub mod folder;
 pub mod user;