🐛 fix(recurring-events): update event util checks

Author: victor-enogwe

packages/backend/src/event/classes/gcal.event.parser.test.ts

@@ -3,7 +3,7 @@ import { faker } from "@faker-js/faker";
 import { Categories_Recurrence } from "@core/types/event.types";
 import { WithGcalId, gSchema$Event } from "@core/types/gcal";
 import dayjs from "@core/util/date/dayjs";
-import { isBase, isExistingInstance } from "@core/util/event/event.util";
+import { isBase, isInstance } from "@core/util/event/event.util";
 import { UserDriver } from "@backend/__tests__/drivers/user.driver";
 import {
   cleanupCollections,
@@ -546,7 +546,7 @@ describe("GcalEventParser", () => {
         .toArray();
 
       const dbSeriesBase = dbSeries.find(isBase);
-      const dbSeriesInstance = dbSeries.find(isExistingInstance);
+      const dbSeriesInstance = dbSeries.find(isInstance);
 
       expect(changes).toHaveLength(1);
 

packages/backend/src/event/classes/gcal.event.parser.ts

@@ -11,7 +11,7 @@ import {
 import { WithGcalId, gSchema$Event, gSchema$EventBase } from "@core/types/gcal";
 import {
   isBase,
-  isExistingInstance,
+  isInstance,
   isRegularEvent,
 } from "@core/util/event/event.util";
 import {
@@ -125,7 +125,7 @@ export class GcalEventParser {
     this.#compassEvent = cEvent ?? null;
 
     this.#isInstance = isInstanceGCalEvent(this.#event);
-    this.#isCompassInstance = cEvent ? isExistingInstance(cEvent) : false;
+    this.#isCompassInstance = cEvent ? isInstance(cEvent) : false;
 
     this.#isBase = isBaseGCalEvent(this.#event);
     this.#isCompassBase = cEvent ? isBase(cEvent) : false;

packages/backend/src/event/classes/gcal.event.rrule.test.ts

@@ -5,7 +5,7 @@ import { recurring } from "@core/__mocks__/v1/events/gcal/gcal.recurring";
 import { GCAL_MAX_RECURRENCES } from "@core/constants/core.constants";
 import { gSchema$EventBase } from "@core/types/gcal";
 import dayjs from "@core/util/date/dayjs";
-import { isExistingInstance } from "@core/util/event/event.util";
+import { isInstance } from "@core/util/event/event.util";
 import {
   isBaseGCalEvent,
   isInstanceGCalEvent,
@@ -281,7 +281,7 @@ describe("GcalEventRRule: ", () => {
         expect(instance.user).toEqual(userId);
         expect(instance.startDate).toBeDefined();
         expect(instance.endDate).toBeDefined();
-        expect(isExistingInstance(instance)).toEqual(true);
+        expect(isInstance(instance)).toEqual(true);
 
         expect(instance.startDate).toEqual(
           startDate.add(index, "day").format(dateFormat),
@@ -313,7 +313,7 @@ describe("GcalEventRRule: ", () => {
         expect(instance.user).toEqual(userId);
         expect(instance.startDate).toBeDefined();
         expect(instance.endDate).toBeDefined();
-        expect(isExistingInstance(instance)).toEqual(true);
+        expect(isInstance(instance)).toEqual(true);
 
         expect(instance.startDate).toEqual(
           startDate.add(index, "day").format(dateFormat),

packages/backend/src/event/services/event.find.test.ts

@@ -9,11 +9,7 @@ import {
   RecurringEventUpdateScope,
   Schema_Event,
 } from "@core/types/event.types";
-import {
-  isBase,
-  isExistingInstance,
-  isInstance,
-} from "@core/util/event/event.util";
+import { isBase, isInstance } from "@core/util/event/event.util";
 import { createMockBaseEvent } from "@core/util/test/ccal.event.factory";
 import { UtilDriver } from "@backend/__tests__/drivers/util.driver";
 import {
@@ -99,7 +95,7 @@ describe("Jan 2022: Many Formats", () => {
       const baseEvents = result.filter(isBase);
       expect(baseEvents).toHaveLength(0);
 
-      const instances = result.filter(isExistingInstance);
+      const instances = result.filter(isInstance);
       expect(instances).toHaveLength(gInstances.length);
     });
 

packages/backend/src/event/services/event.service.ts

@@ -31,10 +31,7 @@ import { gSchema$Event } from "@core/types/gcal";
 import { IDSchema } from "@core/types/type.utils";
 import { getCurrentRangeDates } from "@core/util/date/date.util";
 import { CompassEventRRule } from "@core/util/event/compass.event.rrule";
-import {
-  isExistingInstance,
-  parseCompassEventDate,
-} from "@core/util/event/event.util";
+import { isInstance, parseCompassEventDate } from "@core/util/event/event.util";
 import { getGcalClient } from "@backend/auth/services/google.auth.service";
 import { Collections } from "@backend/common/constants/collections";
 import { EventError } from "@backend/common/errors/event/event.errors";
@@ -183,7 +180,7 @@ class EventService {
     }
 
     const baseEventIds = events
-      .filter(isExistingInstance)
+      .filter(isInstance)
       .map((e) => new ObjectId(e.recurrence?.eventId));
 
     const baseEvents = await mongoService.event
@@ -192,7 +189,7 @@ class EventService {
 
     return events
       .map((event) => {
-        if (isExistingInstance(event)) {
+        if (isInstance(event)) {
           const baseEvent = baseEvents.find(
             ({ _id }) => _id.toString() === event.recurrence?.eventId,
           );
@@ -242,9 +239,7 @@ class EventService {
       );
     }
 
-    const isInstance = isExistingInstance(event);
-
-    if (isInstance) {
+    if (isInstance(event)) {
       const baseEvent = await mongoService.event.findOne({
         user: userId,
         _id: new ObjectId(event.recurrence?.eventId),

packages/backend/src/sync/controllers/sync.controller.test.ts

@@ -7,7 +7,7 @@ import { EVENT_CHANGED } from "@core/constants/websocket.constants";
 import { Status } from "@core/errors/status.codes";
 import { Resource_Sync } from "@core/types/sync.types";
 import { Schema_User } from "@core/types/user.types";
-import { isBase, isExistingInstance } from "@core/util/event/event.util";
+import { isBase, isInstance } from "@core/util/event/event.util";
 import { BaseDriver } from "@backend/__tests__/drivers/base.driver";
 import { SyncControllerDriver } from "@backend/__tests__/drivers/sync.controller.driver";
 import { SyncDriver } from "@backend/__tests__/drivers/sync.driver";
@@ -150,7 +150,7 @@ describe("SyncController", () => {
         });
 
         const baseEvent = currentEventsInDb.find(isBase)!;
-        const firstInstance = currentEventsInDb.find(isExistingInstance)!;
+        const firstInstance = currentEventsInDb.find(isInstance)!;
 
         expect(baseEvent).toBeDefined();
         expect(firstInstance).toBeDefined();
@@ -190,7 +190,7 @@ describe("SyncController", () => {
         expect(baseEvents[0]?.title).toBe("Recurrence");
 
         // Verify we have the correct instance
-        const instanceEvents = currentEventsInDb.filter(isExistingInstance);
+        const instanceEvents = currentEventsInDb.filter(isInstance);
 
         expect(instanceEvents).toHaveLength(3);
 
@@ -217,7 +217,7 @@ describe("SyncController", () => {
         });
 
         // Get all instance events
-        const instances = currentEventsInDb.filter(isExistingInstance);
+        const instances = currentEventsInDb.filter(isInstance);
 
         // For each instance event, verify there are no duplicates
         const eventIds = new Set<string>();
@@ -241,7 +241,7 @@ describe("SyncController", () => {
         });
 
         const regularEvents = currentEventsInDb.filter(
-          (e) => !isBase(e) && !isExistingInstance(e),
+          (e) => !isBase(e) && !isInstance(e),
         );
 
         expect(regularEvents).toHaveLength(1);

packages/backend/src/sync/services/import/sync.import.full.test.ts

@@ -1,4 +1,4 @@
-import { isBase, isExistingInstance } from "@core/util/event/event.util";
+import { isBase, isInstance } from "@core/util/event/event.util";
 import { UtilDriver } from "@backend/__tests__/drivers/util.driver";
 import {
   getCategorizedEventsInDb,
@@ -30,7 +30,7 @@ describe("SyncImport: Full", () => {
     });
 
     const baseEvent = currentEventsInDb.find(isBase)!;
-    const firstInstance = currentEventsInDb.find(isExistingInstance)!;
+    const firstInstance = currentEventsInDb.find(isInstance)!;
 
     expect(baseEvent).toBeDefined();
     expect(firstInstance).toBeDefined();
@@ -75,7 +75,7 @@ describe("SyncImport: Full", () => {
     expect(baseEvents[0]?.title).toBe("Recurrence");
 
     // Verify we have the correct instance
-    const instanceEvents = currentEventsInDb.filter(isExistingInstance);
+    const instanceEvents = currentEventsInDb.filter(isInstance);
 
     expect(instanceEvents).toHaveLength(3);
 
@@ -108,7 +108,7 @@ describe("SyncImport: Full", () => {
     });
 
     // Get all instance events
-    const instances = currentEventsInDb.filter(isExistingInstance);
+    const instances = currentEventsInDb.filter(isInstance);
 
     // For each instance event, verify there are no duplicates
     const eventIds = new Set<string>();

packages/backend/src/sync/services/import/sync.import.util.test.ts

@@ -1,18 +1,8 @@
-import { ObjectId } from "mongodb";
 import { gcalEvents } from "@core/__mocks__/v1/events/gcal/gcal.event";
-import { Event_Core } from "@core/types/event.types";
 import { gSchema$Event } from "@core/types/gcal";
 import dayjs from "@core/util/date/dayjs";
-import {
-  createMockBaseEvent,
-  createMockInstance,
-} from "@core/util/test/ccal.event.factory";
-import { generateGcalId } from "@backend/__tests__/mocks.gcal/factories/gcal.event.factory";
 import { cancelledEventsIds } from "@backend/common/services/gcal/gcal.utils";
-import {
-  assignIdsToEvents,
-  organizeGcalEventsByType,
-} from "@backend/sync/services/import/sync.import.util";
+import { organizeGcalEventsByType } from "@backend/sync/services/import/sync.import.util";
 import { syncExpired, syncExpiresSoon } from "@backend/sync/util/sync.util";
 
 describe("categorizeGcalEvents", () => {
@@ -96,61 +86,3 @@ describe("Sync Expiry Checks", () => {
     expect(expiresSoon).toBe(false);
   });
 });
-
-const getEventsWithoutIds = () => {
-  // Create a base event with a Google ID
-  const baseEvent = createMockBaseEvent();
-  const baseGEventId = generateGcalId();
-
-  baseEvent.gEventId = baseGEventId;
-
-  delete (baseEvent as Partial<typeof baseEvent>)._id;
-
-  const gEventId = baseEvent.gEventId as string;
-
-  // Create instances that reference the base event's Google ID
-  const instance1 = createMockInstance(baseGEventId, gEventId, {});
-  const instance2 = createMockInstance(baseGEventId, gEventId, {});
-
-  // delete _ids to simulate a newly mapped event
-  delete (instance1 as Partial<typeof instance1>)._id;
-  delete (instance1 as Partial<typeof instance1>).recurrence;
-  delete (instance2 as Partial<typeof instance2>)._id;
-  delete (instance2 as Partial<typeof instance2>).recurrence;
-
-  const eventsWithoutIds = [baseEvent, instance1, instance2];
-
-  return eventsWithoutIds;
-};
-
-describe("assignIdsToEvents", () => {
-  it("assigns Mongo ObjectIds to events", () => {
-    const eventsWithoutIds = getEventsWithoutIds() as Event_Core[];
-
-    const events = assignIdsToEvents(eventsWithoutIds);
-
-    // Verify all events have ObjectIds
-    for (const event of events) {
-      expect(event?._id).toBeDefined();
-      expect(event._id).toBeInstanceOf(ObjectId);
-    }
-  });
-
-  it("links instances to base events", () => {
-    const eventsWithoutIds = getEventsWithoutIds() as Event_Core[];
-
-    const events = assignIdsToEvents(eventsWithoutIds);
-
-    const baseEvent = events.find((event) => event.recurrence?.rule);
-
-    expect(baseEvent).toBeDefined();
-
-    const instances = events.filter((event) => event.recurrence?.eventId);
-
-    expect(instances).toHaveLength(2);
-
-    for (const instance of instances) {
-      expect(instance.recurrence?.eventId).toBe(baseEvent?._id?.toString());
-    }
-  });
-});

packages/backend/src/sync/services/import/sync.import.util.ts

@@ -1,19 +1,7 @@
-import { AnyBulkWriteOperation, ObjectId } from "mongodb";
-import {
-  Event_Core,
-  RecurrenceWithoutId,
-  Schema_Event_Core,
-  Schema_Event_Regular,
-  WithoutCompassId,
-} from "@core/types/event.types";
+import { AnyBulkWriteOperation } from "mongodb";
+import { Schema_Event_Core } from "@core/types/event.types";
 import { gSchema$Event } from "@core/types/gcal";
-import {
-  isBase,
-  isInstanceWithoutId,
-  isRegularEvent,
-} from "@core/util/event/event.util";
 import { cancelledEventsIds } from "@backend/common/services/gcal/gcal.utils";
-import { Event_Core_WithObjectId } from "@backend/sync/sync.types";
 
 export const assembleEventOperations = (
   userId: string,
@@ -81,42 +69,3 @@ export const organizeGcalEventsByType = (events: gSchema$Event[]) => {
   };
   return categorized;
 };
-
-/**
- * Assigns IDs to events
- * will map instance events to their base events
- * @param events - The events to assign IDs
- * @returns The events with IDs assigned
- */
-export const assignIdsToEvents = (
-  events: Array<RecurrenceWithoutId | WithoutCompassId<Schema_Event_Regular>>,
-): Array<Event_Core_WithObjectId> => {
-  const idMaps = new Map<string, ObjectId>();
-
-  return events.map((e) => {
-    const event = e as Event_Core;
-    const isBaseEvent = isBase(event);
-    const isInstance = isInstanceWithoutId(event);
-    const isRegular = isRegularEvent(event);
-    const baseEventId = event?.gRecurringEventId ?? (event?.gEventId as string);
-
-    if (!idMaps.get(baseEventId)) idMaps.set(baseEventId, new ObjectId());
-
-    const baseEventObjectId = idMaps.get(baseEventId)!;
-
-    const result = {
-      ...event,
-      _id: isBaseEvent ? baseEventObjectId : new ObjectId(),
-    };
-
-    if (!isRegular) {
-      if (isInstance) {
-        result.recurrence = { eventId: baseEventObjectId.toString() };
-      } else if (event.recurrence) {
-        result.recurrence = event.recurrence;
-      }
-    }
-
-    return result;
-  });
-};

packages/backend/src/sync/services/sync/__tests__/gcal.sync.processor.test.util.ts

@@ -11,7 +11,7 @@ import dayjs from "@core/util/date/dayjs";
 import {
   categorizeEvents,
   isBase,
-  isExistingInstance,
+  isInstance,
 } from "@core/util/event/event.util";
 import { getEventsInDb } from "@backend/__tests__/helpers/mock.db.queries";
 import { State_AfterGcalImport } from "@backend/__tests__/helpers/mock.events.init";
@@ -147,7 +147,7 @@ export const noInstancesAfterSplitDate = async (
   const splitDate = new Date(splitDateStr);
   const futureInstances = events.filter(
     (e) =>
-      isExistingInstance(e as unknown as Schema_Event) &&
+      isInstance(e as unknown as Schema_Event) &&
       new Date(e.startDate) > splitDate,
   );
   expect(futureInstances).toHaveLength(0);