* perf: implement quick app store loading optimizations - Add conditional app store imports in videoClient and handlePayment - Implement lazy calendar manager pattern in CalendarManager - Enhance createCachedImport with better concurrency handling - Create calendar-only registry for common calendar operations - Add performance instrumentation for debugging These optimizations reduce initial app store loading time by avoiding module-level imports and creating smaller, focused registries for calendar operations. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: revert getCalendar to use appStore for proper test mocking - Reverted getCalendar.ts to use main appStore instead of calendarStore - This ensures test mocking system works properly with existing appStoreMock - Fixes unit test failures where Google Calendar references were getting null values - All collective scheduling tests now pass Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * perf: implement CalendarServiceMap for optimized calendar loading - Add CalendarServiceMap generation following CrmServiceMap pattern - Update getCalendar.ts to use generated calendar service map - Remove manual calendar-registry.ts in favor of auto-generated approach - Reduces calendar initialization from loading 48+ apps to ~10 calendar apps Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update test mocks for CalendarServiceMap compatibility - Add missing SelectedCalendar fields (createdAt, updatedAt, lastErrorAt, watchAttempts, etc.) - Fix CredentialPayload type errors by adding user.email and delegationCredentialId - Mock CalendarServiceMap to use vi.importActual for real calendar services - Ensure calendar service tests work with new lazy loading approach Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: resolve CalendarServiceMap test compatibility issues - Update getCalendarsEvents.test.ts mocks to work with CalendarServiceMap dynamic imports - Add missing SelectedCalendar fields (createdAt, updatedAt, lastErrorAt, watchAttempts, etc.) - Fix CredentialPayload type errors by adding user.email and delegationCredentialId - Use type assertion in getCalendar.ts to resolve credential type conflicts - Ensure calendar service tests work with new lazy loading approach Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update test mocking for CalendarServiceMap compatibility - Add comprehensive vi.mock for calendar.services.generated in delegation-credential tests - Mock GoogleCalendarService and Office365CalendarService with proper return values - Update all test files to use await with mockCalendarToHaveNoBusySlots - Ensure calendar events return expected meetingId, meetingPassword, meetingUrl values - Fix async/await compatibility issues in booking scenario test utilities Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: resolve TypeScript errors in CalendarServiceMap mocking - Extract CalendarServiceMap promise to variable to fix 'always true' condition - Ensure vi.mocked is called on Promise type for proper mockResolvedValue access - Add await keywords to calendar mock calls in test files - Maintain existing functionality while making code type-safe Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Remove Exchange 2013 and 2016 * Mock Exchange in all tests * Fix tests * Remove exchange 2013 and 2016 from app store index * Fix merge error * Await when getting calendar service * Fix selectedSlot test * Add missing variable * Update openapi.json * Updated CalendarService imports * try again * WIP migrate calendar apps to ES6 * Revert "WIP migrate calendar apps to ES6" This reverts commit 15bf2c83305e82050779d0bca3380fa9573db1e0. * Revert changes back to e23991024a5a455c14aa05f100a5b56288db343a This reverts all calendar service changes that were causing circular dependency issues during builds and E2E tests. * Remove circular dependency for location constants * Update yarn.lock with removed package * Add empty map when running E2E * Type fies * Fix merge conflict * Remove logging statements * Throw error and reset state if failing to load app * Revert "Remove Exchange 2013 and 2016" This reverts commit fedaf6346bd9e4c63337276d5a6f9e8c3943056c. * Re-introduce exchange{2013,2016} Revert the removal in app-store/index.ts also. * Trying to fix tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com>
146 lines
4.9 KiB
TypeScript
146 lines
4.9 KiB
TypeScript
/**
|
|
* Tests for calendar event deletion during round robin organizer change operations.
|
|
* Covers scenarios where events need to be deleted from original hosts and
|
|
* credential handling during organizer changes.
|
|
*/
|
|
import {
|
|
getDate,
|
|
createBookingScenario,
|
|
getScenarioData,
|
|
getMockBookingAttendee,
|
|
TestData,
|
|
getOrganizer,
|
|
getGoogleCalendarCredential,
|
|
mockCalendarToHaveNoBusySlots,
|
|
} from "@calcom/web/test/utils/bookingScenario/bookingScenario";
|
|
import {
|
|
expectBookingToBeInDatabase,
|
|
expectSuccessfulRoundRobinReschedulingEmails,
|
|
} from "@calcom/web/test/utils/bookingScenario/expects";
|
|
import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAndTeardown";
|
|
|
|
import { describe, expect } from "vitest";
|
|
|
|
import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
|
|
import { SchedulingType, BookingStatus } from "@calcom/prisma/enums";
|
|
import { test } from "@calcom/web/test/fixtures/fixtures";
|
|
|
|
describe("roundRobinReassignment test", () => {
|
|
setupAndTeardown();
|
|
|
|
test("should delete calendar events from original host when round robin reassignment changes organizer", async ({
|
|
emails,
|
|
}) => {
|
|
const roundRobinReassignment = (await import("./roundRobinReassignment")).default;
|
|
|
|
const originalHost = getOrganizer({
|
|
name: "Original Host",
|
|
email: "originalhost@example.com",
|
|
id: 101,
|
|
schedules: [TestData.schedules.IstWorkHours],
|
|
credentials: [getGoogleCalendarCredential()],
|
|
selectedCalendars: [TestData.selectedCalendars.google],
|
|
});
|
|
|
|
const newHost = getOrganizer({
|
|
name: "New Host",
|
|
email: "newhost@example.com",
|
|
id: 102,
|
|
schedules: [TestData.schedules.IstWorkHours],
|
|
credentials: [getGoogleCalendarCredential()],
|
|
selectedCalendars: [TestData.selectedCalendars.google],
|
|
});
|
|
|
|
const { dateString: dateStringPlusOne } = getDate({ dateIncrement: 1 });
|
|
const bookingToReassignUid = "booking-to-reassign-with-deletion";
|
|
|
|
await createBookingScenario(
|
|
getScenarioData({
|
|
eventTypes: [
|
|
{
|
|
id: 1,
|
|
slug: "round-robin-event",
|
|
schedulingType: SchedulingType.ROUND_ROBIN,
|
|
length: 45,
|
|
users: [{ id: 101 }, { id: 102 }],
|
|
hosts: [
|
|
{ userId: 101, isFixed: false },
|
|
{ userId: 102, isFixed: false },
|
|
],
|
|
},
|
|
],
|
|
bookings: [
|
|
{
|
|
id: 123,
|
|
eventTypeId: 1,
|
|
userId: originalHost.id,
|
|
uid: bookingToReassignUid,
|
|
status: BookingStatus.ACCEPTED,
|
|
startTime: `${dateStringPlusOne}T05:00:00.000Z`,
|
|
endTime: `${dateStringPlusOne}T05:45:00.000Z`,
|
|
attendees: [
|
|
getMockBookingAttendee({
|
|
id: 2,
|
|
name: "attendee",
|
|
email: "attendee@test.com",
|
|
locale: "en",
|
|
timeZone: "Asia/Kolkata",
|
|
}),
|
|
],
|
|
references: [
|
|
{
|
|
id: 1,
|
|
type: appStoreMetadata.googlecalendar.type,
|
|
uid: "ORIGINAL_EVENT_ID",
|
|
meetingId: "ORIGINAL_EVENT_ID",
|
|
meetingPassword: null,
|
|
meetingUrl: null,
|
|
externalCalendarId: "MOCK_EXTERNAL_CALENDAR_ID",
|
|
credentialId: 1,
|
|
deleted: null,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
organizer: originalHost,
|
|
usersApartFromOrganizer: [newHost],
|
|
apps: [TestData.apps["google-calendar"]],
|
|
})
|
|
);
|
|
|
|
const calendarMock = await mockCalendarToHaveNoBusySlots("googlecalendar", {
|
|
create: { uid: "NEW_EVENT_ID" },
|
|
update: { uid: "UPDATED_EVENT_ID" },
|
|
});
|
|
|
|
await roundRobinReassignment({
|
|
bookingId: 123,
|
|
});
|
|
|
|
// Verify that calendar deletion occurred (may be called multiple times due to duplicate references)
|
|
expect(calendarMock.deleteEventCalls.length).toBeGreaterThanOrEqual(1);
|
|
const deleteCall = calendarMock.deleteEventCalls[0];
|
|
expect(deleteCall.args.uid).toBe("ORIGINAL_EVENT_ID");
|
|
expect(deleteCall.args.externalCalendarId).toBe("MOCK_EXTERNAL_CALENDAR_ID");
|
|
expect(deleteCall.args.event.organizer.email).toBe(newHost.email); // Current implementation uses new host credentials
|
|
expect(deleteCall.args.event.uid).toBe(bookingToReassignUid);
|
|
|
|
// Verify that creation occurred with new host credentials
|
|
expect(calendarMock.createEventCalls.length).toBe(1);
|
|
const createCall = calendarMock.createEventCalls[0];
|
|
expect(createCall.args.calEvent.organizer.email).toBe(newHost.email);
|
|
|
|
// Verify the booking was reassigned to the new host
|
|
expectBookingToBeInDatabase({
|
|
uid: bookingToReassignUid,
|
|
userId: newHost.id,
|
|
});
|
|
|
|
expectSuccessfulRoundRobinReschedulingEmails({
|
|
prevOrganizer: originalHost,
|
|
newOrganizer: newHost,
|
|
emails,
|
|
});
|
|
});
|
|
});
|