♻️ Refactor: remove newBase arg for createSeries

Author: tyler-dane

packages/backend/src/event/services/recur/manager/recur.manager.ts

@@ -43,7 +43,6 @@ export class RecurringEventManager {
         if (baseEvent && newBaseEvent && modifiedInstance) {
           return this.provider.updateSeriesWithSplit(
             baseEvent,
-            newBaseEvent,
             modifiedInstance,
           );
         }

packages/backend/src/event/services/recur/providers/compass/compass.recur.provider.test.ts

@@ -282,17 +282,9 @@ describe("Compass Recurring Event Provider", () => {
           eventId: originalBaseId,
         },
       };
-      const newBase = createMockBaseEvent({
-        user: setup.userId,
-        title: "Team Sync - Updated",
-      });
 
       // Execute
-      await provider.updateSeriesWithSplit(
-        originalBase,
-        newBase,
-        modifiedInstance,
-      );
+      await provider.updateSeriesWithSplit(originalBase, modifiedInstance);
 
       // Verify
       const storedEvents = await mongoService.event.find().toArray();

packages/backend/src/event/services/recur/providers/compass/compass.recur.provider.ts

@@ -208,15 +208,6 @@ export class CompassRecurringEventProvider implements RecurringEventProvider {
       );
     }
 
-    // Create a new base event starting from the modified instance with updated data
-    const newBase: Schema_Event_Recur_Base = {
-      ...modifiedInstance,
-      _id: new ObjectId().toString(),
-      recurrence: {
-        rule: originalBase.recurrence.rule,
-      },
-    };
-
     // Update the original base event to end before the modified instance
     const untilDate =
       new Date(modifiedInstance.startDate)
@@ -235,14 +226,15 @@ export class CompassRecurringEventProvider implements RecurringEventProvider {
       },
     );
 
-    // Insert the new base event
-    const newBaseWithRecurrence = {
-      ...newBase,
+    // Create a new base event starting from the modified instance with updated data
+    const newBase: Schema_Event_Recur_Base = {
+      ...modifiedInstance,
+      _id: new ObjectId().toString(),
       recurrence: {
         rule: originalBase.recurrence.rule,
       },
     };
-    await this.insertBaseEvent(newBaseWithRecurrence);
+    await this.insertBaseEvent(newBase);
 
     // Update all future instances to point to the new base event and have the modified data
     const { _id, recurrence, ...modifiedData } = modifiedInstance;
@@ -265,7 +257,6 @@ export class CompassRecurringEventProvider implements RecurringEventProvider {
 
   async updateSeriesWithSplit(
     originalBase: Schema_Event_Recur_Base,
-    newBase: Schema_Event_Recur_Base,
     modifiedInstance: Schema_Event_Recur_Instance,
   ): Promise<{ modifiedCount: number }> {
     if (!modifiedInstance.startDate || !originalBase.recurrence?.rule) {

packages/backend/src/event/services/recur/providers/gcal/gcal.recur.provider.ts

@@ -384,9 +384,8 @@ export class GCalRecurringEventProvider implements RecurringEventProvider {
 
   async updateSeriesWithSplit(
     originalBase: Schema_Event,
-    newBase: Schema_Event,
     modifiedInstance: Schema_Event,
-  ): Promise<{ matchedCount: number }> {
+  ): Promise<{ modifiedCount: number }> {
     // First update the original base event
     if (!originalBase.recurrence?.eventId) {
       throw error(
@@ -406,12 +405,12 @@ export class GCalRecurringEventProvider implements RecurringEventProvider {
     );
 
     // Then insert the new base event
-    await this.insertBaseEvent(newBase);
+    // await this.insertBaseEvent(newBase);
 
     // Finally update the modified instance
     await this.updateInstance(modifiedInstance);
 
-    return { matchedCount: 3 };
+    return { modifiedCount: 3 };
   }
 
   async updateEntireSeries(

packages/backend/src/event/services/recur/providers/recur.provider.interface.ts

@@ -126,7 +126,6 @@ export interface RecurringEventProvider {
    */
   updateSeriesWithSplit(
     originalBase: Schema_Event_Recur_Base,
-    newBase: Schema_Event_Recur_Base,
     modifiedInstance: Schema_Event_Recur_Instance,
   ): Promise<{ modifiedCount: number }>;