+9









Hariom Balhara
GitHub
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
hariom@cal.com <hariombalhara@gmail.com>
Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Udit Takkar
Volnei Munhoz
5993889616
* Integrate creation/rescheduling booking audit * fix: add missing hostUserUuid to booking audit test data Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix-ci * feat: enhance booking audit with seat reference - Added support for seat reference in booking audit actions. - Updated localization for booking creation to include seat information. - Modified relevant services to pass attendee seat ID during booking creation. * fix: update test data to match schema requirements - Add seatReferenceUid: null to default mock audit log data - Add seatReferenceUid: null to multiple audit logs test case - Convert SEAT_RESCHEDULED test data to use numeric timestamps instead of ISO strings Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * Allow nullish seatReferenceUid * feat: enhance booking audit to support rescheduledBy information - Updated booking audit actions to include rescheduledBy details, allowing tracking of who rescheduled a booking. - Refactored related services to accommodate the new rescheduledBy parameter in booking events. - Adjusted type definitions and function signatures to reflect the changes in the booking audit context. * Avoid possible run time issue * Fix imoport path * fix failing test due to merge from main\ * Pass useruuid * chore: retrigger CI (flaky unit test) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * feat: add context parameter to bulk audit methods for impersonation support - Add context parameter to queueBulkCreatedAudit and queueBulkRescheduledAudit in BookingAuditProducerService interface - Add context parameter to BookingAuditTaskerProducerService implementation - Add context parameter to onBulkBookingsCreated and onBulkBookingsRescheduled in BookingEventHandlerService - Update RegularBookingService.fireBookingEvents to accept and pass impersonation context - Update RecurringBookingService.fireBookingEvents to accept and pass impersonation context - Update handleSeats to accept and pass impersonation context Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * chore: Integrate mark-no-show booking audit Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Simplify host no-show audit and add comment for attendee actor Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * feat: make impersonatedByUserUuid required with explicit null for non-impersonation cases Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * feat: integrate impersonatedByUserUuid into booking cancellation audit flow - Add impersonatedByUserUuid to CancelBookingInput and CancelBookingMeta types - Pass audit context with impersonatedBy to onBookingCancelled and onBulkBookingsCancelled - Update all cancel booking call sites to pass impersonatedByUserUuid: - Web app cancel route: uses session impersonatedBy - API v1 and v2: explicitly set to null (no impersonation support) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: make impersonatedByUserUuid optional and remove explicit null assignments - Changed impersonatedByUserUuid from required (string | null) to optional (string?) - Removed explicit null assignments from API v1 and v2 endpoints - Keep impersonatedByUserUuid only where impersonation actually occurs (web app) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * Apply suggestions from code review Rfemove unnecessary comment * fix: restore bookingMeta variable in createBookingForApiV1 Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Make actionSource required with ValidActionSource type and remove unnecessary comments Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Remove merge conflict markers from bookings.service.ts Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * feat: implement SYSTEM as a booking audit source for background tasks, including no-show triggers. * refactor: Move prisma query to BookingRepository for audit logging Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * Conflict resolution * refactor: introduce `handleMarkHostNoShow` for public viewer and standardize actor and action source parameters for no-show actions. * refactor: Combine HostNoShowUpdatedAuditActionService and AttendeeNoShowUpdatedAuditActionService into NoShowUpdatedActionService - Create new NoShowUpdatedAuditActionService with combined schema supporting both noShowHost and noShowAttendee as optional fields - Update BookingAuditActionServiceRegistry to use combined service with NO_SHOW_UPDATED action type - Update BookingAuditTaskerProducerService with single queueNoShowUpdatedAudit method - Update BookingAuditProducerService.interface.ts with combined method - Update BookingEventHandlerService with single onNoShowUpdated method - Update handleMarkNoShow.ts to use combined audit service - Update tasker tasks (triggerGuestNoShow, triggerHostNoShow) to use combined service - Add NO_SHOW_UPDATED to Prisma BookingAuditAction enum - Remove old separate HostNoShowUpdatedAuditActionService and AttendeeNoShowUpdatedAuditActionService files This allows a single API action (e.g., API V2 markAbsent) that updates both host and attendee no-show status to be logged as a single audit event. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * chore: Add migration for NO_SHOW_UPDATED audit action enum value Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Update no-show audit schema to use host and attendees array - Rename noShowHost to host and noShowAttendee to attendees (remove redundant prefix) - Change attendees from single value to array to support multiple attendees in single audit entry - Update handleMarkNoShow.ts to create single audit entry for all attendees - Update tasker tasks (triggerGuestNoShow, triggerHostNoShow) to use new schema - Update display data types to reflect new schema structure Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * Update schema to be more clear. Call onNoShowUpdated immediately after DB update as audit only cares about DB update, and this would avoid any accidental Audit update on DB change * chore: accommodate schema changes and fix type errors for no-show audit Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Update migration to remove old no-show enum values Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Use updated attendees in webhook payload for guest no-show Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Remove duplicate imports and fix actor parameter in bookings.service.ts Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Move booking query to BookingRepository and remove unused method Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: centralize no-show audit event firing and attendee fetching within `handleMarkNoShow` for improved clarity. * fix: Build attendeesNoShow as Record with attendee IDs as keys Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * Fix and add tests for handleMarkBoShow * refactor: Move prisma queries to AttendeeRepository and BookingRepository Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Correct return type for updateNoShow method (noShow can be null) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Update handleMarkNoShow tests to mock new repository methods Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix triggerGuestNoShow * refactor: Move triggerGuestNoShow queries to AttendeeRepository and add unit tests - Add new methods to AttendeeRepository: - findByBookingId: Get attendees with id, email, noShow - findByBookingIdWithDetails: Get full attendee details - updateManyNoShowByBookingIdAndEmails: Update specific attendees - updateManyNoShowByBookingIdExcludingEmails: Update all except specific emails - Refactor triggerGuestNoShow.ts to use AttendeeRepository instead of direct Prisma calls - Add comprehensive unit tests for triggerGuestNoShow following handleMarkNoShow.test.ts pattern: - Mock repositories and external services - In-memory DB simulation - Test core functionality, audit logging, webhook payload, error handling, and edge cases Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Move triggerHostNoShow queries to repositories and delete unit test file Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Convert repository methods to use named parameters objects Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Enhance no-show handling by consolidating audit logging and updating repository interactions - Refactor `buildResultPayload` to accept a structured argument for better clarity. - Update `updateAttendees` to use a named parameter object for improved readability. - Introduce `fireNoShowUpdatedEvent` to centralize no-show audit logging for both hosts and guests. - Remove redundant methods and streamline attendee retrieval in `AttendeeRepository`. - Add comprehensive unit tests for no-show event handling, ensuring accurate audit logging and webhook triggering. * test: Add tests for handleMarkHostNoShow guest actor and unmarking host no-show Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: update attendeesNoShow validation to handle numeric keys - Changed attendeesNoShow schema to use z.coerce.number() for key validation, ensuring string keys are correctly coerced to numbers. - Updated test to validate attendeesNoShow data using numeric key comparison, improving robustness of the audit data checks. * test: Add integration tests for NoShowUpdatedAuditActionService coerce fix Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * feat: add graceful error handling for audit log enrichment - Add hasError field to EnrichedAuditLog type - Create buildFallbackAuditLog() method for failed enrichments - Wrap enrichAuditLog() in try-catch to handle errors gracefully - Add booking_audit_action.error_processing translation key - Update BookingHistory.tsx to show warning icon for error logs - Hide 'Show details' button for logs with hasError - Add comprehensive test cases for error handling scenarios Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * feat: Enhance booking audit action services with new display fields and improved validation - Added "attendee_no_show_updated" and "no_show_updated" translations to common.json. - Updated IAuditActionService to include new methods for handling display fields and migration. - Enhanced NoShowUpdatedAuditActionService to differentiate between host and attendee no-show updates. - Improved ReassignmentAuditActionService to ensure consistent handling of audit data. - Refactored BookingAuditViewerService for better clarity and maintainability. * refactor: Use attendeeEmail instead of attendeeId as key in audit data and store host's userUuid - Updated schema to use attendee email as key instead of attendee ID because attendee records can be reused with different person's data - Store host's userUuid in audit data with format: host: { userUuid, noShow: { old, new } } - Updated fireNoShowUpdated to accept hostUserUuid parameter - Added uuid field to BookingRepository.findByUidIncludeEventTypeAttendeesAndUser - Updated NoShowUpdatedAuditActionService getDisplayFields to work with email-based keys - Added attendeeRepository to DI modules for BookingAuditTaskConsumer - Updated tests to match new schema format Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * test: Update integration tests to use new schema format with host.userUuid and email keys Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: correct audit schema for SYSTEM source and ensure attendee lookup by bookingId - Fix schema inconsistency: use host.userUuid format instead of hostNoShow - Add user.uuid to getBooking select for audit logging - Log warning when hostUserUuid is undefined but host no-show is being updated - Use email as key for attendeesNoShow (not attendee ID) to match schema - Fetch attendees by bookingId before updating to ensure correct scoping - Remove unused safeStringify import * refactor: Change attendeesNoShow schema from Record to Array format - Update NoShowUpdatedAuditActionService schema to use array format: attendeesNoShow: Array<{attendeeEmail: string, noShow: {old, new}}> - Update handleMarkNoShow.ts to build attendeesNoShow as array - Update common.ts fireNoShowUpdatedEvent to convert Map to array - Update all tests to use new array format with attendeeEmail property Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Update attendeesNoShow schema to use array format in triggerNoShow tasks - Refactor `triggerGuestNoShow` and `triggerHostNoShow` to replace Map with array for `attendeesNoShowAudit`. - Update `fireNoShowUpdatedEvent` to handle the new array format for attendees. - Ensure consistent data structure across no-show audit logging for better clarity and maintainability. * fix: Update ReassignmentAuditActionService to use GetDisplayFieldsParams interface Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Update ReassignmentAuditActionService tests to use GetDisplayFieldsParams interface Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Use handleMarkAttendeeNoShow for API v2 mark absent endpoint - Export handleMarkAttendeeNoShow from platform-libraries - Update API v2 bookings service to use handleMarkAttendeeNoShow with actionSource - Add validation for userUuid before calling handleMarkAttendeeNoShow Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Enhance display fields structure in booking audit components - Updated `BookingHistory.tsx` to allow for more flexible display fields, including optional raw values and arrays of values. - Introduced `DisplayFieldValue` component for rendering display fields, improving clarity and maintainability. - Adjusted `IAuditActionService` and `NoShowUpdatedAuditActionService` to align with the new display fields structure. - Ensured consistent handling of display fields across the booking audit service for better data representation. * fix: Remove debug code that duplicated first attendee in display fields Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Update attendee repository methods to use structured parameters - Modified `updateNoShow`, `updateManyNoShowByBookingIdAndEmails`, and `updateManyNoShowByBookingIdExcludingEmails` methods to accept structured `where` and `data` parameters for better clarity and maintainability. - Updated calls to these methods throughout the codebase to reflect the new parameter structure. - Removed unused `findByIdWithNoShow` method and adjusted related logic to streamline attendee data retrieval. * feat: Add infrastructure for no-show audit integration - Add Prisma migrations for SYSTEM source and NO_SHOW_UPDATED audit action - Add NoShowUpdatedAuditActionService with array-based attendeesNoShow schema - Update BookingAuditActionServiceRegistry to include NO_SHOW_UPDATED - Update BookingAuditTaskConsumer and BookingAuditViewerService - Add AttendeeRepository methods for no-show queries - Update IAuditActionService interface with values array support - Update locales with no-show audit translation keys Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Add NO_SHOW_UPDATED to BookingAuditAction and SYSTEM to ActionSource types Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Remove HOST_NO_SHOW_UPDATED and ATTENDEE_NO_SHOW_UPDATED from BookingAuditAction type to match Prisma schema Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Update BookingAuditActionSchema to use NO_SHOW_UPDATED instead of HOST_NO_SHOW_UPDATED and ATTENDEE_NO_SHOW_UPDATED Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: Remove deprecated no-show audit services and unify to NoShowUpdatedAuditActionService - Delete HostNoShowUpdatedAuditActionService and AttendeeNoShowUpdatedAuditActionService - Update BookingAuditProducerService.interface.ts to use queueNoShowUpdatedAudit - Update BookingAuditTaskerProducerService.ts to use queueNoShowUpdatedAudit - Update BookingEventHandlerService.ts to use onNoShowUpdated - Add integration tests for NoShowUpdatedAuditActionService Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: Update test mock to match new AttendeeRepository.updateNoShow signature Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * refactor: rename handleMarkAttendeeNoShow to handleMarkNoShow and update related types - Renamed `handleMarkAttendeeNoShow` to `handleMarkNoShow` for clarity. - Updated type definitions to reflect the new naming convention. - Modified the `markNoShow` handler to require `userUuid` and adjusted related logic. - Enhanced the `fireNoShowUpdatedEvent` to accommodate changes in event type structure. - Updated references across various files to ensure consistency with the new function name. * handle null value * fix: add explicit parentheses for operator precedence clarity Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * Fix cubic reported bug * feat: add impersonation audit support to no-show flow (#27601) Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * feat: add impersonatedByUserUuid context to all BookingEventHandler calls (#27602) - Add context parameter to confirm.handler.ts (onBulkBookingsRejected, onBookingRejected) - Add context parameter to requestReschedule.handler.ts (onRescheduleRequested) - Add context parameter to editLocation.handler.ts (onLocationChanged) - Add context parameter to addGuests.handler.ts (onAttendeeAdded) - Add context parameter to handleConfirmation.ts (onBulkBookingsAccepted, onBookingAccepted) - Update _router.tsx to pass impersonatedByUserUuid from session to handlers This ensures all BookingEventHandler method calls that have loggedInUser context now properly support impersonation tracking for audit logging. Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: remove stray merge artifact in RegularBookingService Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: remove duplicate imports in BookingRepository Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: resolve type errors and duplicate declarations from merge Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: remove duplicate test assertions and duplicate test from merge artifacts Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: remove redundant ?? undefined from impersonatedByUserUuid Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: update impersonatedByUserUuid type to string | null for consistency Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: make impersonatedByUserUuid required in booking audit flows Changes impersonatedByUserUuid from optional (?: string | null) to required (: string | null) in all booking-related type definitions. This ensures audit-critical parameters are never accidentally omitted. Fixed all call sites to explicitly pass the value or null. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: add impersonatedByUserUuid to remaining callers and tests Adds impersonatedByUserUuid: null to API v1, API v2, and test callers of handleCancelBooking that were missing the now-required parameter. Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: require impersonatedByUserUuid in DTOs and pass it across all booking flows (coalesce to null) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: add impersonatedByUserUuid to remaining call sites (confirm, markNoShow, webhook, tests) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: add impersonatedByUserUuid to confirm handler test and API v2 confirm/decline calls Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: derive impersonatedByUserUuid from session in reportBooking handler instead of hardcoding null Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: reorder spread to ensure impersonatedByUserUuid null fallback is not overwritten Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: add missing impersonatedByUserUuid to CalendarSyncService cancel and reschedule calls Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * fix: update CalendarSyncService tests to expect impersonatedByUserUuid Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * ci: retrigger failed checks (attempt 1) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * ci: retrigger failed checks (attempt 2) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * ci: retrigger failed checks (attempt 3) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * chore: bust prisma cache with comment change Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * ci: retrigger after cache bust (attempt 2) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> * ci: retrigger after cache bust (attempt 3) Co-Authored-By: hariom@cal.com <hariombalhara@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Volnei Munhoz <volnei@cal.com>
515 lines
18 KiB
TypeScript
515 lines
18 KiB
TypeScript
import { beforeEach, describe, expect, test, vi } from "vitest";
|
|
|
|
import type { CalendarSubscriptionEventItem } from "@calcom/features/calendar-subscription/lib/CalendarSubscriptionPort.interface";
|
|
import type { BookingRepository } from "@calcom/lib/server/repository/booking";
|
|
import type { SelectedCalendar } from "@calcom/prisma/client";
|
|
|
|
import { CalendarSyncService } from "../CalendarSyncService";
|
|
|
|
const { mockHandleCancelBooking, mockCreateBooking } = vi.hoisted(() => ({
|
|
mockHandleCancelBooking: vi.fn().mockResolvedValue(undefined),
|
|
mockCreateBooking: vi.fn().mockResolvedValue(undefined),
|
|
}));
|
|
|
|
vi.mock("@calcom/features/bookings/lib/handleCancelBooking", () => ({
|
|
default: mockHandleCancelBooking,
|
|
}));
|
|
|
|
vi.mock("@calcom/features/bookings/di/RegularBookingService.container", () => ({
|
|
getRegularBookingService: () => ({
|
|
createBooking: mockCreateBooking,
|
|
}),
|
|
}));
|
|
|
|
vi.mock("@calcom/lib/idempotencyKey/idempotencyKeyService", () => ({
|
|
IdempotencyKeyService: {
|
|
generate: vi.fn(() => "test-idempotency-key"),
|
|
},
|
|
}));
|
|
|
|
vi.mock("@sentry/nextjs", () => ({
|
|
metrics: {
|
|
count: vi.fn(),
|
|
distribution: vi.fn(),
|
|
},
|
|
}));
|
|
|
|
const mockSelectedCalendar: SelectedCalendar = {
|
|
id: "test-calendar-id",
|
|
userId: 1,
|
|
credentialId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@example.com",
|
|
eventTypeId: null,
|
|
delegationCredentialId: null,
|
|
domainWideDelegationCredentialId: null,
|
|
googleChannelId: null,
|
|
googleChannelKind: null,
|
|
googleChannelResourceId: null,
|
|
googleChannelResourceUri: null,
|
|
googleChannelExpiration: null,
|
|
error: null,
|
|
lastErrorAt: null,
|
|
watchAttempts: 0,
|
|
maxAttempts: 3,
|
|
unwatchAttempts: 0,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
channelId: "test-channel-id",
|
|
channelKind: "web_hook",
|
|
channelResourceId: "test-resource-id",
|
|
channelResourceUri: "test-resource-uri",
|
|
channelExpiration: new Date(Date.now() + 86400000),
|
|
syncSubscribedAt: new Date(),
|
|
syncToken: "test-sync-token",
|
|
syncedAt: new Date(),
|
|
syncErrorAt: null,
|
|
syncErrorCount: 0,
|
|
};
|
|
|
|
const mockBooking = {
|
|
id: 1,
|
|
uid: "test-booking-uid",
|
|
userId: 1,
|
|
userPrimaryEmail: "user@example.com",
|
|
startTime: new Date("2023-12-01T10:00:00Z"),
|
|
endTime: new Date("2023-12-01T11:00:00Z"),
|
|
title: "Test Booking",
|
|
description: "Initial notes",
|
|
location: "Test Location",
|
|
smsReminderNumber: "+123456789",
|
|
responses: {
|
|
name: "John Doe",
|
|
email: "john@example.com",
|
|
notes: "Initial notes",
|
|
location: {
|
|
value: "Test Location",
|
|
label: "Test Location",
|
|
optionValue: "Test Location",
|
|
},
|
|
},
|
|
eventTypeId: 1,
|
|
eventType: {
|
|
id: 1,
|
|
title: "Test Event Type",
|
|
},
|
|
};
|
|
|
|
const mockCalComEvent: CalendarSubscriptionEventItem = {
|
|
id: "event-1",
|
|
iCalUID: "test-booking-uid@cal.com",
|
|
start: new Date("2023-12-01T10:00:00Z"),
|
|
end: new Date("2023-12-01T11:00:00Z"),
|
|
busy: true,
|
|
summary: "Test Event",
|
|
description: "Test Description",
|
|
location: "Test Location",
|
|
status: "confirmed",
|
|
isAllDay: false,
|
|
timeZone: "UTC",
|
|
recurringEventId: null,
|
|
originalStartDate: null,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
etag: "test-etag",
|
|
kind: "calendar#event",
|
|
};
|
|
|
|
const mockNonCalComEvent: CalendarSubscriptionEventItem = {
|
|
id: "event-2",
|
|
iCalUID: "external-event@external.com",
|
|
start: new Date("2023-12-01T12:00:00Z"),
|
|
end: new Date("2023-12-01T13:00:00Z"),
|
|
busy: true,
|
|
summary: "External Event",
|
|
description: "External Description",
|
|
location: "External Location",
|
|
status: "confirmed",
|
|
isAllDay: false,
|
|
timeZone: "UTC",
|
|
recurringEventId: null,
|
|
originalStartDate: null,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
etag: "test-etag",
|
|
kind: "calendar#event",
|
|
};
|
|
|
|
const mockCancelledEvent: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
id: "event-3",
|
|
iCalUID: "cancelled-booking-uid@cal.com",
|
|
status: "cancelled",
|
|
};
|
|
|
|
describe("CalendarSyncService", () => {
|
|
let service: CalendarSyncService;
|
|
let mockBookingRepository: BookingRepository;
|
|
|
|
beforeEach(() => {
|
|
mockBookingRepository = {
|
|
findBookingByUidWithEventType: vi.fn(),
|
|
} as unknown as BookingRepository;
|
|
|
|
service = new CalendarSyncService({
|
|
bookingRepository: mockBookingRepository,
|
|
});
|
|
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
describe("handleEvents", () => {
|
|
test("should process only Cal.com events", async () => {
|
|
const events = [mockCalComEvent, mockNonCalComEvent, mockCancelledEvent];
|
|
|
|
mockBookingRepository.findBookingByUidWithEventType = vi
|
|
.fn()
|
|
.mockResolvedValueOnce(mockBooking)
|
|
.mockResolvedValueOnce(mockBooking);
|
|
|
|
await service.handleEvents(mockSelectedCalendar, events);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalledTimes(2);
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalledWith({
|
|
bookingUid: "test-booking-uid",
|
|
});
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalledWith({
|
|
bookingUid: "cancelled-booking-uid",
|
|
});
|
|
});
|
|
|
|
test("should return early when no Cal.com events", async () => {
|
|
const events = [mockNonCalComEvent];
|
|
|
|
await service.handleEvents(mockSelectedCalendar, events);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should return early when no events", async () => {
|
|
await service.handleEvents(mockSelectedCalendar, []);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should handle mixed case iCalUID", async () => {
|
|
const eventWithMixedCase: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
iCalUID: "test-booking-uid@CAL.COM",
|
|
};
|
|
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(mockBooking);
|
|
|
|
await service.handleEvents(mockSelectedCalendar, [eventWithMixedCase]);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalledWith({
|
|
bookingUid: "test-booking-uid",
|
|
});
|
|
});
|
|
|
|
test("should handle events with null iCalUID", async () => {
|
|
const eventWithNullUID: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
iCalUID: null,
|
|
};
|
|
|
|
await service.handleEvents(mockSelectedCalendar, [eventWithNullUID]);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe("cancelBooking", () => {
|
|
test("should successfully cancel a booking", async () => {
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(mockBooking);
|
|
|
|
await service.cancelBooking(mockCancelledEvent, mockSelectedCalendar.userId);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalledWith({
|
|
bookingUid: "cancelled-booking-uid",
|
|
});
|
|
|
|
expect(mockHandleCancelBooking).toHaveBeenCalledWith({
|
|
userId: mockBooking.userId,
|
|
actionSource: "SYSTEM",
|
|
impersonatedByUserUuid: null,
|
|
bookingData: {
|
|
uid: mockBooking.uid,
|
|
cancellationReason: "Cancelled on user's calendar",
|
|
cancelledBy: mockBooking.userPrimaryEmail,
|
|
skipCalendarSyncTaskCancellation: true,
|
|
},
|
|
});
|
|
});
|
|
|
|
test("should return early when booking UID is missing", async () => {
|
|
const eventWithoutUID: CalendarSubscriptionEventItem = {
|
|
...mockCancelledEvent,
|
|
iCalUID: null,
|
|
};
|
|
|
|
await service.cancelBooking(eventWithoutUID, mockSelectedCalendar.userId);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).not.toHaveBeenCalled();
|
|
expect(mockHandleCancelBooking).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should return early when booking UID is malformed", async () => {
|
|
const eventWithMalformedUID: CalendarSubscriptionEventItem = {
|
|
...mockCancelledEvent,
|
|
iCalUID: "@cal.com",
|
|
};
|
|
|
|
await service.cancelBooking(eventWithMalformedUID, mockSelectedCalendar.userId);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).not.toHaveBeenCalled();
|
|
expect(mockHandleCancelBooking).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should return early when booking is not found", async () => {
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(null);
|
|
|
|
await service.cancelBooking(mockCancelledEvent, mockSelectedCalendar.userId);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalledWith({
|
|
bookingUid: "cancelled-booking-uid",
|
|
});
|
|
expect(mockHandleCancelBooking).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should handle cancellation errors gracefully without throwing", async () => {
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(mockBooking);
|
|
mockHandleCancelBooking.mockRejectedValue(new Error("Cancellation failed"));
|
|
|
|
// Should not throw - errors are caught and logged
|
|
await expect(service.cancelBooking(mockCancelledEvent, mockSelectedCalendar.userId)).resolves.not.toThrow();
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalled();
|
|
expect(mockHandleCancelBooking).toHaveBeenCalled();
|
|
});
|
|
|
|
test("should handle database errors gracefully without throwing", async () => {
|
|
mockBookingRepository.findBookingByUidWithEventType = vi
|
|
.fn()
|
|
.mockRejectedValue(new Error("DB connection failed"));
|
|
|
|
await expect(service.cancelBooking(mockCancelledEvent, mockSelectedCalendar.userId)).resolves.not.toThrow();
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalled();
|
|
expect(mockHandleCancelBooking).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe("rescheduleBooking", () => {
|
|
test("should successfully reschedule a booking preserving original duration", async () => {
|
|
const updatedEvent: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
start: new Date("2023-12-01T14:00:00Z"),
|
|
end: new Date("2023-12-01T15:00:00Z"),
|
|
summary: "Updated summary",
|
|
description: "Updated description",
|
|
location: "Updated location",
|
|
};
|
|
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(mockBooking);
|
|
|
|
await service.rescheduleBooking(updatedEvent, mockSelectedCalendar.userId);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalledWith({
|
|
bookingUid: "test-booking-uid",
|
|
});
|
|
|
|
// Original booking is 10:00-11:00 (60min). New start is 14:00, so end should be 15:00 (60min preserved).
|
|
expect(mockCreateBooking).toHaveBeenCalledWith({
|
|
bookingData: {
|
|
eventTypeId: mockBooking.eventTypeId,
|
|
start: "2023-12-01T14:00:00.000Z",
|
|
end: "2023-12-01T15:00:00.000Z",
|
|
timeZone: "UTC",
|
|
language: "en",
|
|
metadata: expect.objectContaining({
|
|
calendarSubscriptionEvent: expect.any(String),
|
|
}),
|
|
rescheduleUid: mockBooking.uid,
|
|
idempotencyKey: expect.any(String),
|
|
responses: expect.objectContaining({
|
|
title: "Updated summary",
|
|
notes: "Updated description",
|
|
location: {
|
|
label: "Updated location",
|
|
optionValue: "Updated location",
|
|
value: "Updated location",
|
|
},
|
|
}),
|
|
},
|
|
bookingMeta: {
|
|
skipCalendarSyncTaskCreation: true,
|
|
skipAvailabilityCheck: true,
|
|
skipEventLimitsCheck: true,
|
|
impersonatedByUserUuid: null,
|
|
},
|
|
});
|
|
const lastCall = mockCreateBooking.mock.calls.at(-1)!;
|
|
const parsedMetadataUpdated = JSON.parse(
|
|
lastCall[0].bookingData.metadata.calendarSubscriptionEvent as string
|
|
);
|
|
expect(parsedMetadataUpdated).toEqual(
|
|
expect.objectContaining({
|
|
summary: "Updated summary",
|
|
description: "Updated description",
|
|
location: "Updated location",
|
|
})
|
|
);
|
|
});
|
|
|
|
test("should preserve original duration when external event has different duration", async () => {
|
|
const stretchedEvent: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
start: new Date("2023-12-01T14:00:00Z"),
|
|
end: new Date("2023-12-01T15:30:00Z"), // 90min, but original booking is 60min
|
|
};
|
|
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(mockBooking);
|
|
|
|
await service.rescheduleBooking(stretchedEvent, mockSelectedCalendar.userId);
|
|
|
|
// Original booking is 60min. External event is 90min. Duration should stay 60min.
|
|
expect(mockCreateBooking).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
bookingData: expect.objectContaining({
|
|
start: "2023-12-01T14:00:00.000Z",
|
|
end: "2023-12-01T15:00:00.000Z", // 14:00 + 60min = 15:00, NOT 15:30
|
|
}),
|
|
})
|
|
);
|
|
});
|
|
|
|
test("should skip reschedule when event times are null (no change detected)", async () => {
|
|
const eventWithNullTimes: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
start: null,
|
|
end: null,
|
|
};
|
|
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(mockBooking);
|
|
|
|
await service.rescheduleBooking(eventWithNullTimes, mockSelectedCalendar.userId);
|
|
|
|
// Null start means no change detected, reschedule is skipped
|
|
expect(mockCreateBooking).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should build fallback responses when booking responses are missing", async () => {
|
|
const bookingWithoutResponses = {
|
|
...mockBooking,
|
|
responses: null,
|
|
};
|
|
const eventWithDifferentStart: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
start: new Date("2023-12-01T14:00:00Z"),
|
|
end: new Date("2023-12-01T15:00:00Z"),
|
|
};
|
|
mockBookingRepository.findBookingByUidWithEventType = vi
|
|
.fn()
|
|
.mockResolvedValue(bookingWithoutResponses);
|
|
|
|
await service.rescheduleBooking(eventWithDifferentStart, mockSelectedCalendar.userId);
|
|
|
|
expect(mockCreateBooking).toHaveBeenCalledWith({
|
|
bookingData: expect.objectContaining({
|
|
responses: expect.objectContaining({
|
|
name: bookingWithoutResponses.title,
|
|
email: bookingWithoutResponses.userPrimaryEmail,
|
|
guests: [],
|
|
notes: mockCalComEvent.description,
|
|
smsReminderNumber: bookingWithoutResponses.smsReminderNumber,
|
|
location: {
|
|
label: mockCalComEvent.location,
|
|
value: mockCalComEvent.location,
|
|
optionValue: mockCalComEvent.location,
|
|
},
|
|
title: mockCalComEvent.summary,
|
|
}),
|
|
metadata: expect.objectContaining({
|
|
calendarSubscriptionEvent: expect.any(String),
|
|
}),
|
|
idempotencyKey: expect.any(String),
|
|
}),
|
|
bookingMeta: {
|
|
skipCalendarSyncTaskCreation: true,
|
|
skipAvailabilityCheck: true,
|
|
skipEventLimitsCheck: true,
|
|
impersonatedByUserUuid: null,
|
|
},
|
|
});
|
|
const baseCall = mockCreateBooking.mock.calls.at(-1)!;
|
|
const parsedMetadataBase = JSON.parse(
|
|
baseCall[0].bookingData.metadata.calendarSubscriptionEvent as string
|
|
);
|
|
expect(parsedMetadataBase.summary).toEqual(mockCalComEvent.summary);
|
|
});
|
|
|
|
test("should return early when booking UID is missing", async () => {
|
|
const eventWithoutUID: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
iCalUID: null,
|
|
};
|
|
|
|
await service.rescheduleBooking(eventWithoutUID, mockSelectedCalendar.userId);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).not.toHaveBeenCalled();
|
|
expect(mockCreateBooking).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should return early when booking UID is malformed", async () => {
|
|
const eventWithMalformedUID: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
iCalUID: "@cal.com",
|
|
};
|
|
|
|
await service.rescheduleBooking(eventWithMalformedUID, mockSelectedCalendar.userId);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).not.toHaveBeenCalled();
|
|
expect(mockCreateBooking).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should return early when booking is not found", async () => {
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(null);
|
|
|
|
await service.rescheduleBooking(mockCalComEvent, mockSelectedCalendar.userId);
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalledWith({
|
|
bookingUid: "test-booking-uid",
|
|
});
|
|
expect(mockCreateBooking).not.toHaveBeenCalled();
|
|
});
|
|
|
|
test("should handle rescheduling errors gracefully without throwing", async () => {
|
|
const eventWithDifferentStart: CalendarSubscriptionEventItem = {
|
|
...mockCalComEvent,
|
|
start: new Date("2023-12-01T14:00:00Z"),
|
|
end: new Date("2023-12-01T15:00:00Z"),
|
|
};
|
|
mockBookingRepository.findBookingByUidWithEventType = vi.fn().mockResolvedValue(mockBooking);
|
|
mockCreateBooking.mockRejectedValue(new Error("Rescheduling failed"));
|
|
|
|
// Should not throw - errors are caught and logged
|
|
await expect(service.rescheduleBooking(eventWithDifferentStart, mockSelectedCalendar.userId)).resolves.not.toThrow();
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalled();
|
|
expect(mockCreateBooking).toHaveBeenCalled();
|
|
});
|
|
|
|
test("should handle database errors gracefully without throwing", async () => {
|
|
mockBookingRepository.findBookingByUidWithEventType = vi
|
|
.fn()
|
|
.mockRejectedValue(new Error("DB connection failed"));
|
|
|
|
await expect(service.rescheduleBooking(mockCalComEvent, mockSelectedCalendar.userId)).resolves.not.toThrow();
|
|
|
|
expect(mockBookingRepository.findBookingByUidWithEventType).toHaveBeenCalled();
|
|
expect(mockCreateBooking).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
});
|