fix: Missing date ranges when specifying a specific slot time (#13645)

calcom · Feb 12, 2024 · 5acb3e8 · 5acb3e8
1 parent 41046aa
commit 5acb3e8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/packages/lib/date-ranges.test.ts b/packages/lib/date-ranges.test.ts
@@ -317,6 +317,26 @@ describe("buildDateRanges", () => {
       end: dayjs("2023-06-14T16:00:00Z").tz(timeZone),
     });
   });
+  it("should return correct date ranges for specific time slot in date override", () => {
+    const items = [
+      {
+        date: new Date(Date.UTC(2023, 5, 13)),
+        startTime: new Date(Date.UTC(0, 0, 0, 9, 0)),
+        endTime: new Date(Date.UTC(0, 0, 0, 14, 0)),
+      },
+    ];
+    const timeZone = "Europe/London";
+
+    const dateFrom = dayjs("2023-06-13T10:00:00Z");
+    const dateTo = dayjs("2023-06-13T10:30:00Z");
+
+    const results = buildDateRanges({ availability: items, timeZone, dateFrom, dateTo });
+
+    expect(results[0]).toEqual({
+      start: dayjs("2023-06-13T08:00:00Z").tz(timeZone),
+      end: dayjs("2023-06-13T13:00:00Z").tz(timeZone),
+    });
+  });
   it("should return correct date ranges if date override would already already be the next day in utc timezone", () => {
     const items = [
       {

diff --git a/packages/lib/date-ranges.ts b/packages/lib/date-ranges.ts
@@ -116,7 +116,7 @@ export function buildDateRanges({
     availability.reduce((processed: DateRange[], item) => {
       if ("date" in item && !!item.date) {
         const itemDateAsUtc = dayjs.utc(item.date);
-        if (itemDateAsUtc.isBetween(dateFrom, dateTo, null, "[]")) {
+        if (itemDateAsUtc.isBetween(dateFrom.startOf("day"), dateTo.endOf("day"), null, "[]")) {
           processed.push(processDateOverride({ item, itemDateAsUtc, timeZone }));
         }
       }