🐛 fix(recurring-events): refine event recurrence handling and update related tests

Author: victor-enogwe

packages/backend/src/event/classes/compass.event.generator.ts

@@ -20,9 +20,9 @@ import {
   isBase,
   parseCompassEventDate,
 } from "@core/util/event/event.util";
+import { GenericError } from "@backend/common/errors/generic/generic.errors";
+import { error } from "@backend/common/errors/handlers/error.handler";
 import mongoService from "@backend/common/services/mongo.service";
-import { GenericError } from "../../common/errors/generic/generic.errors";
-import { error } from "../../common/errors/handlers/error.handler";
 
 export class CompassEventFactory {
   private static async findCompassEvent(
@@ -209,10 +209,7 @@ export class CompassEventFactory {
     const payload = event.payload as Schema_Event;
     const hasRRule = Array.isArray(payload.recurrence?.rule);
     const hasRecurringBase = !!payload.recurrence?.eventId;
-    const isSomeday = payload.isSomeday;
     const nullRecurrence = payload.recurrence?.rule === null;
-    const baseToStandaloneTransition = nullRecurrence && hasRecurringBase;
-    const baseToSomedayTransition = isSomeday && hasRecurringBase;
 
     const dbEvent = await CompassEventFactory.findCompassEvent(
       event.payload._id,
@@ -228,16 +225,7 @@ export class CompassEventFactory {
       );
     }
 
-    if (baseToStandaloneTransition || baseToSomedayTransition) {
-      return CompassEventFactory.genAllEvents(
-        {
-          ...event,
-          applyTo: RecurringEventUpdateScope.ALL_EVENTS,
-        } as CompassAllEvents,
-        session,
-      );
-    }
-
+    if (nullRecurrence) delete payload.recurrence?.rule;
     if (hasRRule && hasRecurringBase) delete payload.recurrence?.rule;
     if (nullRecurrence && !hasRecurringBase) delete payload.recurrence;
 

packages/backend/src/event/controllers/event.controller.ts

@@ -7,6 +7,7 @@ import {
   CompassCoreEventSchema,
   CompassEvent,
   CompassEventStatus,
+  CompassThisEvent,
   Params_DeleteMany,
   Payload_Order,
   RecurringEventUpdateScope,
@@ -70,7 +71,7 @@ class EventController {
 
       await this.processEvents([
         {
-          payload: event as CompassEvent["payload"],
+          payload: event as CompassThisEvent["payload"],
           status: CompassEventStatus.CANCELLED,
           applyTo: applyTo as RecurringEventUpdateScope.THIS_EVENT,
         },
@@ -141,7 +142,7 @@ class EventController {
       const { body, query, params, session } = req;
       const user = session?.getUserId() as string;
       const _id = params["id"] as string;
-      const payload = { ...body, user, _id } as CompassEvent["payload"];
+      const payload = { ...body, user, _id } as CompassThisEvent["payload"];
       const applyTo = query["applyTo"] as RecurringEventUpdateScope.THIS_EVENT;
 
       await this.processEvents([

packages/backend/src/sync/services/sync/__tests__/compass-sync-processor-this-event/base.test.ts

@@ -17,6 +17,7 @@ import {
   cleanupTestDb,
   setupTestDb,
 } from "@backend/__tests__/helpers/mock.db.setup";
+import { GenericError } from "@backend/common/errors/generic/generic.errors";
 import {
   testCompassEventNotInGcal,
   testCompassSeries,
@@ -167,9 +168,7 @@ describe.each([{ calendarProvider: CalendarProvider.GOOGLE }])(
                       status: CompassEventStatus.CONFIRMED,
                     },
                   ]),
-                ).rejects.toThrow(
-                  `You cannot edit a base event with this option(${RecurringEventUpdateScope.THIS_EVENT})`,
-                );
+                ).rejects.toThrow(GenericError.BadRequest.description);
               });
 
               it("should not directly update the description field of a base event", async () => {
@@ -221,9 +220,7 @@ describe.each([{ calendarProvider: CalendarProvider.GOOGLE }])(
                       status: CompassEventStatus.CONFIRMED,
                     },
                   ]),
-                ).rejects.toThrow(
-                  `You cannot edit a base event with this option(${RecurringEventUpdateScope.THIS_EVENT})`,
-                );
+                ).rejects.toThrow(GenericError.BadRequest.description);
               });
 
               it("should not directly update the priority field of a base event", async () => {
@@ -277,9 +274,7 @@ describe.each([{ calendarProvider: CalendarProvider.GOOGLE }])(
                       status: CompassEventStatus.CONFIRMED,
                     },
                   ]),
-                ).rejects.toThrow(
-                  `You cannot edit a base event with this option(${RecurringEventUpdateScope.THIS_EVENT})`,
-                );
+                ).rejects.toThrow(GenericError.BadRequest.description);
               });
 
               it("should directly update the startDate field of a base event", async () => {
@@ -333,9 +328,7 @@ describe.each([{ calendarProvider: CalendarProvider.GOOGLE }])(
                       status: CompassEventStatus.CONFIRMED,
                     },
                   ]),
-                ).rejects.toThrow(
-                  `You cannot edit a base event with this option(${RecurringEventUpdateScope.THIS_EVENT})`,
-                );
+                ).rejects.toThrow(GenericError.BadRequest.description);
               });
 
               it("should directly update the endDate field of a base event", async () => {
@@ -389,9 +382,7 @@ describe.each([{ calendarProvider: CalendarProvider.GOOGLE }])(
                       status: CompassEventStatus.CONFIRMED,
                     },
                   ]),
-                ).rejects.toThrow(
-                  `You cannot edit a base event with this option(${RecurringEventUpdateScope.THIS_EVENT})`,
-                );
+                ).rejects.toThrow(GenericError.BadRequest.description);
               });
 
               it("should directly update the recurrence field of a base event", async () => {
@@ -445,9 +436,7 @@ describe.each([{ calendarProvider: CalendarProvider.GOOGLE }])(
                       status: CompassEventStatus.CONFIRMED,
                     },
                   ]),
-                ).rejects.toThrow(
-                  `You cannot edit a base event with this option(${RecurringEventUpdateScope.THIS_EVENT})`,
-                );
+                ).rejects.toThrow(GenericError.BadRequest.description);
               });
             });
           });
@@ -503,9 +492,7 @@ describe.each([{ calendarProvider: CalendarProvider.GOOGLE }])(
                       status: CompassEventStatus.CANCELLED,
                     },
                   ]),
-                ).rejects.toThrow(
-                  `You cannot edit a base event with this option(${RecurringEventUpdateScope.THIS_EVENT})`,
-                );
+                ).rejects.toThrow(GenericError.BadRequest.description);
               },
             );
           });