Scheduling infrastructure for absolutely everyone.
refactor: destination calendars when rescheduling (#21873)
Lauris Skraucis2fe71c36953d
diff --git a/apps/api/v2/package.json b/apps/api/v2/package.jsonindex 47d0b38df4f..4cc1b5860e6 100644--- a/apps/api/v2/package.json+++ b/apps/api/v2/package.json@@ -38,7 +38,7 @@"@axiomhq/winston": "^1.2.0","@calcom/platform-constants": "*","@calcom/platform-enums": "*",- "@calcom/platform-libraries": "npm:@calcom/[email protected]",+ "@calcom/platform-libraries": "npm:@calcom/[email protected]","@calcom/platform-libraries-0.0.2": "npm:@calcom/[email protected]","@calcom/platform-types": "*","@calcom/platform-utils": "*",diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.tsindex 18dc39a661c..08006a58a2b 100644--- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts+++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts@@ -1721,7 +1721,7 @@ describe("Event types Endpoints", () => {description: "undefined booking fields",length: 40,hidden: false,- slug: "undefined-booking-fields",+ slug: `undefined-booking-fields-${randomString()}`,locations: [],schedulingType: SchedulingType.ROUND_ROBIN,};@@ -1751,6 +1751,14 @@ describe("Event types Endpoints", () => {disableOnPrefill: false,hidden: false,},+ {+ disableOnPrefill: false,+ hidden: true,+ isDefault: true,+ required: false,+ slug: "attendeePhoneNumber",+ type: "phone",+ },{isDefault: true,type: "radioInput",diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.tsindex 113cb225f37..cfec551c893 100644--- a/packages/features/bookings/lib/handleNewBooking.ts+++ b/packages/features/bookings/lib/handleNewBooking.ts@@ -1502,15 +1502,6 @@ async function handler(evt.videoCallData = undefined;// To prevent "The requested identifier already exists" error while updating event, we need to remove iCalUIDevt.iCalUID = undefined;- } else {- // In case of rescheduling, we need to keep the previous host destination calendar- evt = CalendarEventBuilder.fromEvent(evt)- .withDestinationCalendar(- originalRescheduledBooking?.destinationCalendar- ? [originalRescheduledBooking?.destinationCalendar]- : evt.destinationCalendar- )- .build();}const updateManager = await eventManager.reschedule(diff --git a/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-reschedule-destination-calendar.test.ts b/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-reschedule-destination-calendar.test.tsnew file mode 100644index 00000000000..d57f848b506--- /dev/null+++ b/packages/features/bookings/lib/handleNewBooking/test/team-bookings/collective-reschedule-destination-calendar.test.ts@@ -0,0 +1,240 @@+import {+ createBookingScenario,+ getGoogleCalendarCredential,+ TestData,+ getOrganizer,+ getBooker,+ getScenarioData,+ mockSuccessfulVideoMeetingCreation,+ mockCalendarToHaveNoBusySlots,+ getDate,+ BookingLocations,+} from "@calcom/web/test/utils/bookingScenario/bookingScenario";+import { expectBookingToBeInDatabase } 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";++import type { Request, Response } from "express";+import type { NextApiRequest, NextApiResponse } from "next";+import { describe, expect, beforeEach } from "vitest";++import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";+import { resetTestEmails } from "@calcom/lib/testEmails";+import { SchedulingType } from "@calcom/prisma/enums";+import { BookingStatus } from "@calcom/prisma/enums";+import { test } from "@calcom/web/test/fixtures/fixtures";++export type CustomNextApiRequest = NextApiRequest & Request;++export type CustomNextApiResponse = NextApiResponse & Response;++const timeout = process.env.CI ? 5000 : 20000;++describe("handleNewBooking", () => {+ setupAndTeardown();++ beforeEach(() => {+ resetTestEmails();+ });++ describe("Collective Event Reschedule with Destination Calendar Bug", () => {+ test(+ `should reschedule a collective event booking and ensure both hosts have the booking in their calendars when a second host is added+ 1. Create a collective event with 1 host and book it+ 2. Add a second host to the event type+ 3. Reschedule the booking+ 4. Verify both hosts have the booking in their calendars+ `,+ async ({ emails }) => {+ const handleNewBooking = (await import("@calcom/features/bookings/lib/handleNewBooking")).default;++ const booker = getBooker({+ email: "[email protected]",+ name: "Booker",+ });++ const organizer = getOrganizer({+ name: "Organizer",+ email: "[email protected]",+ id: 101,+ schedules: [TestData.schedules.IstWorkHours],+ credentials: [getGoogleCalendarCredential()],+ selectedCalendars: [TestData.selectedCalendars.google],+ destinationCalendar: {+ integration: "google_calendar",+ externalId: "[email protected]",+ primaryEmail: "[email protected]",+ },+ });++ const { dateString: plus1DateString } = getDate({ dateIncrement: 1 });+ const { dateString: plus2DateString } = getDate({ dateIncrement: 2 });+ const uidOfBookingToBeRescheduled = "n5Wv3eHgconAED2j4gcVhP";+ const iCalUID = `${uidOfBookingToBeRescheduled}@Cal.com`;++ await createBookingScenario(+ getScenarioData({+ eventTypes: [+ {+ id: 1,+ slotInterval: 15,+ length: 30,+ schedulingType: SchedulingType.COLLECTIVE,+ users: [+ {+ id: 101, // organizer+ },+ {+ id: 102, // second host (will be added to event type)+ },+ ],+ destinationCalendar: {+ integration: "google_calendar",+ externalId: "[email protected]",+ primaryEmail: "[email protected]",+ },+ },+ ],+ users: [+ {+ id: 101,+ name: "Organizer",+ email: "[email protected]",+ username: "organizer",+ timeZone: "Asia/Kolkata",+ defaultScheduleId: null,+ schedules: [TestData.schedules.IstWorkHours],+ credentials: [getGoogleCalendarCredential()],+ selectedCalendars: [TestData.selectedCalendars.google],+ destinationCalendar: {+ integration: "google_calendar",+ externalId: "[email protected]",+ primaryEmail: "[email protected]",+ },+ },+ {+ id: 102,+ name: "Second Host",+ email: "[email protected]",+ username: "second-host",+ timeZone: "Asia/Kolkata",+ defaultScheduleId: null,+ schedules: [TestData.schedules.IstWorkHours],+ credentials: [getGoogleCalendarCredential()],+ selectedCalendars: [TestData.selectedCalendars.google],+ destinationCalendar: {+ integration: "google_calendar",+ externalId: "[email protected]",+ primaryEmail: "[email protected]",+ },+ },+ ],+ bookings: [+ {+ uid: uidOfBookingToBeRescheduled,+ eventTypeId: 1,+ status: BookingStatus.ACCEPTED,+ startTime: `${plus1DateString}T05:00:00.000Z`,+ endTime: `${plus1DateString}T05:30:00.000Z`,+ users: [+ {+ id: 101, // organizer+ },+ ],+ references: [+ {+ type: appStoreMetadata.dailyvideo.type,+ uid: "MOCK_ID_1",+ meetingId: "MOCK_ID_1",+ meetingPassword: "MOCK_PASS_1",+ meetingUrl: "http://mock-dailyvideo.example.com/meeting-1",+ credentialId: null,+ },+ {+ type: appStoreMetadata.googlecalendar.type,+ uid: "MOCKED_GOOGLE_CALENDAR_EVENT_ID_1",+ meetingId: "MOCKED_GOOGLE_CALENDAR_EVENT_ID_1",+ meetingPassword: "MOCK_PASSWORD",+ meetingUrl: "https://UNUSED_URL",+ externalCalendarId: "[email protected]",+ credentialId: undefined,+ },+ ],+ iCalUID,+ },+ ],+ apps: [TestData.apps["google-calendar"], TestData.apps["daily-video"]],+ })+ );++ mockSuccessfulVideoMeetingCreation({+ metadataLookupKey: appStoreMetadata.dailyvideo.dirName,+ videoMeetingData: {+ id: "MOCK_ID_1", // Video meeting ID is not updated during reschedule+ password: "MOCK_PASS_1",+ url: `http://mock-dailyvideo.example.com/meeting-1`,+ },+ });++ const organizerCalendarMock = mockCalendarToHaveNoBusySlots("googlecalendar", {+ update: {+ id: "MOCKED_GOOGLE_CALENDAR_EVENT_ID_2",+ iCalUID: "MOCKED_GOOGLE_CALENDAR_ICS_ID_2",+ },+ });++ const rescheduleBookingData = getMockRequestDataForBooking({+ data: {+ start: `${plus2DateString}T11:00:00.000Z`,+ end: `${plus2DateString}T11:30:00.000Z`,+ eventTypeId: 1,+ rescheduleUid: uidOfBookingToBeRescheduled,+ responses: {+ email: booker.email,+ name: booker.name,+ location: { optionValue: "", value: BookingLocations.CalVideo },+ },+ rescheduledBy: organizer.email,+ },+ });++ const rescheduledBooking = await handleNewBooking({+ bookingData: rescheduleBookingData,+ });++ await expectBookingToBeInDatabase({+ description: "",+ location: BookingLocations.CalVideo,+ responses: expect.objectContaining({+ email: booker.email,+ name: booker.name,+ }),+ uid: rescheduledBooking.uid!,+ eventTypeId: rescheduleBookingData.eventTypeId,+ status: BookingStatus.ACCEPTED,+ references: [+ {+ type: appStoreMetadata.dailyvideo.type,+ uid: "MOCK_ID_1",+ meetingId: "MOCK_ID_1",+ meetingPassword: "MOCK_PASS_1",+ meetingUrl: "http://mock-dailyvideo.example.com/meeting-1",+ },+ {+ type: appStoreMetadata.googlecalendar.type,+ uid: "MOCKED_GOOGLE_CALENDAR_EVENT_ID_1",+ externalCalendarId: "[email protected]",+ },+ ],+ });++ expect(organizerCalendarMock.updateEventCalls.length).toBe(1);+ expect(organizerCalendarMock.createEventCalls.length).toBe(0);++ // Check availability calls for both hosts+ expect(organizerCalendarMock.getAvailabilityCalls.length).toBe(2);+ },+ timeout+ );+ });+});diff --git a/yarn.lock b/yarn.lockindex 1d38834a3ba..9c0505a6273 100644--- a/yarn.lock+++ b/yarn.lock@@ -2519,7 +2519,7 @@ __metadata:"@axiomhq/winston": ^1.2.0"@calcom/platform-constants": "*""@calcom/platform-enums": "*"- "@calcom/platform-libraries": "npm:@calcom/[email protected]"+ "@calcom/platform-libraries": "npm:@calcom/[email protected]""@calcom/platform-libraries-0.0.2": "npm:@calcom/[email protected]""@calcom/platform-types": "*""@calcom/platform-utils": "*"@@ -3576,13 +3576,13 @@ __metadata:languageName: nodelinkType: hard-"@calcom/platform-libraries@npm:@calcom/[email protected]":- version: 0.0.231- resolution: "@calcom/platform-libraries@npm:0.0.231"+"@calcom/platform-libraries@npm:@calcom/[email protected]":+ version: 0.0.233+ resolution: "@calcom/platform-libraries@npm:0.0.233"dependencies:"@calcom/features": "*""@calcom/lib": "*"- checksum: 0abd36b041cc2ed2068c56d36aa94286f381f425b88a0d0d7cdb14498263bbece4928162d8cea00bbf4fa01f4fb60a018933f3f8e4573331d7be2b22aab2eeaa+ checksum: 414a908ac982899aa643d125900602210b9066e1f497102af9f8cf10a328c083d037ae6c5c5a2239081dc63a63f8a8eff5228f4115737763a4447838388866a2languageName: nodelinkType: hard