From d4d5ac2b28b28c78c39278efff857fa1e184567f Mon Sep 17 00:00:00 2001
From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:42:24 +0530
Subject: [PATCH] fix: date filter for the same day showing appointments of the
 day before (#18579)

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
---
 packages/features/filters/components/StartTimeFilters.tsx   | 1 -
 packages/trpc/server/routers/viewer/bookings/get.handler.ts | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/features/filters/components/StartTimeFilters.tsx b/packages/features/filters/components/StartTimeFilters.tsx
index a1ba9d30dd..09979fd6bb 100644
--- a/packages/features/filters/components/StartTimeFilters.tsx
+++ b/packages/features/filters/components/StartTimeFilters.tsx
@@ -40,7 +40,6 @@ export const StartTimeFilters = () => {
         minDate={null}
         dates={{ startDate: startValue, endDate: endValue }}
         onDatesChange={(values) => {
-          console.log(values);
           const newAfterStartDate = values.startDate ? dayjs(values.startDate) : undefined;
           const newBeforeEndDate = values.endDate ? dayjs(values.endDate) : undefined;
           setAfterStartDate(newAfterStartDate);
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index d326f97483..36e3c8cf1c 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -1,5 +1,6 @@
 import { Prisma as PrismaClientType } from "@prisma/client";
 
+import dayjs from "@calcom/dayjs";
 import { parseRecurringEvent, parseEventTypeColor } from "@calcom/lib";
 import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings";
 import logger from "@calcom/lib/logger";
@@ -187,7 +188,7 @@ export async function getBookings({
   if (filters?.afterStartDate) {
     bookingWhereInputFilters.afterStartDate = {
       startTime: {
-        gte: new Date(filters.afterStartDate),
+        gte: dayjs(filters.afterStartDate).utc().endOf("day").toDate(),
       },
     };
   }
@@ -195,7 +196,7 @@ export async function getBookings({
   if (filters?.beforeEndDate) {
     bookingWhereInputFilters.beforeEndDate = {
       endTime: {
-        lte: new Date(filters.beforeEndDate),
+        lte: dayjs(filters.beforeEndDate).utc().startOf("day").toDate(),
       },
     };
   }