Address issue with inversion when date ranges are given out of order

calcom · Feb 7, 2025 · e62c2b5 · e62c2b5
1 parent 9f5fcc5
commit e62c2b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/packages/lib/slots.test.ts b/packages/lib/slots.test.ts
@@ -168,15 +168,21 @@ describe("Tests the date-range slot logic", () => {
     });
 
     expect(result).toHaveLength(2);
-    /*
+  });
+  it("finds correct slots when two unequal date ranges are given (inverse)", async () => {
+    const nextDay = dayjs.utc().add(1, "day").startOf("day");
 
-TODO FIX:
-    // also check for order independency.
     const dateRangesInverseOrder = [
       // 11:15-13:00
-      dateRanges[1],
+      {
+        start: nextDay.hour(11).minute(15),
+        end: nextDay.hour(13),
+      },
       // 11:00-13:00
-      dateRanges[0],
+      {
+        start: nextDay.hour(11),
+        end: nextDay.hour(13),
+      },
     ];
 
     const resultInverseOrder = getSlots({
@@ -188,7 +194,7 @@ TODO FIX:
       offsetStart: 0,
     });
 
-    expect(resultInverseOrder).toHaveLength(2);*/
+    expect(resultInverseOrder).toHaveLength(2);
   });
 
   it("finds correct slots over the span of multiple days", async () => {

diff --git a/packages/lib/slots.ts b/packages/lib/slots.ts
@@ -188,7 +188,8 @@ function buildSlotsWithDateRanges({
 
   const startTimeWithMinNotice = dayjs.utc().add(minimumBookingNotice, "minute");
 
-  dateRanges.forEach((range) => {
+  const orderedDateRanges = dateRanges.sort((a, b) => a.start.valueOf() - b.start.valueOf());
+  orderedDateRanges.forEach((range) => {
     const dateYYYYMMDD = range.start.format("YYYY-MM-DD");
 
     let slotStartTime = range.start.utc().isAfter(startTimeWithMinNotice)