use date ranges without excluded OOO in handleNewBooking

calcom · Apr 10, 2024 · f12d130 · f12d130
1 parent 7ab8a94
commit f12d130
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/packages/core/getAggregateWorkingHours.ts b/packages/core/getAggregateWorkingHours.ts
@@ -8,7 +8,7 @@ import type { WorkingHours } from "@calcom/types/schedule";
 export const getAggregateWorkingHours = (
   usersWorkingHoursAndBusySlots: (Omit<
     Awaited<ReturnType<Awaited<typeof import("./getUserAvailability")>["getUserAvailability"]>>,
-    "currentSeats" | "dateRanges" | "dateRangesWithoutOOO"
+    "currentSeats" | "dateRanges" | "oooExcludedDateRanges"
   > & { user?: { isFixed?: boolean } })[],
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   schedulingType: SchedulingType | null

diff --git a/packages/core/getAggregatedAvailability/index.ts b/packages/core/getAggregatedAvailability/index.ts
@@ -7,7 +7,7 @@ import { mergeOverlappingDateRanges } from "./date-range-utils/mergeOverlappingD
 export const getAggregatedAvailability = (
   userAvailability: {
     dateRanges: DateRange[];
-    dateRangesWithoutOOO: DateRange[];
+    oooExcludedDateRanges: DateRange[];
     user?: { isFixed?: boolean };
   }[],
   schedulingType: SchedulingType | null
@@ -20,12 +20,14 @@ export const getAggregatedAvailability = (
     ({ user }) => !schedulingType || schedulingType === SchedulingType.COLLECTIVE || user?.isFixed
   );
 
-  const dateRangesToIntersect = fixedHosts.map((s) => (!isTeamEvent ? s.dateRanges : s.dateRangesWithoutOOO));
+  const dateRangesToIntersect = fixedHosts.map((s) =>
+    !isTeamEvent ? s.dateRanges : s.oooExcludedDateRanges
+  );
 
   const unfixedHosts = userAvailability.filter(({ user }) => user?.isFixed !== true);
   if (unfixedHosts.length) {
     dateRangesToIntersect.push(
-      unfixedHosts.flatMap((s) => (!isTeamEvent ? s.dateRanges : s.dateRangesWithoutOOO))
+      unfixedHosts.flatMap((s) => (!isTeamEvent ? s.dateRanges : s.oooExcludedDateRanges))
     );
   }
 

diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
@@ -339,7 +339,7 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
     availability,
   });
 
-  const { dateRanges, dateRangesWithoutOOO } = buildDateRanges({
+  const { dateRanges, oooExcludedDateRanges } = buildDateRanges({
     dateFrom,
     dateTo,
     availability,
@@ -354,7 +354,7 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
 
   const dateRangesInWhichUserIsAvailable = subtract(dateRanges, formattedBusyTimes);
 
-  const dateRangesInWhichUserIsAvailableWithoutOOO = subtract(dateRangesWithoutOOO, formattedBusyTimes);
+  const dateRangesInWhichUserIsAvailableWithoutOOO = subtract(oooExcludedDateRanges, formattedBusyTimes);
 
   log.debug(
     `getWorkingHours took ${endGetWorkingHours - startGetWorkingHours}ms for userId ${userId}`,
@@ -371,7 +371,7 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
     busy: detailedBusyTimes,
     timeZone,
     dateRanges: dateRangesInWhichUserIsAvailable,
-    dateRangesWithoutOOO: dateRangesInWhichUserIsAvailableWithoutOOO,
+    oooExcludedDateRanges: dateRangesInWhichUserIsAvailableWithoutOOO,
     workingHours,
     dateOverrides,
     currentSeats,

diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts
@@ -357,7 +357,7 @@ export async function ensureAvailableUsers(
   }
 
   for (const user of eventType.users) {
-    const { dateRanges, busy: bufferedBusyTimes } = await getUserAvailability(
+    const { oooExcludedDateRanges: dateRanges, busy: bufferedBusyTimes } = await getUserAvailability(
       {
         ...input,
         userId: user.id,

diff --git a/packages/lib/date-ranges.test.ts b/packages/lib/date-ranges.test.ts
@@ -391,7 +391,7 @@ describe("buildDateRanges", () => {
 
     const timeZone = "America/New_York";
 
-    const { dateRanges, dateRangesWithoutOOO } = buildDateRanges({
+    const { dateRanges, oooExcludedDateRanges } = buildDateRanges({
       availability: items,
       timeZone,
       dateFrom,
@@ -408,8 +408,8 @@ describe("buildDateRanges", () => {
       start: dayjs("2023-06-14T12:00:00Z").tz(timeZone),
       end: dayjs("2023-06-14T21:00:00Z").tz(timeZone),
     });
-    expect(dateRangesWithoutOOO.length).toBe(1);
-    expect(dateRangesWithoutOOO[0]).toEqual({
+    expect(oooExcludedDateRanges.length).toBe(1);
+    expect(oooExcludedDateRanges[0]).toEqual({
       start: dayjs("2023-06-14T12:00:00Z").tz(timeZone),
       end: dayjs("2023-06-14T21:00:00Z").tz(timeZone),
     });

diff --git a/packages/lib/date-ranges.ts b/packages/lib/date-ranges.ts
@@ -128,7 +128,7 @@ export function buildDateRanges({
   dateFrom: Dayjs;
   dateTo: Dayjs;
   outOfOffice?: IOutOfOfficeData;
-}): { dateRanges: DateRange[]; dateRangesWithoutOOO: DateRange[] } {
+}): { dateRanges: DateRange[]; oooExcludedDateRanges: DateRange[] } {
   const dateFromOrganizerTZ = dateFrom.tz(timeZone);
   const groupedWorkingHours = groupByDate(
     availability.reduce((processed: DateRange[], item) => {
@@ -178,7 +178,7 @@ export function buildDateRanges({
     (ranges) => ranges.filter((range) => range.start.valueOf() !== range.end.valueOf())
   );
 
-  const dateRangesWithoutOOO = Object.values({
+  const oooExcludedDateRanges = Object.values({
     ...groupedWorkingHours,
     ...groupedDateOverrides,
     ...groupedOOO,
@@ -187,7 +187,7 @@ export function buildDateRanges({
     (ranges) => ranges.filter((range) => range.start.valueOf() !== range.end.valueOf())
   );
 
-  return { dateRanges: dateRanges.flat(), dateRangesWithoutOOO: dateRangesWithoutOOO.flat() };
+  return { dateRanges: dateRanges.flat(), oooExcludedDateRanges: oooExcludedDateRanges.flat() };
 }
 
 export function groupByDate(ranges: DateRange[]): { [x: string]: DateRange[] } {

diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts
@@ -461,7 +461,7 @@ export async function getAvailableSlots({ input, ctx }: GetScheduleOptions): Pro
       const {
         busy,
         dateRanges,
-        dateRangesWithoutOOO,
+        oooExcludedDateRanges,
         currentSeats: _currentSeats,
         timeZone,
         datesOutOfOffice,
@@ -497,7 +497,7 @@ export async function getAvailableSlots({ input, ctx }: GetScheduleOptions): Pro
       return {
         timeZone,
         dateRanges,
-        dateRangesWithoutOOO,
+        oooExcludedDateRanges,
         busy,
         user: currentUser,
         datesOutOfOffice,