From b546d9e33e05d1a8e62534c5661aaa65c85ca758 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Sat, 2 Jul 2022 18:13:39 +0200
Subject: [PATCH] Some tweaks to slots to fix server time effecting logic
 (#3218)

---
 apps/web/server/routers/viewer/slots.tsx | 18 +++++++++++++-----
 packages/core/CalendarManager.ts         |  4 +++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apps/web/server/routers/viewer/slots.tsx b/apps/web/server/routers/viewer/slots.tsx
index 8d6e416c6f..f37126c25d 100644
--- a/apps/web/server/routers/viewer/slots.tsx
+++ b/apps/web/server/routers/viewer/slots.tsx
@@ -5,7 +5,6 @@ import type { CurrentSeats } from "@calcom/core/getUserAvailability";
 import { getUserAvailability } from "@calcom/core/getUserAvailability";
 import dayjs, { Dayjs } from "@calcom/dayjs";
 import { availabilityUserSelect } from "@calcom/prisma";
-import { stringToDayjs } from "@calcom/prisma/zod-utils";
 import { TimeRange } from "@calcom/types/schedule";
 
 import isOutOfBounds from "@lib/isOutOfBounds";
@@ -17,9 +16,9 @@ import { TRPCError } from "@trpc/server";
 const getScheduleSchema = z
   .object({
     // startTime ISOString
-    startTime: stringToDayjs,
+    startTime: z.string(),
     // endTime ISOString
-    endTime: stringToDayjs,
+    endTime: z.string(),
     // Event type ID
     eventTypeId: z.number().optional(),
     // invitee timezone
@@ -149,7 +148,15 @@ export const slotsRouter = createRouter().query("getSchedule", {
       throw new TRPCError({ code: "NOT_FOUND" });
     }
 
-    const { startTime, endTime } = input;
+    const startTime =
+      input.timeZone === "Etc/GMT"
+        ? dayjs.utc(input.startTime)
+        : dayjs.utc(input.startTime).tz(input.timeZone, true);
+    const endTime =
+      input.timeZone === "Etc/GMT"
+        ? dayjs.utc(input.endTime)
+        : dayjs.utc(input.endTime).tz(input.timeZone, true);
+
     if (!startTime.isValid() || !endTime.isValid()) {
       throw new TRPCError({ message: "Invalid time range given.", code: "BAD_REQUEST" });
     }
@@ -198,7 +205,7 @@ export const slotsRouter = createRouter().query("getSchedule", {
         periodDays: eventType.periodDays,
       });
 
-    let time = input.timeZone === "Etc/GMT" ? startTime.utc() : startTime.tz(input.timeZone);
+    let time = startTime;
 
     do {
       // get slots retrieves the available times for a given day
@@ -209,6 +216,7 @@ export const slotsRouter = createRouter().query("getSchedule", {
         minimumBookingNotice: eventType.minimumBookingNotice,
         frequency: eventType.slotInterval || eventType.length,
       });
+
       // if ROUND_ROBIN - slots stay available on some() - if normal / COLLECTIVE - slots only stay available on every()
       const filterStrategy =
         !eventType.schedulingType || eventType.schedulingType === SchedulingType.COLLECTIVE
diff --git a/packages/core/CalendarManager.ts b/packages/core/CalendarManager.ts
index 33a5714ea7..77c6cea95c 100644
--- a/packages/core/CalendarManager.ts
+++ b/packages/core/CalendarManager.ts
@@ -98,7 +98,9 @@ const getCachedResults = (
     /** We extract external Ids so we don't cache too much */
     const selectedCalendarIds = passedSelectedCalendars.map((sc) => sc.externalId);
     /** We create a unque hash key based on the input data */
-    const cacheKey = createHash("md5").update(JSON.stringify({ id, selectedCalendarIds })).digest("hex");
+    const cacheKey = createHash("md5")
+      .update(JSON.stringify({ id, selectedCalendarIds, dateFrom, dateTo }))
+      .digest("hex");
     /** Check if we already have cached data and return */
     const cachedAvailability = cache.get(cacheKey);
     if (cachedAvailability) return cachedAvailability;