fix(calendar): recurring event fix (#6959) · calcom/cal.com@eb66931

vercel · 2023-03-10T18:06:41Z

Successfully deployed to the following URLs:

ui – ./apps/storybook

ui-git-main-cal.vercel.app
www.timelessui.com
cal-com-storybook.vercel.app
ui-cal.vercel.app
ui.cal.com
timelessui.com

-Original file line number
+Diff line change
@@ Expand Up @@
         dateTo: string,
         selectedCalendars: IntegrationCalendar[]
       ): Promise<EventBusyDate[]> {
+        const startISOString = new Date(dateFrom).toISOString();
         const objects = (
           await Promise.all(
             selectedCalendars
@@ Expand All @@
                   headers: this.headers,
                   expand: true,
                   timeRange: {
-                    start: new Date(dateFrom).toISOString(),
+                    start: startISOString,
                     end: new Date(dateTo).toISOString(),
                   },
                 })
@@ Expand Down Expand Up @@
             const start = dayjs(dateFrom);
             const end = dayjs(dateTo);
-            const iterator = event.iterator();
-            let current;
+            const startDate = ICAL.Time.fromDateTimeString(startISOString);
+            startDate.hour = event.startDate.hour;
+            startDate.minute = event.startDate.minute;
+            startDate.second = event.startDate.second;
+            const iterator = event.iterator(startDate);
+            let current: ICAL.Time;
             let currentEvent;
-            let currentStart;
+            let currentStart = null;
             let currentError;
-            do {
+            while (
+              maxIterations > 0 &&
+              (currentStart === null || currentStart.isAfter(end) === false) &&
+              // this iterator was poorly implemented, normally done is expected to be
+              // returned
+              (current = iterator.next())
+            ) {
               maxIterations -= 1;
-              current = iterator.next();
               try {
                 // @see https://github.com/mozilla-comm/ical.js/issues/514
@@ Expand Down Expand Up @@
                   end: dayjs(currentEvent.endDate.toJSDate()).toISOString(),
                 });
               }
-            } while (maxIterations > 0 && currentStart.isAfter(end) === false);
+            }
             if (maxIterations <= 0) {
               console.warn("could not find any occurrence for recurring event in 365 iterations");
             }
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -121,6 +121,7 @@ declare module "ical.js" { @@
         public static fromString(str: string): Time;
         public static fromJSDate(aDate: Date | null, useUTC: boolean): Time;
         public static fromData(aData: TimeJsonData): Time;
+        public static fromDateTimeString(aDate: string): Time;
         public now(): Time;
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

1 comment on commit `eb66931`

vercel bot commented on `eb66931` Mar 10, 2023

Commit

There are no files selected for viewing

1 comment on commit eb66931

vercel bot commented on eb66931 Mar 10, 2023

Choose a reason for hiding this comment

ui – ./apps/storybook

1 comment on commit `eb66931`

vercel bot commented on `eb66931` Mar 10, 2023