+8
![Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)


![mintlify[bot] <109931778+mintlify[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)




![devin-ai-integration[bot]](/assets/img/avatar_default.png)
devin-ai-integration[bot]
GitHub
morgan@cal.com <morgan@cal.com>
morgan@cal.com <morgan@cal.com>
CarinaWolli
mintlify[bot] <109931778+mintlify[bot]@users.noreply.github.com>
Lauris Skraucis
supalarry
Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
morgan@cal.com <morgan@cal.com>
Anik Dhabal Babu
Benny Joo
Sahitya Chandra
Carina Wollendorfer
mintlify[bot] <109931778+mintlify[bot]@users.noreply.github.com>
Ayush Kumar
Syed Ali Shahbaz
emrysal
ebeb008f9b
* refactor: convert findQualifiedHostsWithDelegationCredentials to service class with DI - Create QualifiedHostsService class following UserAvailabilityService pattern - Add IQualifiedHostsService interface with prisma and bookingRepo dependencies - Create DI module and container for qualified hosts service - Update filterHostsBySameRoundRobinHost to accept prisma as parameter - Update all usage sites to use the new service: - loadAndValidateUsers.ts - slots/util.ts - test mocks in _post.test.ts - Maintain backward compatibility with original function export - Fix type issues in team properties (rrResetInterval, rrTimestampBasis) Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: update filterHostsBySameRoundRobinHost test to include prisma parameter - Add missing prisma parameter to all test function calls - Resolves unit test failure caused by function signature change Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: resolve type issues in FilterHostsService - Import PrismaClient type instead of using unknown - Fix type compatibility for BookingRepository constructor - Update test mocks to use proper BookingRepository type - Ensure all DI dependencies are properly typed Co-Authored-By: morgan@cal.com <morgan@cal.com> * refactor: rename DI files to CamelCase and update imports - Rename all files in packages/lib/di from kebab-case to CamelCase - Update 22 external files with import statements to use new file names - Update internal DI module files with corrected imports - Maintain consistency with TypeScript naming conventions Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: bump platform libs * chore: bump platform libs * fix: remove obsolete vitest mock after service class refactoring - Remove obsolete mock for old function module - Keep correct mock for new DI container - Resolves CI unit test failures Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: correct import path for calAIPhone zod-utils module Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: Booker active booking limit can't be switched off (#23005) * refactor: Get rid of `getServerSideProps` for /getting-started pages (#23003) * refactor * fix type check * fix: Remove Reporting page within Routing Forms (#22990) * fix error in handleNewBooking (#23011) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * Documentation edits made through Mintlify web editor (#23007) Co-authored-by: mintlify[bot] <109931778+mintlify[bot]@users.noreply.github.com> * fix: Contact support button position changed from absolute to fixed (#23002) * feat: Add private links to API (#22943) * --init * address change requests * adding further changes * address feedback * further changes * further clean-up * clean up * fix module import and others * add guards * remove unnecessary comments * remove unnecessary comments * cleanup * sort coderabbig suggestions * improve check * chore: bump platform libraries --------- Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> * chore: release v5.5.15 * chore: bump platform libs * chore: bump platform libs --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: morgan@cal.com <morgan@cal.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: Sahitya Chandra <sahityajb@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: mintlify[bot] <109931778+mintlify[bot]@users.noreply.github.com> Co-authored-by: Ayush Kumar <kumarayushkumar@protonmail.com> Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: emrysal <me@alexvanandel.com>
394 lines
12 KiB
TypeScript
394 lines
12 KiB
TypeScript
import {
|
|
getGoogleCalendarCredential,
|
|
createBookingScenario,
|
|
Timezones,
|
|
TestData,
|
|
type ScenarioData,
|
|
} from "../../utils/bookingScenario/bookingScenario";
|
|
|
|
import type { IncomingMessage } from "http";
|
|
import { describe, test, beforeEach, vi } from "vitest";
|
|
import type { z } from "zod";
|
|
|
|
import { getAvailableSlotsService } from "@calcom/lib/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);
|
|
|
|
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);
|
|
|
|
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);
|
|
|
|
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);
|
|
|
|
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);
|
|
|
|
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);
|
|
});
|
|
});
|
|
});
|