pass timezone as param

calcom · Oct 4, 2024 · a1b9ccf · a1b9ccf
1 parent d9c7c0c
commit a1b9ccf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/packages/core/bookingLimits/getBusyTimesFromLimits.ts b/packages/core/bookingLimits/getBusyTimesFromLimits.ts
@@ -27,6 +27,7 @@ const _getBusyTimesFromLimits = async (
   duration: number | undefined,
   eventType: NonNullable<EventType>,
   bookings: EventBusyDetails[],
+  timeZone?: string | null,
   rescheduleUid?: string
 ) => {
   performance.mark("limitsStart");
@@ -45,6 +46,7 @@ const _getBusyTimesFromLimits = async (
       eventTypeId: eventType.id,
       limitManager,
       rescheduleUid,
+      timeZone,
     });
     performance.mark("bookingLimitsEnd");
     performance.measure(`checking booking limits took $1'`, "bookingLimitsStart", "bookingLimitsEnd");
@@ -90,6 +92,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
   teamId?: number;
   user?: { id: number; email: string };
   includeManagedEvents?: boolean;
+  timeZone?: string | null;
 }) => {
   const {
     bookings,
@@ -102,6 +105,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
     user,
     rescheduleUid,
     includeManagedEvents = false,
+    timeZone,
   } = params;
 
   for (const key of descendingLimitKeys) {
@@ -126,6 +130,7 @@ const _getBusyTimesFromBookingLimits = async (params: {
             user,
             rescheduleUid,
             includeManagedEvents,
+            timeZone,
           });
         } catch (_) {
           limitManager.addBusyTime(periodStart, unit);
@@ -235,7 +240,8 @@ const _getBusyTimesFromTeamLimits = async (
   dateTo: Dayjs,
   teamId: number,
   includeManagedEvents: boolean,
-  rescheduleUid?: string
+  rescheduleUid?: string,
+  timeZone?: string | null
 ) => {
   const { limitDateFrom, limitDateTo } = getStartEndDateforLimitCheck(
     dateFrom.toISOString(),
@@ -272,6 +278,7 @@ const _getBusyTimesFromTeamLimits = async (
     teamId,
     user,
     includeManagedEvents,
+    timeZone,
   });
 
   return limitManager.getBusyTimes();

diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts
@@ -298,7 +298,8 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
           duration,
           eventType,
           initialData?.busyTimesFromLimitsBookings ?? [],
-          initialData?.rescheduleUid ?? undefined
+          initialData?.rescheduleUid ?? undefined,
+          timeZone
         )
       : [];
 
@@ -317,7 +318,8 @@ const _getUserAvailability = async function getUsersWorkingHoursLifeTheUniverseA
           dateTo.tz(timeZone),
           teamForBookingLimits.id,
           teamForBookingLimits.includeManagedEventsInLimits,
-          initialData?.rescheduleUid ?? undefined
+          initialData?.rescheduleUid ?? undefined,
+          timeZone
         )
       : [];
 
@@ -473,8 +475,9 @@ export const getPeriodStartDatesBetween = (
 
 const _getPeriodStartDatesBetween = (dateFrom: Dayjs, dateTo: Dayjs, period: IntervalLimitUnit) => {
   const dates = [];
-  let startDate = dayjs(dateFrom).utc().startOf(period);
-  const endDate = dayjs(dateTo).utc().endOf(period);
+  let startDate = dayjs(dateFrom).startOf(period);
+  const endDate = dayjs(dateTo).endOf(period);
+
   while (startDate.isBefore(endDate)) {
     dates.push(startDate);
     startDate = startDate.add(1, period);