✨ feat(edit-recurrence): include start date instance if not in recurrence (#1025)

* ✨ feat(edit-recurrence): include start date instance if not in recurrence

* ✨ feat(edit-recurrence): copilot suggested changes

Author: victor-enogwe

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

@@ -44,7 +44,6 @@ describe("GcalEventRRule: ", () => {
     });
 
     expect(rrule.toString()).toContain("RRULE:FREQ=DAILY");
-    expect(rrule.toString()).toContain(`COUNT=${GCAL_MAX_RECURRENCES}`);
     expect(rrule.count()).toBe(GCAL_MAX_RECURRENCES);
     expect(rrule.all()).toHaveLength(GCAL_MAX_RECURRENCES);
   });

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

@@ -9,7 +9,7 @@ import {
   gSchema$EventBase,
   gSchema$EventInstance,
 } from "@core/types/gcal";
-import dayjs from "@core/util/date/dayjs";
+import dayjs, { Dayjs } from "@core/util/date/dayjs";
 import { diffRRuleOptions } from "@core/util/event/event.util";
 import {
   getGcalEventDateFormat,
@@ -22,6 +22,9 @@ export class GcalEventRRule extends RRule {
   #dateKey: "date" | "dateTime";
   #dateFormat: string;
   #durationMs!: number;
+  #startDate!: Dayjs;
+  #endDate!: Dayjs;
+  #timezone!: string;
 
   constructor(event: gSchema$EventBase, options: Partial<Options> = {}) {
     super(GcalEventRRule.#initOptions(event, options));
@@ -30,17 +33,18 @@ export class GcalEventRRule extends RRule {
     this.#isAllDay = "date" in this.#event.start!;
     this.#dateKey = this.#isAllDay ? "date" : "dateTime";
     this.#dateFormat = getGcalEventDateFormat(this.#event.start);
+    this.#timezone = this.#event.start?.timeZone ?? dayjs.tz.guess();
 
     const { start, end } = this.#event;
-    const startDate = parseGCalEventDate(start);
-    const endDate = parseGCalEventDate(end);
 
-    this.#durationMs = endDate.diff(startDate, "milliseconds");
+    this.#startDate = parseGCalEventDate(start);
+    this.#endDate = parseGCalEventDate(end);
+    this.#durationMs = this.#endDate.diff(this.#startDate, "milliseconds");
   }
 
   static #initOptions(
     event: gSchema$EventBase,
-    options: Partial<Options> = {},
+    _options: Partial<Options> = {},
   ): Partial<Options> {
     const startDate = parseGCalEventDate(event.start);
     const dtstart = startDate.local().toDate();
@@ -49,11 +53,14 @@ export class GcalEventRRule extends RRule {
     const recurrence = event.recurrence?.join("\n").trim();
     const valid = recurrence?.length > 0;
     const rruleSet = valid ? rrulestr(recurrence!, opts) : { origOptions: {} };
-    const rruleOptions = { ...rruleSet.origOptions, ...options };
-    const rawCount = rruleOptions.count ?? GCAL_MAX_RECURRENCES;
-    const count = Math.min(rawCount, GCAL_MAX_RECURRENCES);
+    const rruleOptions = { ...rruleSet.origOptions, ..._options };
+    const options = { ...rruleOptions, dtstart, tzid };
 
-    return { ...rruleOptions, count, dtstart, tzid };
+    if (options.until instanceof Date) {
+      options.count = undefined as unknown as number;
+    }
+
+    return options;
   }
 
   diffOptions(rrule: GcalEventRRule): Array<[keyof ParsedOptions, unknown]> {
@@ -64,6 +71,19 @@ export class GcalEventRRule extends RRule {
     return this.toString().split("\n");
   }
 
+  override all(
+    iterator: (d: Date, len: number) => boolean = (_, index) =>
+      index < GCAL_MAX_RECURRENCES,
+  ): Date[] {
+    const dates = super.all(iterator);
+    const firstInstance = dates[0];
+    const firstInstanceStartDate = dayjs(firstInstance).tz(this.#timezone);
+    const includesDtStart = this.#startDate.isSame(firstInstanceStartDate);
+    const rDates = includesDtStart ? [] : [this.#startDate.toDate()];
+
+    return rDates.concat(dates);
+  }
+
   /**
    * instances
    *
@@ -73,9 +93,7 @@ export class GcalEventRRule extends RRule {
    */
   instances(): gSchema$EventInstance[] {
     return this.all().map((date) => {
-      const timezone = dayjs.tz.guess();
-      const tzid = this.#event.start?.timeZone ?? timezone;
-      const startDate = dayjs(date).tz(tzid);
+      const startDate = dayjs(date).tz(this.#timezone);
       const endDate = startDate.add(this.#durationMs, "milliseconds");
 
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -85,11 +103,11 @@ export class GcalEventRRule extends RRule {
         recurringEventId: this.#event.id!,
         start: {
           [this.#dateKey]: startDate?.format(this.#dateFormat),
-          timeZone: this.#event.start?.timeZone ?? timezone,
+          timeZone: this.#timezone,
         },
         end: {
           [this.#dateKey]: endDate.format(this.#dateFormat),
-          timeZone: this.#event.end?.timeZone ?? timezone,
+          timeZone: this.#timezone,
         },
       };
 

packages/core/src/util/event/compass.event.rrule.test.ts

@@ -42,23 +42,6 @@ describe("CompassEventRRule: ", () => {
     expect(rrule.all()).toHaveLength(count);
   });
 
-  it(`should adjust the instance COUNT to a maximum of ${GCAL_MAX_RECURRENCES}`, () => {
-    const rruleString = "RRULE:FREQ=DAILY;COUNT=1000";
-
-    const baseEvent = createMockBaseEvent({
-      recurrence: { rule: [rruleString] },
-    });
-
-    const rrule = new CompassEventRRule({
-      ...baseEvent,
-      _id: new ObjectId(baseEvent._id),
-    });
-
-    expect(rrule.toString()).toContain("RRULE:FREQ=DAILY");
-    expect(rrule.count()).toBe(GCAL_MAX_RECURRENCES);
-    expect(rrule.all()).toHaveLength(GCAL_MAX_RECURRENCES);
-  });
-
   it("should return the rrule in system timezone", () => {
     const baseEvent = createMockBaseEvent();
     const rrule = new CompassEventRRule({
@@ -94,6 +77,40 @@ describe("CompassEventRRule: ", () => {
     );
   });
 
+  it("should include start dates outside the recurrence rule", () => {
+    // Add an extra date outside the recurrence (e.g., a Friday)
+    const startDateOnMonday = dayjs().startOf("week").add(1, "day");
+    const startDate = startDateOnMonday.toISOString();
+    const rule = [`RRULE:FREQ=WEEKLY;COUNT=0;BYDAY=${RRule.FR}`];
+    const baseEvent = createMockBaseEvent({ startDate, recurrence: { rule } });
+    const _id = new ObjectId(baseEvent._id);
+    const rrule = new CompassEventRRule({ ...baseEvent, _id });
+
+    const allDates = rrule.all();
+
+    expect(allDates).toHaveLength(1);
+
+    expect(allDates.some((d) => dayjs(d).isSame(startDateOnMonday))).toBe(true);
+  });
+
+  it("should correctly merge options when multiple rrules are present", () => {
+    const rule = [
+      "RRULE:FREQ=DAILY;COUNT=2",
+      "RRULE:FREQ=WEEKLY;COUNT=1;BYDAY=FR",
+    ];
+    const baseEvent = createMockBaseEvent({ recurrence: { rule } });
+    const _id = new ObjectId(baseEvent._id);
+    const rrule = new CompassEventRRule({ ...baseEvent, _id });
+
+    // Should include both daily and weekly recurrences
+    const allDates = rrule.all();
+    expect(allDates.length).toBeGreaterThanOrEqual(2);
+
+    // Options should merge both rules
+    expect(rrule.options.freq).toBeDefined();
+    expect(rrule.options.count).toBeDefined();
+  });
+
   describe("diffOptions", () => {
     it("should return the differences between two rrule options", () => {
       const until = dayjs();

packages/core/src/util/event/compass.event.rrule.ts

@@ -10,7 +10,7 @@ import type {
   Schema_Event_Recur_Instance,
   WithMongoId,
 } from "@core/types/event.types";
-import dayjs from "@core/util/date/dayjs";
+import dayjs, { Dayjs } from "@core/util/date/dayjs";
 import {
   diffRRuleOptions,
   getCompassEventDateFormat,
@@ -21,6 +21,9 @@ export class CompassEventRRule extends RRule {
   #event: WithMongoId<Omit<Schema_Event_Recur_Base, "_id">>;
   #dateFormat: string;
   #durationMs!: number;
+  #startDate!: Dayjs;
+  #endDate!: Dayjs;
+  #timezone!: string;
 
   constructor(
     event: Pick<
@@ -33,11 +36,10 @@ export class CompassEventRRule extends RRule {
 
     this.#event = event;
     this.#dateFormat = getCompassEventDateFormat(this.#event.startDate!);
-
-    const startDate = parseCompassEventDate(this.#event.startDate!);
-    const endDate = parseCompassEventDate(this.#event.endDate!);
-
-    this.#durationMs = endDate.diff(startDate, "milliseconds");
+    this.#startDate = parseCompassEventDate(this.#event.startDate!);
+    this.#endDate = parseCompassEventDate(this.#event.endDate!);
+    this.#durationMs = this.#endDate.diff(this.#startDate, "milliseconds");
+    this.#timezone = dayjs.tz.guess();
   }
 
   static #initOptions(
@@ -52,9 +54,7 @@ export class CompassEventRRule extends RRule {
     const valid = (recurrence?.length ?? 0) > 0;
     const rruleSet = valid ? rrulestr(recurrence!, opts) : { origOptions: {} };
     const rruleOptions = { ...rruleSet.origOptions, ..._options };
-    const rawCount = rruleOptions.count ?? GCAL_MAX_RECURRENCES;
-    const count = Math.min(rawCount, GCAL_MAX_RECURRENCES);
-    const options = { ...rruleOptions, count, dtstart, tzid };
+    const options = { ...rruleOptions, dtstart, tzid };
 
     if (options.until instanceof Date) {
       options.count = undefined as unknown as number;
@@ -92,7 +92,7 @@ export class CompassEventRRule extends RRule {
     return super.toString();
   }
 
-  toString(): string {
+  override toString(): string {
     const untilRule = this.formatUNTIL(super.toString());
 
     return this.formatCount(untilRule)
@@ -109,6 +109,19 @@ export class CompassEventRRule extends RRule {
       .filter((r) => !(r.startsWith("DTSTART") || r.startsWith("DTEND")));
   }
 
+  override all(
+    iterator: (d: Date, len: number) => boolean = (_, index) =>
+      index < GCAL_MAX_RECURRENCES,
+  ): Date[] {
+    const dates = super.all(iterator);
+    const firstInstance = dates[0];
+    const firstInstanceStartDate = dayjs(firstInstance).tz(this.#timezone);
+    const includesDtStart = this.#startDate.isSame(firstInstanceStartDate);
+    const rDates = includesDtStart ? [] : [this.#startDate.toDate()];
+
+    return rDates.concat(dates);
+  }
+
   base(
     provider?: CalendarProvider,
   ): WithMongoId<Omit<Schema_Event_Recur_Base, "_id">> {
@@ -136,8 +149,7 @@ export class CompassEventRRule extends RRule {
 
     return this.all().map((date) => {
       const _id = new ObjectId();
-      const tzid = dayjs.tz.guess();
-      const _startDate = dayjs(date).tz(tzid);
+      const _startDate = dayjs(date).tz(this.#timezone);
       const _endDate = _startDate.add(this.#durationMs, "milliseconds");
       const startDate = _startDate.format(this.#dateFormat);
       const endDate = _endDate.format(this.#dateFormat);