remove orphan event when doing apple calendar sync (#2508)

Author: yujonglee

apps/desktop/src/services/apple-calendar/fetch/existing.ts

@@ -2,15 +2,14 @@ import type { Ctx } from "../ctx";
 import type { ExistingEvent } from "./types";
 
 export function fetchExistingEvents(ctx: Ctx): Array<ExistingEvent> {
-  const enabledCalendarIds = ctx.calendarIds;
   const events: Array<ExistingEvent> = [];
 
   ctx.store.forEachRow("events", (rowId, _forEachCell) => {
     const event = ctx.store.getRow("events", rowId);
     if (!event) return;
 
     const calendarId = event.calendar_id as string | undefined;
-    if (!calendarId || !enabledCalendarIds.has(calendarId)) {
+    if (!calendarId) {
       return;
     }
 

apps/desktop/src/services/apple-calendar/index.ts

@@ -13,11 +13,11 @@ export async function syncCalendarEvents(
 ): Promise<void> {
   await Promise.all([
     new Promise((resolve) => setTimeout(resolve, 250)),
-    runSyncPipeline(store, queries),
+    run(store, queries),
   ]);
 }
 
-async function runSyncPipeline(store: Store, queries: Queries<Schemas>) {
+async function run(store: Store, queries: Queries<Schemas>) {
   const ctx = createCtx(store, queries);
   if (!ctx) {
     return null;
@@ -26,6 +26,6 @@ async function runSyncPipeline(store: Store, queries: Queries<Schemas>) {
   const incoming = await fetchIncomingEvents(ctx);
   const existing = fetchExistingEvents(ctx);
 
-  const out = sync(ctx.store, { incoming, existing });
+  const out = sync(ctx, { incoming, existing });
   execute(ctx.store, out);
 }

apps/desktop/src/services/apple-calendar/process/sync.ts

@@ -1,12 +1,9 @@
-import type { Store } from "../../../store/tinybase/main";
+import type { Ctx } from "../ctx";
 import type { ExistingEvent, IncomingEvent } from "../fetch/types";
 import type { SyncInput, SyncOutput } from "./types";
 import { getSessionForEvent, isSessionEmpty } from "./utils";
 
-export function sync(
-  store: Store,
-  { incoming, existing }: SyncInput,
-): SyncOutput {
+export function sync(ctx: Ctx, { incoming, existing }: SyncInput): SyncOutput {
   const out: SyncOutput = {
     toDelete: [],
     toUpdate: [],
@@ -17,6 +14,17 @@ export function sync(
   const handledIncomingEventIds = new Set<string>();
 
   for (const storeEvent of existing) {
+    const sessionId = getSessionForEvent(ctx.store, storeEvent.id);
+    const hasNonEmptySession =
+      sessionId && !isSessionEmpty(ctx.store, sessionId);
+
+    if (!ctx.calendarIds.has(storeEvent.calendar_id!)) {
+      if (!hasNonEmptySession) {
+        out.toDelete.push(storeEvent.id);
+      }
+      continue;
+    }
+
     const matchingIncomingEvent = incomingEventMap.get(storeEvent.id);
 
     if (matchingIncomingEvent) {
@@ -30,18 +38,19 @@ export function sync(
       continue;
     }
 
-    const sessionId = getSessionForEvent(store, storeEvent.id);
-    const hasNonEmptySession = sessionId && !isSessionEmpty(store, sessionId);
-
     if (hasNonEmptySession) {
       continue;
     }
 
     const rescheduledEvent = findRescheduledEvent(storeEvent, incoming);
 
     if (rescheduledEvent && !handledIncomingEventIds.has(rescheduledEvent.id)) {
-      out.toDelete.push(storeEvent.id);
-      out.toAdd.push(rescheduledEvent);
+      out.toUpdate.push({
+        ...rescheduledEvent,
+        id: storeEvent.id,
+        user_id: storeEvent.user_id,
+        created_at: storeEvent.created_at,
+      });
       handledIncomingEventIds.add(rescheduledEvent.id);
       continue;
     }