From 192603a1fa9a3b1a2e247730f9a52a25e1c52ae7 Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Wed, 21 Feb 2024 14:58:38 -0300 Subject: [PATCH] fix: No available users found near midnight (#13801) * fix: No available users found near midnight * Update date-ranges.ts --- .../test/complex-schedules.test.ts | 206 ++++++++++++++++++ packages/lib/date-ranges.ts | 8 +- 2 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 packages/features/bookings/lib/handleNewBooking/test/complex-schedules.test.ts diff --git a/packages/features/bookings/lib/handleNewBooking/test/complex-schedules.test.ts b/packages/features/bookings/lib/handleNewBooking/test/complex-schedules.test.ts new file mode 100644 index 0000000000..4ca6484a66 --- /dev/null +++ b/packages/features/bookings/lib/handleNewBooking/test/complex-schedules.test.ts @@ -0,0 +1,206 @@ +import type { Request, Response } from "express"; +import type { NextApiRequest, NextApiResponse } from "next"; +import { describe, expect } from "vitest"; + +import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData"; +import dayjs from "@calcom/dayjs"; +import { BookingStatus } from "@calcom/prisma/enums"; +import { test } from "@calcom/web/test/fixtures/fixtures"; +import { + createBookingScenario, + getGoogleCalendarCredential, + TestData, + getDate, + getOrganizer, + getBooker, + getScenarioData, + mockSuccessfulVideoMeetingCreation, + mockCalendarToHaveNoBusySlots, + BookingLocations, +} from "@calcom/web/test/utils/bookingScenario/bookingScenario"; +import { createMockNextJsRequest } from "@calcom/web/test/utils/bookingScenario/createMockNextJsRequest"; +import { + expectSuccessfulBookingCreationEmails, + expectBookingToBeInDatabase, + expectSuccessfulCalendarEventCreationInCalendar, + expectICalUIDAsString, +} from "@calcom/web/test/utils/bookingScenario/expects"; +import { getMockRequestDataForBooking } from "@calcom/web/test/utils/bookingScenario/getMockRequestDataForBooking"; +import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAndTeardown"; + +export const Timezones = { + "-05:00": "America/New_York", + "00:00": "Europe/London", +}; + +export type CustomNextApiRequest = NextApiRequest & Request; + +export type CustomNextApiResponse = NextApiResponse & Response; +// Local test runs sometime gets too slow +const timeout = process.env.CI ? 5000 : 20000; + +describe("handleNewBooking", () => { + setupAndTeardown(); + + describe("Complex schedules:", () => { + test( + `should be able to book the last slot before midnight`, + async ({ emails }) => { + const { dateString: plus1DateString } = getDate({ dateIncrement: 1 }); + const newYorkTimeZone = Timezones["-05:00"]; + const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default; + const booker = getBooker({ + email: "booker@example.com", + name: "Booker", + }); + + // Using .endOf("day") here to ensure our date doesn't change when we set the time zone + const startDateTimeOrganizerTz = dayjs(plus1DateString) + .endOf("day") + .tz(newYorkTimeZone) + .hour(23) + .minute(0) + .second(0); + + const endDateTimeOrganizerTz = dayjs(plus1DateString) + .endOf("day") + .tz(newYorkTimeZone) + .startOf("day") + .add(1, "day"); + + const schedule = { + name: "4:00PM to 11:59PM in New York", + availability: [ + { + days: [0, 1, 2, 3, 4, 5, 6], + startTime: dayjs("1970-01-01").utc().hour(16).toDate(), // These times are stored with Z offset + endTime: dayjs("1970-01-01").utc().hour(23).minute(59).toDate(), // These times are stored with Z offset + date: null, + }, + ], + timeZone: newYorkTimeZone, + }; + + const organizer = getOrganizer({ + name: "Organizer", + email: "organizer@example.com", + id: 101, + schedules: [schedule], + credentials: [getGoogleCalendarCredential()], + selectedCalendars: [TestData.selectedCalendars.google], + }); + + await createBookingScenario( + getScenarioData({ + eventTypes: [ + { + id: 1, + slotInterval: 60, + length: 60, + users: [ + { + id: 101, + }, + ], + }, + ], + organizer, + apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]], + }) + ); + + mockSuccessfulVideoMeetingCreation({ + metadataLookupKey: "dailyvideo", + videoMeetingData: { + id: "MOCK_ID", + password: "MOCK_PASS", + url: `http://mock-dailyvideo.example.com/meeting-1`, + }, + }); + + // Mock a Scenario where iCalUID isn't returned by Google Calendar in which case booking UID is used as the ics UID + const calendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", { + create: { + id: "GOOGLE_CALENDAR_EVENT_ID", + uid: "MOCK_ID", + }, + }); + + const mockBookingData = getMockRequestDataForBooking({ + data: { + eventTypeId: 1, + responses: { + email: booker.email, + name: booker.name, + location: { optionValue: "", value: BookingLocations.CalVideo }, + }, + start: startDateTimeOrganizerTz.format(), + end: endDateTimeOrganizerTz.format(), + timeZone: Timezones["-05:00"], + }, + }); + + const { req } = createMockNextJsRequest({ + method: "POST", + body: mockBookingData, + }); + + const createdBooking = await handleNewBooking(req); + expect(createdBooking.responses).toContain({ + email: booker.email, + name: booker.name, + }); + + expect(createdBooking).toContain({ + location: BookingLocations.CalVideo, + }); + + await expectBookingToBeInDatabase({ + description: "", + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + uid: createdBooking.uid!, + eventTypeId: mockBookingData.eventTypeId, + status: BookingStatus.ACCEPTED, + references: [ + { + type: appStoreMetadata.dailyvideo.type, + uid: "MOCK_ID", + meetingId: "MOCK_ID", + meetingPassword: "MOCK_PASS", + meetingUrl: "http://mock-dailyvideo.example.com/meeting-1", + }, + { + type: appStoreMetadata.googlecalendar.type, + uid: "GOOGLE_CALENDAR_EVENT_ID", + meetingId: "GOOGLE_CALENDAR_EVENT_ID", + meetingPassword: "MOCK_PASSWORD", + meetingUrl: "https://UNUSED_URL", + }, + ], + iCalUID: createdBooking.iCalUID, + }); + + expectSuccessfulCalendarEventCreationInCalendar(calendarMock, { + videoCallUrl: "http://mock-dailyvideo.example.com/meeting-1", + // We won't be sending evt.destinationCalendar in this case. + // Google Calendar in this case fallbacks to the "primary" calendar - https://github.com/calcom/cal.com/blob/7d5dad7fea78ff24dddbe44f1da5d7e08e1ff568/packages/app-store/googlecalendar/lib/CalendarService.ts#L217 + // Not sure if it's the correct behaviour. Right now, it isn't possible to have an organizer with connected calendar but no destination calendar - As soon as the Google Calendar app is installed, a destination calendar is created. + calendarId: null, + }); + + const iCalUID = expectICalUIDAsString(createdBooking.iCalUID); + + expectSuccessfulBookingCreationEmails({ + booking: { + uid: createdBooking.uid!, + }, + booker, + organizer, + emails, + iCalUID, + }); + }, + timeout + ); + }); +}); diff --git a/packages/lib/date-ranges.ts b/packages/lib/date-ranges.ts index 645247a4da..8cc29179dd 100644 --- a/packages/lib/date-ranges.ts +++ b/packages/lib/date-ranges.ts @@ -46,7 +46,13 @@ export function processWorkingHours({ end = end.add(offsetDiff, "minute"); const startResult = dayjs.max(start, dateFrom); - const endResult = dayjs.min(end, dateTo.tz(timeZone)); + let endResult = dayjs.min(end, dateTo.tz(timeZone)); + + // INFO: We only allow users to set availability up to 11:59PM which ends up not making them available + // up to midnight. + if (endResult.hour() === 23 && endResult.minute() === 59) { + endResult = endResult.add(1, "minute"); + } if (endResult.isBefore(startResult)) { // if an event ends before start, it's not a result.