* fix: remove @calcom/web imports from packages/features to eliminate circular dependency - Migrate UserTableUser and MemberPermissions types to packages/features/users/types/user-table.ts - Migrate useGeo hook to packages/features/geo/GeoContext.tsx - Migrate buildLegacyRequest to packages/lib/buildLegacyCtx.ts - Migrate Calendar component to packages/features/calendars/weeklyview/components/ - Move test utilities (bookingScenario, fixtures) to packages/features/test/ - Update all imports in packages/features to use new locations - Add re-exports in apps/web for backward compatibility Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: delete original implementation files and fix type issues - Delete original calendar component files in apps/web (keep only re-export stubs) - Migrate OutOfOfficeInSlots to packages/features/bookings/components - Convert apps/web OutOfOfficeInSlots to re-export stub - Fix className vs class issue in Calendar.tsx - Fix @calcom/trpc import violation in user-table.ts by using structural type Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add missing isGroup and contains fields to UserTableUser attributes type Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: update customRole type to match actual Prisma Role model Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix build * fix * fix * cleanup weeklyview * fix * refactor to mv MemberPermissions to types package * add types dependency to features * fix * fix * fix * fix * fix * fix * rename * rename * migrate * migrate * migrate * fix * fix * fix * refactor: move test utilities from packages/features/test to tests/libs - Move bookingScenario utilities to tests/libs/bookingScenario - Move fixtures to tests/libs/fixtures - Update all imports in packages/features test files to use new location - Update all imports in apps/web test files to use new location - Eliminates duplication of test utilities between packages/features and apps/web Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: correct relative import paths for tests/libs in test files Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: replace test utility implementations with re-exports to tests/libs Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: fix test import paths and move signup handler tests to apps/web Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: move buildLegacyCtx to packages/lib and restore handlers to packages/features - Move buildLegacyCtx from apps/web/lib to packages/lib to break circular dependency - Update apps/web/lib/buildLegacyCtx.ts to re-export from @calcom/lib - Restore signup handlers and tests to packages/features/auth/signup/handlers - Update handler imports to use @calcom/lib/buildLegacyCtx instead of @calcom/web/lib/buildLegacyCtx Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: update recurring-event.test.ts imports to use tests/libs path Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: delete test re-export files and update imports to use tests/libs directly Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: update remaining test imports to use tests/libs directly Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: update handleRecurringEventBooking calls to match function signature (1 arg) Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * remove * migrate tests * migrate tests * refactor: update test mock imports by removing and using async for mock creators. * fix type errors * fix: add type assertion for MockUser in p2002.test-suite.ts Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: restore locale import in compareReminderBodyToTemplate.test.ts using relative path Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * feat: create @calcom/testing package and migrate tests from /tests directory - Created new @calcom/testing package in /packages/testing - Moved all files from /tests to /packages/testing - Updated all imports across the codebase to use @calcom/testing alias - Removed /tests directory at root level This allows other packages like @calcom/features and @calcom/web to import testing utilities using the @calcom/testing alias instead of relative paths. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * fix * fix: add missing useBookings export to @calcom/atoms package Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add missing useCalendarsBusyTimes and useConnectedCalendars exports to @calcom/atoms Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * chore: add @calcom/testing as explicit devDependency to packages that use it Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: move setupVitest.ts into @calcom/testing package Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * chore: add biome rules to restrict @calcom/testing imports Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * rename libs to lib * rename libs to lib * add rule * add rule * refactor: remove @calcom/features imports from @calcom/testing - Move mockPaymentSuccessWebhookFromStripe to fresh-booking.test.ts - Replace ProfileRepository.generateProfileUid() with uuidv4() - Clone Tracking type into @calcom/testing/src/lib/types.ts - Update imports in expects.ts and getMockRequestDataForBooking.ts - Move source files into src/ folder - Move CalendarManager mock to @calcom/features Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add explicit exports for nested paths in @calcom/testing Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * improve * improve * fix * fix * fix type checks * fix type checks * fix type checks * fix tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
405 lines
13 KiB
TypeScript
405 lines
13 KiB
TypeScript
import {
|
|
getGoogleCalendarCredential,
|
|
createBookingScenario,
|
|
Timezones,
|
|
TestData,
|
|
mockCalendarToHaveNoBusySlots,
|
|
type ScenarioData,
|
|
} from "@calcom/testing/lib/bookingScenario/bookingScenario";
|
|
|
|
import type { IncomingMessage } from "node:http";
|
|
import { describe, test, beforeEach, vi } from "vitest";
|
|
import type { z } from "zod";
|
|
|
|
import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots";
|
|
import { prisma } from "@calcom/prisma";
|
|
import type { getScheduleSchema, GetScheduleOptions } from "@calcom/trpc/server/routers/viewer/slots/types";
|
|
|
|
import { expect } from "./expects";
|
|
import { setupAndTeardown } from "./setupAndTeardown";
|
|
|
|
type ScheduleScenario = {
|
|
eventTypes: ScenarioData["eventTypes"];
|
|
users: ScenarioData["users"];
|
|
apps: ScenarioData["apps"];
|
|
selectedSlots?: ScenarioData["selectedSlots"];
|
|
};
|
|
|
|
const getTestScheduleInput = ({
|
|
yesterdayDateString,
|
|
plus5DateString,
|
|
}: {
|
|
yesterdayDateString: string;
|
|
plus5DateString: string;
|
|
}): z.infer<typeof getScheduleSchema> => ({
|
|
eventTypeId: 1,
|
|
eventTypeSlug: "",
|
|
startTime: `${yesterdayDateString}T18:30:00.000Z`,
|
|
endTime: `${plus5DateString}T18:29:59.999Z`,
|
|
timeZone: Timezones["+5:30"],
|
|
isTeamEvent: false,
|
|
orgSlug: null,
|
|
});
|
|
|
|
const getBaseScenarioData = (): ScheduleScenario => ({
|
|
eventTypes: [
|
|
{
|
|
id: 1,
|
|
slotInterval: 45,
|
|
length: 45,
|
|
users: [{ id: 101 }],
|
|
},
|
|
],
|
|
users: [
|
|
{
|
|
...TestData.users.example,
|
|
id: 101,
|
|
schedules: [TestData.schedules.IstWorkHours],
|
|
credentials: [getGoogleCalendarCredential()],
|
|
selectedCalendars: [TestData.selectedCalendars.google],
|
|
},
|
|
],
|
|
apps: [TestData.apps["google-calendar"]],
|
|
});
|
|
|
|
describe("getSchedule", () => {
|
|
const availableSlotsService = getAvailableSlotsService();
|
|
setupAndTeardown();
|
|
|
|
describe("Reserved Slots", () => {
|
|
beforeEach(async () => {
|
|
// Clear any existing selected slots before each test
|
|
await prisma.selectedSlots.deleteMany({});
|
|
});
|
|
|
|
test("should block slot from being available when reserved by another user", async () => {
|
|
// In IST timezone, it is 2024-05-31T07:00:00
|
|
vi.setSystemTime("2024-05-31T01:30:00Z");
|
|
const yesterdayDateString = "2024-05-30";
|
|
const plus2DateString = "2024-06-02";
|
|
const plus5DateString = "2024-06-05";
|
|
|
|
const scenarioData: ScheduleScenario = {
|
|
...getBaseScenarioData(),
|
|
selectedSlots: [
|
|
{
|
|
eventTypeId: 1,
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T04:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T04:45:00.000Z`),
|
|
uid: "other-user-uid",
|
|
releaseAt: new Date(Date.now() + 1000 * 60 * 60), // 1 hour from now
|
|
},
|
|
],
|
|
};
|
|
|
|
await createBookingScenario(scenarioData);
|
|
|
|
await mockCalendarToHaveNoBusySlots("googlecalendar");
|
|
|
|
const schedule = await availableSlotsService.getAvailableSlots({
|
|
input: getTestScheduleInput({ yesterdayDateString, plus5DateString }),
|
|
});
|
|
|
|
// The 4:00 slot should not be available as it's reserved by another user
|
|
expect(schedule).not.toHaveTimeSlots([`04:00:00.000Z`], {
|
|
dateString: plus2DateString,
|
|
});
|
|
});
|
|
|
|
test("should keep all slots available when slot is reserved by the same user", async () => {
|
|
// In IST timezone, it is 2024-05-31T07:00:00
|
|
vi.setSystemTime("2024-05-31T01:30:00Z");
|
|
const yesterdayDateString = "2024-05-30";
|
|
const plus2DateString = "2024-06-02";
|
|
const plus5DateString = "2024-06-05";
|
|
|
|
const bookerClientUid = "same-user-uid";
|
|
|
|
const scenarioData: ScheduleScenario = {
|
|
...getBaseScenarioData(),
|
|
selectedSlots: [
|
|
{
|
|
eventTypeId: 1,
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T04:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T04:45:00.000Z`),
|
|
uid: bookerClientUid,
|
|
releaseAt: new Date(Date.now() + 1000 * 60 * 60), // 1 hour from now
|
|
},
|
|
],
|
|
};
|
|
|
|
await createBookingScenario(scenarioData);
|
|
|
|
await mockCalendarToHaveNoBusySlots("googlecalendar");
|
|
|
|
const schedule = await availableSlotsService.getAvailableSlots({
|
|
input: getTestScheduleInput({ yesterdayDateString, plus5DateString }),
|
|
ctx: {
|
|
req: {
|
|
cookies: {
|
|
uid: bookerClientUid,
|
|
},
|
|
} as IncomingMessage & { cookies: { uid: string } },
|
|
},
|
|
} satisfies GetScheduleOptions);
|
|
|
|
// All slots should be available as they're reserved by the same user
|
|
expect(schedule).toHaveTimeSlots(
|
|
[
|
|
"04:00:00.000Z",
|
|
"04:45:00.000Z",
|
|
"05:30:00.000Z",
|
|
"06:15:00.000Z",
|
|
"07:00:00.000Z",
|
|
"07:45:00.000Z",
|
|
"08:30:00.000Z",
|
|
"09:15:00.000Z",
|
|
"10:00:00.000Z",
|
|
"10:45:00.000Z",
|
|
"11:30:00.000Z",
|
|
],
|
|
{
|
|
dateString: plus2DateString,
|
|
}
|
|
);
|
|
});
|
|
|
|
test("should make all slots available when reservation is expired", async () => {
|
|
// In IST timezone, it is 2024-05-31T07:00:00
|
|
vi.setSystemTime("2024-05-31T01:30:00Z");
|
|
const yesterdayDateString = "2024-05-30";
|
|
const plus2DateString = "2024-06-02";
|
|
const plus5DateString = "2024-06-05";
|
|
|
|
const scenarioData: ScheduleScenario = {
|
|
...getBaseScenarioData(),
|
|
selectedSlots: [
|
|
{
|
|
eventTypeId: 1,
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T04:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T04:45:00.000Z`),
|
|
uid: "expired-slot-uid",
|
|
releaseAt: new Date(Date.now() - 1000 * 60 * 60), // 1 hour ago (expired)
|
|
},
|
|
],
|
|
};
|
|
|
|
await createBookingScenario(scenarioData);
|
|
|
|
await mockCalendarToHaveNoBusySlots("googlecalendar");
|
|
|
|
const schedule = await availableSlotsService.getAvailableSlots({
|
|
input: getTestScheduleInput({ yesterdayDateString, plus5DateString }),
|
|
});
|
|
|
|
// All slots should be available as the reservation is expired
|
|
expect(schedule).toHaveTimeSlots(
|
|
[
|
|
"04:00:00.000Z",
|
|
"04:45:00.000Z",
|
|
"05:30:00.000Z",
|
|
"06:15:00.000Z",
|
|
"07:00:00.000Z",
|
|
"07:45:00.000Z",
|
|
"08:30:00.000Z",
|
|
"09:15:00.000Z",
|
|
"10:00:00.000Z",
|
|
"10:45:00.000Z",
|
|
"11:30:00.000Z",
|
|
],
|
|
{
|
|
dateString: plus2DateString,
|
|
}
|
|
);
|
|
});
|
|
|
|
test("should show correct attendee count as per reserved slots", async () => {
|
|
// In IST timezone, it is 2024-05-31T07:00:00
|
|
vi.setSystemTime("2024-05-31T01:30:00Z");
|
|
const yesterdayDateString = "2024-05-30";
|
|
const plus2DateString = "2024-06-02";
|
|
const plus5DateString = "2024-06-05";
|
|
|
|
const scenarioData: ScheduleScenario = {
|
|
...getBaseScenarioData(),
|
|
eventTypes: [
|
|
{
|
|
...getBaseScenarioData().eventTypes[0],
|
|
seatsPerTimeSlot: 5, // Total seats available
|
|
},
|
|
],
|
|
selectedSlots: [
|
|
{
|
|
eventTypeId: 1,
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T04:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T04:45:00.000Z`),
|
|
uid: "other-user-uid",
|
|
releaseAt: new Date(Date.now() + 1000 * 60 * 60), // 1 hour from now
|
|
isSeat: true,
|
|
},
|
|
],
|
|
};
|
|
|
|
await createBookingScenario(scenarioData);
|
|
|
|
await mockCalendarToHaveNoBusySlots("googlecalendar");
|
|
|
|
const schedule = await availableSlotsService.getAvailableSlots({
|
|
input: getTestScheduleInput({ yesterdayDateString, plus5DateString }),
|
|
});
|
|
|
|
// The 4:00 slot should show 1 seat taken
|
|
const slot = schedule.slots[plus2DateString].find(
|
|
(slot) => slot.time === `${plus2DateString}T04:00:00.000Z`
|
|
);
|
|
expect(slot).toBeDefined();
|
|
expect(slot?.attendees).toBe(1);
|
|
});
|
|
|
|
test("should block slots even when reservation is for a different event type", async () => {
|
|
// In IST timezone, it is 2024-05-31T07:00:00
|
|
vi.setSystemTime("2024-05-31T01:30:00Z");
|
|
const yesterdayDateString = "2024-05-30";
|
|
const plus2DateString = "2024-06-02";
|
|
const plus5DateString = "2024-06-05";
|
|
const differentEventTypeId = 2;
|
|
const scenarioData: ScheduleScenario = {
|
|
...getBaseScenarioData(),
|
|
eventTypes: [
|
|
{
|
|
id: 1,
|
|
slotInterval: 45,
|
|
length: 45,
|
|
users: [{ id: 101 }],
|
|
},
|
|
{
|
|
id: differentEventTypeId,
|
|
slotInterval: 45,
|
|
length: 45,
|
|
users: [{ id: 101 }],
|
|
},
|
|
],
|
|
selectedSlots: [
|
|
{
|
|
eventTypeId: differentEventTypeId, // Different event type
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T04:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T04:45:00.000Z`),
|
|
uid: "other-user-uid",
|
|
releaseAt: new Date(Date.now() + 1000 * 60 * 60), // 1 hour from now
|
|
},
|
|
],
|
|
};
|
|
|
|
await createBookingScenario(scenarioData);
|
|
|
|
await mockCalendarToHaveNoBusySlots("googlecalendar");
|
|
|
|
const schedule = await availableSlotsService.getAvailableSlots({
|
|
input: getTestScheduleInput({ yesterdayDateString, plus5DateString }),
|
|
});
|
|
|
|
// The 4:00 slot should still be unavailable even when the reservation is for a different event type
|
|
expect(schedule).toHaveTimeSlots(
|
|
[
|
|
// "04:00:00.000Z",
|
|
"04:45:00.000Z",
|
|
"05:30:00.000Z",
|
|
"06:15:00.000Z",
|
|
"07:00:00.000Z",
|
|
"07:45:00.000Z",
|
|
"08:30:00.000Z",
|
|
"09:15:00.000Z",
|
|
"10:00:00.000Z",
|
|
"10:45:00.000Z",
|
|
"11:30:00.000Z",
|
|
],
|
|
{
|
|
dateString: plus2DateString,
|
|
}
|
|
);
|
|
});
|
|
|
|
test("should clean up only expired slots", async () => {
|
|
// In IST timezone, it is 2024-05-31T07:00:00
|
|
vi.setSystemTime("2024-05-31T01:30:00Z");
|
|
const yesterdayDateString = "2024-05-30";
|
|
const plus2DateString = "2024-06-02";
|
|
const plus5DateString = "2024-06-05";
|
|
|
|
const bookerClientUid = "same-user-uid";
|
|
const expiredTime = new Date(Date.now() - 1000 * 60 * 60); // 1 hour ago (expired)
|
|
const notExpiredTime = new Date(Date.now() + 1000 * 60 * 60); // 1 hour from now (not expired)
|
|
const scenarioData: ScheduleScenario = {
|
|
...getBaseScenarioData(),
|
|
selectedSlots: [
|
|
// Will be deleted
|
|
{
|
|
eventTypeId: 1,
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T04:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T04:45:00.000Z`),
|
|
uid: bookerClientUid,
|
|
releaseAt: expiredTime,
|
|
},
|
|
// Will be not deleted
|
|
{
|
|
eventTypeId: 1,
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T05:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T05:45:00.000Z`),
|
|
uid: bookerClientUid,
|
|
releaseAt: notExpiredTime,
|
|
},
|
|
// Will be not deleted
|
|
{
|
|
eventTypeId: 1,
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T06:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T06:45:00.000Z`),
|
|
uid: "another-user-uid",
|
|
releaseAt: notExpiredTime,
|
|
},
|
|
// Will be deleted
|
|
{
|
|
eventTypeId: 1,
|
|
userId: 101,
|
|
slotUtcStartDate: new Date(`${plus2DateString}T07:00:00.000Z`),
|
|
slotUtcEndDate: new Date(`${plus2DateString}T07:45:00.000Z`),
|
|
uid: "another-user-uid",
|
|
releaseAt: expiredTime,
|
|
},
|
|
],
|
|
};
|
|
|
|
await createBookingScenario(scenarioData);
|
|
|
|
await availableSlotsService.getAvailableSlots({
|
|
input: getTestScheduleInput({ yesterdayDateString, plus5DateString }),
|
|
ctx: {
|
|
req: {
|
|
cookies: {
|
|
uid: bookerClientUid,
|
|
},
|
|
} as IncomingMessage & { cookies: { uid: string } },
|
|
},
|
|
} satisfies GetScheduleOptions);
|
|
|
|
// Verify that both slots are cleaned up from DB for this event type
|
|
const remainingSlots = await prisma.selectedSlots.findMany({
|
|
where: {
|
|
userId: 101,
|
|
eventTypeId: 1,
|
|
},
|
|
});
|
|
|
|
// There are two unexpired slots
|
|
expect(remainingSlots).toHaveLength(2);
|
|
});
|
|
});
|
|
});
|