refactor(apple-calendar): improve naming and structure for EventKit data models

- Rename EventFilter.calendar_tracking_id -> calendar_identifier
- Rename AppleCalendar.id -> calendar_identifier
- Rename CalendarRef -> CalendarSummary with id -> calendar_identifier
- Make event_identifier Option<String> (can be nil for unsaved events)
- Rename external_identifier -> calendar_item_external_identifier (Option<String>)
- Remove redundant occurrence_date and is_detached from AppleEvent (kept in RecurrenceInfo.occurrence)
- Rename Alarm.relative_offset -> relative_offset_seconds for clarity
- Update all transform files and frontend code to use new field names

Co-Authored-By: yujonglee <yujonglee.dev@gmail.com>

Author: devin-ai-integration[bot]

apps/desktop/src/components/settings/calendar/configure/apple.tsx

@@ -181,11 +181,11 @@ function useAppleCalendarSelection() {
     }
 
     for (const cal of appleCalendars) {
-      const existing = calendarsTable[cal.id];
+      const existing = calendarsTable[cal.calendar_identifier];
       if (!existing) {
-        createCalendarRow({ id: cal.id, name: cal.title });
+        createCalendarRow({ id: cal.calendar_identifier, name: cal.title });
       } else if (existing.name !== cal.title) {
-        updateCalendarName({ id: cal.id, name: cal.title });
+        updateCalendarName({ id: cal.calendar_identifier, name: cal.title });
       }
     }
   }, [
@@ -208,7 +208,7 @@ function useAppleCalendarSelection() {
         grouped.set(sourceTitle, []);
       }
       grouped.get(sourceTitle)!.push({
-        id: cal.id,
+        id: cal.calendar_identifier,
         title: cal.title,
         color: appleColorToCss(cal.color),
       });

plugins/apple-calendar/src/apple/handle.rs

@@ -31,7 +31,7 @@ impl Handle {
             .into_iter()
             .filter(|c| {
                 let id = unsafe { c.calendarIdentifier() }.to_string();
-                filter.calendar_tracking_id.eq(&id)
+                filter.calendar_identifier.eq(&id)
             })
             .collect();
 
@@ -91,7 +91,7 @@ impl Handle {
                 let calendar = unsafe { event.calendar() }?;
                 let calendar_id = unsafe { calendar.calendarIdentifier() };
 
-                if !filter.calendar_tracking_id.eq(&calendar_id.to_string()) {
+                if !filter.calendar_identifier.eq(&calendar_id.to_string()) {
                     return None;
                 }
 

plugins/apple-calendar/src/apple/transforms/alarm.rs

@@ -65,7 +65,7 @@ pub fn transform_alarm(alarm: &EKAlarm) -> Alarm {
 
     Alarm {
         absolute_date,
-        relative_offset,
+        relative_offset_seconds: relative_offset,
         proximity,
         alarm_type,
         email_address,

plugins/apple-calendar/src/apple/transforms/calendar.rs

@@ -8,15 +8,15 @@ use super::utils::{
 };
 
 pub fn transform_calendar(calendar: &EKCalendar) -> AppleCalendar {
-    let id = unsafe { calendar.calendarIdentifier() }.to_string();
+    let calendar_identifier = unsafe { calendar.calendarIdentifier() }.to_string();
     let title = unsafe { calendar.title() }.to_string();
     let calendar_type = transform_calendar_type(unsafe { calendar.r#type() });
     let color = unsafe { calendar.CGColor() }.map(|cg_color| extract_color_components(&cg_color));
 
     let properties = extract_calendar_properties(calendar);
 
     AppleCalendar {
-        id,
+        calendar_identifier,
         title,
         calendar_type,
         color,
@@ -39,7 +39,7 @@ pub fn extract_calendar_properties(calendar: &EKCalendar) -> AppleCalendar {
         supported_event_availabilities,
         allowed_entity_types,
         source,
-        id: String::new(),
+        calendar_identifier: String::new(),
         title: String::new(),
         calendar_type: CalendarType::Local,
         color: None,

plugins/apple-calendar/src/apple/transforms/event.rs

@@ -3,7 +3,7 @@ use objc2_event_kit::{EKAlarm, EKCalendarType, EKEvent, EKStructuredLocation};
 use objc2_foundation::{NSArray, NSDate, NSString, NSTimeZone};
 
 use crate::error::Error;
-use crate::types::{AppleEvent, CalendarRef, Participant, StructuredLocation};
+use crate::types::{AppleEvent, CalendarSummary, Participant, StructuredLocation};
 
 use super::super::recurrence::{offset_date_time_from, parse_recurrence_info};
 use super::alarm::transform_alarm;
@@ -14,7 +14,7 @@ use super::utils::get_url_string;
 
 pub fn transform_event(event: &EKEvent) -> Result<AppleEvent, Error> {
     let identifiers = extract_event_identifiers(event);
-    let calendar_ref = extract_event_calendar_ref(event);
+    let calendar_summary = extract_event_calendar_summary(event);
     let basic_info = extract_event_basic_info(event);
     let dates = extract_event_dates(event);
     let status_info = extract_event_status_info(event);
@@ -23,13 +23,13 @@ pub fn transform_event(event: &EKEvent) -> Result<AppleEvent, Error> {
     let location_info = extract_event_location_info(event);
     let recurrence_info = extract_event_recurrence_info(event, flags.has_recurrence_rules);
     let alarm_info = extract_event_alarm_info(event);
-    let birthday_info = extract_event_birthday_info(event, &calendar_ref);
+    let birthday_info = extract_event_birthday_info(event, &calendar_summary);
 
     Ok(AppleEvent {
         event_identifier: identifiers.event_identifier,
         calendar_item_identifier: identifiers.calendar_item_identifier,
-        external_identifier: identifiers.external_identifier,
-        calendar: calendar_ref,
+        calendar_item_external_identifier: identifiers.calendar_item_external_identifier,
+        calendar: calendar_summary,
         title: basic_info.title,
         location: basic_info.location,
         url: basic_info.url,
@@ -50,36 +50,31 @@ pub fn transform_event(event: &EKEvent) -> Result<AppleEvent, Error> {
         attendees: participants.attendees,
         structured_location: location_info.structured_location,
         recurrence: recurrence_info.recurrence,
-        occurrence_date: recurrence_info.occurrence_date,
-        is_detached: recurrence_info.is_detached,
         alarms: alarm_info.alarms,
         birthday_contact_identifier: birthday_info.birthday_contact_identifier,
         is_birthday: birthday_info.is_birthday,
     })
 }
 
 struct EventIdentifiers {
-    event_identifier: String,
+    event_identifier: Option<String>,
     calendar_item_identifier: String,
-    external_identifier: String,
+    calendar_item_external_identifier: Option<String>,
 }
 
 fn extract_event_identifiers(event: &EKEvent) -> EventIdentifiers {
     EventIdentifiers {
-        event_identifier: unsafe { event.eventIdentifier() }
-            .map(|s| s.to_string())
-            .unwrap_or_default(),
+        event_identifier: unsafe { event.eventIdentifier() }.map(|s| s.to_string()),
         calendar_item_identifier: unsafe { event.calendarItemIdentifier() }.to_string(),
-        external_identifier: unsafe { event.calendarItemExternalIdentifier() }
-            .map(|s| s.to_string())
-            .unwrap_or_default(),
+        calendar_item_external_identifier: unsafe { event.calendarItemExternalIdentifier() }
+            .map(|s| s.to_string()),
     }
 }
 
-fn extract_event_calendar_ref(event: &EKEvent) -> CalendarRef {
+fn extract_event_calendar_summary(event: &EKEvent) -> CalendarSummary {
     let calendar = unsafe { event.calendar() }.unwrap();
-    CalendarRef {
-        id: unsafe { calendar.calendarIdentifier() }.to_string(),
+    CalendarSummary {
+        calendar_identifier: unsafe { calendar.calendarIdentifier() }.to_string(),
         title: unsafe { calendar.title() }.to_string(),
     }
 }
@@ -198,8 +193,6 @@ fn extract_event_location_info(event: &EKEvent) -> EventLocationInfo {
 
 struct EventRecurrenceInfo {
     recurrence: Option<crate::types::RecurrenceInfo>,
-    occurrence_date: Option<chrono::DateTime<chrono::Utc>>,
-    is_detached: bool,
 }
 
 fn extract_event_recurrence_info(
@@ -208,8 +201,6 @@ fn extract_event_recurrence_info(
 ) -> EventRecurrenceInfo {
     EventRecurrenceInfo {
         recurrence: parse_recurrence_info(event, has_recurrence_rules),
-        occurrence_date: unsafe { event.occurrenceDate() }.map(offset_date_time_from),
-        is_detached: unsafe { event.isDetached() },
     }
 }
 
@@ -233,7 +224,10 @@ struct EventBirthdayInfo {
     is_birthday: bool,
 }
 
-fn extract_event_birthday_info(event: &EKEvent, _calendar_ref: &CalendarRef) -> EventBirthdayInfo {
+fn extract_event_birthday_info(
+    event: &EKEvent,
+    _calendar_summary: &CalendarSummary,
+) -> EventBirthdayInfo {
     let birthday_contact_identifier = unsafe {
         let id: Option<Retained<NSString>> = msg_send![event, birthdayContactIdentifier];
         id.map(|s| s.to_string())

plugins/apple-calendar/src/types.rs

@@ -6,7 +6,7 @@ use specta::Type;
 pub struct EventFilter {
     pub from: DateTime<Utc>,
     pub to: DateTime<Utc>,
-    pub calendar_tracking_id: String,
+    pub calendar_identifier: String,
 }
 
 macro_rules! common_derives {
@@ -85,7 +85,7 @@ impl Default for CalendarSource {
 
 common_derives! {
     pub struct AppleCalendar {
-        pub id: String,
+        pub calendar_identifier: String,
         pub title: String,
         pub calendar_type: CalendarType,
         pub color: Option<CalendarColor>,
@@ -152,7 +152,7 @@ common_derives! {
 common_derives! {
     pub struct Alarm {
         pub absolute_date: Option<DateTime<Utc>>,
-        pub relative_offset: Option<f64>,
+        pub relative_offset_seconds: Option<f64>,
         pub proximity: Option<AlarmProximity>,
         pub alarm_type: Option<AlarmType>,
         pub email_address: Option<String>,
@@ -292,18 +292,18 @@ common_derives! {
 }
 
 common_derives! {
-    pub struct CalendarRef {
-        pub id: String,
+    pub struct CalendarSummary {
+        pub calendar_identifier: String,
         pub title: String,
     }
 }
 
 common_derives! {
     pub struct AppleEvent {
-        pub event_identifier: String,
+        pub event_identifier: Option<String>,
         pub calendar_item_identifier: String,
-        pub external_identifier: String,
-        pub calendar: CalendarRef,
+        pub calendar_item_external_identifier: Option<String>,
+        pub calendar: CalendarSummary,
         pub title: String,
         pub location: Option<String>,
         pub url: Option<String>,
@@ -324,8 +324,6 @@ common_derives! {
         pub attendees: Vec<Participant>,
         pub structured_location: Option<StructuredLocation>,
         pub recurrence: Option<RecurrenceInfo>,
-        pub occurrence_date: Option<DateTime<Utc>>,
-        pub is_detached: bool,
         pub alarms: Vec<Alarm>,
         pub birthday_contact_identifier: Option<String>,
         pub is_birthday: bool,