From f87eac193fb0a6b244489a61b97e5f65b73e64b9 Mon Sep 17 00:00:00 2001 From: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Date: Fri, 8 Dec 2023 01:31:02 +0000 Subject: [PATCH] fix: rr-host booked outside of availability (#12704) * correctly query overlapping bookings * remove console.log * fix getting busy bookings for getAvailableSlots --------- Co-authored-by: CarinaWolli --- .../web/playwright/organization/organization-creation.e2e.ts | 1 - packages/core/getBusyTimes.ts | 5 +++-- packages/trpc/server/routers/viewer/slots/util.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/web/playwright/organization/organization-creation.e2e.ts b/apps/web/playwright/organization/organization-creation.e2e.ts index 19b3477026..44ccd43bad 100644 --- a/apps/web/playwright/organization/organization-creation.e2e.ts +++ b/apps/web/playwright/organization/organization-creation.e2e.ts @@ -54,7 +54,6 @@ test.describe("Organization", () => { // Code verification await expect(page.locator("#modal-title")).toBeVisible(); await page.locator("input[name='2fa1']").fill(generateTotpCode(`john@${orgDomain}.com`)); - await page.locator("button:text('Verify')").click(); // Check admin email about DNS pending action await expectInvitationEmailToBeReceived( diff --git a/packages/core/getBusyTimes.ts b/packages/core/getBusyTimes.ts index 52ac861a23..4323419134 100644 --- a/packages/core/getBusyTimes.ts +++ b/packages/core/getBusyTimes.ts @@ -83,9 +83,10 @@ export async function getBusyTimes(params: { const endTimeDate = rescheduleUid && duration ? dayjs(endTime).add(duration, "minute").toDate() : new Date(endTime); + // startTime is less than endTimeDate and endTime grater than startTimeDate const sharedQuery = { - startTime: { gte: startTimeDate }, - endTime: { lte: endTimeDate }, + startTime: { lte: endTimeDate }, + endTime: { gte: startTimeDate }, status: { in: [BookingStatus.ACCEPTED], }, diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts index e5a507f01e..52e0f6932c 100644 --- a/packages/trpc/server/routers/viewer/slots/util.ts +++ b/packages/trpc/server/routers/viewer/slots/util.ts @@ -328,8 +328,8 @@ export async function getAvailableSlots({ input, ctx }: GetScheduleOptions) { input.rescheduleUid && durationToUse ? endTime.add(durationToUse, "minute").toDate() : endTime.toDate(); const sharedQuery = { - startTime: { gte: startTimeDate }, - endTime: { lte: endTimeDate }, + startTime: { lte: endTimeDate }, + endTime: { gte: startTimeDate }, status: { in: [BookingStatus.ACCEPTED], },