🐛 fix(gcal-series): use dayjs util function in _generateInstances logic (#654)

Author: victor-enogwe

packages/backend/src/event/services/recur/recur.week.test.ts

@@ -5,7 +5,7 @@ import { areDatesUnique, haveSharedValues } from "./recur.test.util";
 import { assembleInstances } from "./util/recur.util";
 
 describe("Weekly Recurrence: Basics", () => {
-  it("uses sunday & saturday as start/end dates", () => {
+  it("starts recurrences on the first day and last day of the week", () => {
     const rEvents = assembleInstances({
       startDate: "2023-07-21",
       endDate: "2023-07-22",
@@ -14,8 +14,8 @@ describe("Weekly Recurrence: Basics", () => {
       },
     } as Schema_Event_Core);
 
-    const start = dayjs(rEvents[1].startDate);
-    const end = dayjs(rEvents[rEvents.length - 1].endDate);
+    const start = dayjs(rEvents[1]?.startDate);
+    const end = dayjs(rEvents[rEvents.length - 1]?.endDate);
 
     const isStartSunday = start.day() === 0;
     const isEndSaturday = end.day() === 6;
@@ -33,18 +33,18 @@ describe("Weekly Recurrence: Cases", () => {
       recurrence: { rule: [RRULE.WEEK] },
     } as Schema_Event_Core);
 
-    expect(events[1].startDate).toBe("2023-01-15");
-    expect(events[1].endDate).toBe("2023-01-21");
+    expect(events[1]?.startDate).toBe("2023-01-15");
+    expect(events[1]?.endDate).toBe("2023-01-21");
 
-    expect(events[2].startDate).toBe("2023-01-22");
-    expect(events[2].endDate).toBe("2023-01-28");
+    expect(events[2]?.startDate).toBe("2023-01-22");
+    expect(events[2]?.endDate).toBe("2023-01-28");
   });
   it("uses correct dates: case 3: DST (11.5)", () => {
     const events = assembleInstances({
       startDate: "2023-07-23",
       endDate: "2023-07-29",
       recurrence: { rule: [RRULE.WEEK] },
-    } as Schema_Event_Core);
+    } as Schema_Event_Core).map((e) => ({ ...e, _id: e._id?.toString() }));
 
     expect(areDatesUnique(events)).toBe(true);
     expect(haveSharedValues(events)).toBe(false);

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

@@ -1,5 +1,3 @@
-import dayjs, { Dayjs } from "dayjs";
-import utc from "dayjs/plugin/utc";
 import { ObjectId } from "mongodb";
 import { RRule } from "rrule";
 import { RRULE } from "@core/constants/core.constants";
@@ -10,11 +8,10 @@ import {
   Schema_Event_Recur_Base,
   Schema_Event_Recur_Instance,
 } from "@core/types/event.types";
+import dayjs, { Dayjs } from "@core/util/date/dayjs";
 import { GenericError } from "@backend/common/errors/generic/generic.errors";
 import { error } from "@backend/common/errors/handlers/error.handler";
 
-dayjs.extend(utc);
-
 export const assembleInstances = (
   event: Schema_Event_Core,
   baseId?: string,
@@ -36,19 +33,32 @@ export const assembleInstances = (
   return events;
 };
 
-export const stripBaseProps = (base: Schema_Event_Recur_Base) => {
-  const {
-    _id, // preserve existing event
-    gEventId, // strip this so instances remain unique
-    startDate, // dates changed during DB update
-    endDate, // dates changed during DB update
-    order, // preserve order
-    recurrence, // recurrence change during DB update
-    user, // preserve user
-    updatedAt, // changed during DB update
-    ...baseForUpdate // remaining event
-  } = base;
-  return baseForUpdate;
+export const stripBaseProps = (
+  base: Schema_Event_Recur_Base,
+): Omit<
+  Schema_Event_Recur_Base,
+  | "_id"
+  | "gEventId"
+  | "startDate"
+  | "endDate"
+  | "order"
+  | "recurrence"
+  | "user"
+  | "updatedAt"
+> => {
+  const { allDayOrder, description, gRecurringEventId, isAllDay } = base;
+  const { isSomeday, origin, priority, title } = base;
+
+  return {
+    allDayOrder,
+    description,
+    gRecurringEventId,
+    isAllDay,
+    isSomeday,
+    origin,
+    priority,
+    title,
+  };
 };
 
 const _generateInstances = (
@@ -221,36 +231,12 @@ const _getRule = (rule: string, startDate: string, endDate: string) => {
 const _getNextStart = (rule: string, startDate: string, endDate: string) => {
   switch (rule) {
     case RRULE.WEEK:
-      return _getNextSunday(startDate);
+      return dayjs(startDate).startOfNextWeek();
       break;
     case RRULE.MONTH:
-      return _getNextMonth(endDate);
+      return dayjs(endDate).startOfNextMonth();
       break;
     default:
       throw error(GenericError.DeveloperError, "Failed to get next start");
   }
 };
-
-const _getNextMonth = (target: string) => {
-  const date = dayjs(target, YEAR_MONTH_DAY_FORMAT).hour(0).minute(0).second(0);
-
-  const firstOfNextMonth = date.add(1, "month").date(1);
-  return firstOfNextMonth;
-};
-
-const _getNextSunday = (startDate: string) => {
-  const date = dayjs(startDate, YEAR_MONTH_DAY_FORMAT)
-    .hour(0)
-    .minute(0)
-    .second(0);
-
-  const dayOfWeek = date.day();
-
-  let daysUntilNextSunday = (7 - dayOfWeek) % 7;
-  if (daysUntilNextSunday === 0) {
-    daysUntilNextSunday = 7;
-  }
-
-  const nextSunday = date.add(daysUntilNextSunday, "day");
-  return nextSunday;
-};