diff --git a/packages/features/bookings/lib/useFilterQuery.tsx b/packages/features/bookings/lib/useFilterQuery.tsx index 2bed7dca35..16b671cb49 100644 --- a/packages/features/bookings/lib/useFilterQuery.tsx +++ b/packages/features/bookings/lib/useFilterQuery.tsx @@ -12,11 +12,11 @@ export const filterQuerySchema = z.object({ afterStartDate: z .string() .optional() - .transform((date) => (date ? dayjs(date).format("YYYY-MM-DD") : undefined)), + .transform((date) => (date ? dayjs(date).startOf("day").format("YYYY-MM-DDTHH:mm:ss") : undefined)), beforeEndDate: z .string() .optional() - .transform((date) => (date ? dayjs(date).format("YYYY-MM-DD") : undefined)), + .transform((date) => (date ? dayjs(date).endOf("day").format("YYYY-MM-DDTHH:mm:ss") : undefined)), }); export function useFilterQuery() { diff --git a/packages/features/filters/components/StartTimeFilters.tsx b/packages/features/filters/components/StartTimeFilters.tsx index 09979fd6bb..89fa239d9e 100644 --- a/packages/features/filters/components/StartTimeFilters.tsx +++ b/packages/features/filters/components/StartTimeFilters.tsx @@ -29,8 +29,8 @@ export const StartTimeFilters = () => { } }); - search.set("afterStartDate", newStartDate.subtract(1, "day").format("YYYY-MM-DD")); - search.set("beforeEndDate", newEndDate.add(1, "day").format("YYYY-MM-DD")); + search.set("afterStartDate", newStartDate.startOf("day").format("YYYY-MM-DDTHH:mm:ss")); + search.set("beforeEndDate", newEndDate.endOf("day").format("YYYY-MM-DDTHH:mm:ss")); router.replace(`${pathname}?${search.toString()}`); }; diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts index 36e3c8cf1c..9c5bf083e7 100644 --- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts @@ -188,7 +188,7 @@ export async function getBookings({ if (filters?.afterStartDate) { bookingWhereInputFilters.afterStartDate = { startTime: { - gte: dayjs(filters.afterStartDate).utc().endOf("day").toDate(), + gte: dayjs.utc(filters.afterStartDate).toDate(), }, }; } @@ -196,7 +196,7 @@ export async function getBookings({ if (filters?.beforeEndDate) { bookingWhereInputFilters.beforeEndDate = { endTime: { - lte: dayjs(filters.beforeEndDate).utc().startOf("day").toDate(), + lte: dayjs.utc(filters.beforeEndDate).toDate(), }, }; }