* refactor: replace shouldServeCache with mode parameter for calendar cache control Replace the boolean shouldServeCache parameter with a new CalendarFetchMode type that can have values 'slots', 'overlay', and 'booking'. This provides better control over when to serve cache vs relay on calendar providers. - 'slots' mode: Check feature flags and use cache when available (for getting actual calendar availability) - 'overlay' mode: Don't use cache (for overlay calendar availability) - 'booking' mode: Don't use cache (for booking confirmation) - undefined: Same as 'slots' for backwards compatibility The cache decision logic is now centralized in getCalendar.ts based on the mode parameter. Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: update CalendarService.test.ts to use mode parameter Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * refactor: use shared GetAvailabilityParams type across all calendar services - Import GetAvailabilityParams and GetAvailabilityWithTimeZonesParams from @calcom/types/Calendar - Replace inline type definitions with shared types in all calendar service implementations - Update BaseCalendarService, CalendarCacheWrapper, and CalendarTelemetryWrapper - Ensures consistent typing and follows DRY principles Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: add missing IntegrationCalendar import and update mock getAvailability signature - Add IntegrationCalendar back to sendgrid CalendarService imports - Update bookingScenario mock getAvailability to use typed params object - Add listCalendars method to mock Calendar object Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: update test files to use typed params object for getAvailability methods - Update CalendarCacheWrapper.test.ts to call getAvailability/getAvailabilityWithTimeZones with params object - Update getCalendarsEvents.test.ts toHaveBeenCalledWith assertions to expect params object - All 32 tests now pass Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * refactor: consolidate to single GetAvailabilityParams type for both getAvailability methods - Remove GetAvailabilityWithTimeZonesParams, use GetAvailabilityParams for both methods - Add mode parameter to getAvailabilityWithTimeZones calls - Update wrapper classes to pass mode through to underlying calendar - Update test files to include mode in getAvailabilityWithTimeZones calls and assertions Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * refactor: use EventBusyDate with optional timeZone for getAvailabilityWithTimeZones - Add optional timeZone field to EventBusyDate type - Update getAvailabilityWithTimeZones return type to use EventBusyDate[] - Update Google Calendar service and wrapper classes to use the new type Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: type errors and remove unused calendar watching methods - Fix type errors in CalendarCacheWrapper.ts (convert null to undefined for timeZone) - Fix type errors in getCalendarsEvents.ts (ensure timeZone is always present) - Remove unused watchCalendar/unwatchCalendar from Calendar interface - Remove unused startWatchingCalendarsInGoogle/stopWatchingCalendarsInGoogle from GoogleCalendarService - Remove unused imports (uuid, uniqueBy, GOOGLE_WEBHOOK_URL, ONE_MONTH_IN_MS) Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: remove watchCalendar/unwatchCalendar from CalendarTelemetryWrapper Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * refactor: remove verbose JSDoc param comments from wrapper classes Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * refactor: make mode parameter required in getCalendar Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: add required mode parameter to all getCalendar callers Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: provide default mode value in getBusyCalendarTimes Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: add mode parameter to remaining getCalendar callers Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: add mode parameter to vital and wipemycalother reschedule Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * fix: add mode parameter to credential-sync API endpoint Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * refactor: add 'none' mode to CalendarFetchMode and use as default Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * test: add mode parameter to getCalendarsEvents test calls Co-Authored-By: Volnei Munhoz <volnei.munhoz@gmail.com> * Update packages/app-store/delegationCredential.ts Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
327 lines
8.8 KiB
TypeScript
327 lines
8.8 KiB
TypeScript
import type { calendar_v3 } from "@googleapis/calendar";
|
|
import type { Dayjs } from "dayjs";
|
|
import type { TFunction } from "i18next";
|
|
import type { Time } from "ical.js";
|
|
import type { Frequency } from "rrule";
|
|
import type z from "zod";
|
|
|
|
import type { bookingResponse } from "@calcom/features/bookings/lib/getBookingResponsesSchema";
|
|
import type { TimeFormat } from "@calcom/lib/timeFormat";
|
|
import type {
|
|
BookingSeat,
|
|
DestinationCalendar,
|
|
Prisma,
|
|
SelectedCalendar as _SelectedCalendar,
|
|
} from "@calcom/prisma/client";
|
|
import type { SchedulingType } from "@calcom/prisma/enums";
|
|
import type { CredentialForCalendarService } from "@calcom/types/Credential";
|
|
|
|
import type { Ensure } from "./utils";
|
|
|
|
export type { VideoCallData } from "./VideoApiAdapter";
|
|
|
|
type PaymentInfo = {
|
|
link?: string | null;
|
|
reason?: string | null;
|
|
id?: string | null;
|
|
paymentOption?: string | null;
|
|
amount?: number;
|
|
currency?: string;
|
|
};
|
|
|
|
export type Person = {
|
|
name: string;
|
|
email: string;
|
|
timeZone: string;
|
|
language: { translate: TFunction; locale: string };
|
|
username?: string;
|
|
usernameInOrg?: string;
|
|
id?: number;
|
|
bookingId?: number | null;
|
|
locale?: string | null;
|
|
timeFormat?: TimeFormat;
|
|
bookingSeat?: BookingSeat | null;
|
|
phoneNumber?: string | null;
|
|
};
|
|
|
|
export type TeamMember = {
|
|
id?: number;
|
|
name: string;
|
|
email: string;
|
|
phoneNumber?: string | null;
|
|
timeZone: string;
|
|
language: { translate: TFunction; locale: string };
|
|
};
|
|
|
|
export type EventBusyDate = {
|
|
start: Date | string;
|
|
end: Date | string;
|
|
source?: string | null;
|
|
timeZone?: string;
|
|
};
|
|
|
|
export type EventBusyDetails = EventBusyDate & {
|
|
title?: string;
|
|
source?: string | null;
|
|
userId?: number | null;
|
|
};
|
|
|
|
export type AdditionalInfo = Record<string, unknown> & { calWarnings?: string[] };
|
|
|
|
export type NewCalendarEventType = {
|
|
uid: string;
|
|
id: string;
|
|
thirdPartyRecurringEventId?: string | null;
|
|
type: string;
|
|
password: string;
|
|
url: string;
|
|
additionalInfo: AdditionalInfo;
|
|
iCalUID?: string | null;
|
|
location?: string | null;
|
|
hangoutLink?: string | null;
|
|
conferenceData?: ConferenceData;
|
|
delegatedToId?: string | null;
|
|
};
|
|
|
|
export type CalendarEventType = {
|
|
uid: string;
|
|
etag: string;
|
|
/** This is the actual caldav event url, not the location url. */
|
|
url: string;
|
|
summary: string;
|
|
description: string;
|
|
location: string;
|
|
sequence: number;
|
|
startDate: Date | Dayjs;
|
|
endDate: Date | Dayjs;
|
|
duration: {
|
|
weeks: number;
|
|
days: number;
|
|
hours: number;
|
|
minutes: number;
|
|
seconds: number;
|
|
isNegative: boolean;
|
|
};
|
|
organizer: string;
|
|
attendees: unknown[][];
|
|
recurrenceId: Time;
|
|
timezone: string | object;
|
|
};
|
|
|
|
export type BatchResponse = {
|
|
responses: SubResponse[];
|
|
};
|
|
|
|
export type SubResponse = {
|
|
body: {
|
|
value: {
|
|
showAs: "free" | "tentative" | "away" | "busy" | "workingElsewhere";
|
|
start: { dateTime: string };
|
|
end: { dateTime: string };
|
|
}[];
|
|
};
|
|
};
|
|
|
|
export interface ConferenceData {
|
|
createRequest?: calendar_v3.Schema$CreateConferenceRequest;
|
|
}
|
|
|
|
export interface RecurringEvent {
|
|
dtstart?: Date | undefined;
|
|
interval: number;
|
|
count: number;
|
|
freq: Frequency;
|
|
until?: Date | undefined;
|
|
tzid?: string | undefined;
|
|
}
|
|
|
|
export type { IntervalLimit, IntervalLimitUnit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
|
|
|
|
export type AppsStatus = {
|
|
appName: string;
|
|
type: (typeof App)["type"];
|
|
success: number;
|
|
failures: number;
|
|
errors: string[];
|
|
warnings?: string[];
|
|
};
|
|
|
|
export type CalEventResponses = Record<
|
|
string,
|
|
{
|
|
label: string;
|
|
value: z.infer<typeof bookingResponse>;
|
|
isHidden?: boolean;
|
|
}
|
|
>;
|
|
|
|
export interface ExistingRecurringEvent {
|
|
recurringEventId: string;
|
|
}
|
|
|
|
// If modifying this interface, probably should update builders/calendarEvent files
|
|
export interface CalendarEvent {
|
|
// Instead of sending this per event.
|
|
// TODO: Links sent in email should be validated and automatically redirected to org domain or regular app. It would be a much cleaner way. Maybe use existing /api/link endpoint
|
|
bookerUrl?: string;
|
|
hashedLink?: string | null;
|
|
type: string;
|
|
title: string;
|
|
startTime: string;
|
|
endTime: string;
|
|
organizer: Person;
|
|
attendees: Person[];
|
|
length?: number | null;
|
|
additionalNotes?: string | null;
|
|
customInputs?: Prisma.JsonObject | null;
|
|
description?: string | null;
|
|
team?: {
|
|
name: string;
|
|
members: TeamMember[];
|
|
id: number;
|
|
};
|
|
location?: string | null;
|
|
conferenceCredentialId?: number;
|
|
conferenceData?: ConferenceData;
|
|
additionalInformation?: AdditionalInformation;
|
|
uid?: string | null;
|
|
existingRecurringEvent?: ExistingRecurringEvent | null;
|
|
bookingId?: number;
|
|
videoCallData?: VideoCallData;
|
|
paymentInfo?: PaymentInfo | null;
|
|
requiresConfirmation?: boolean | null;
|
|
destinationCalendar?: DestinationCalendar[] | null;
|
|
cancellationReason?: string | null;
|
|
rejectionReason?: string | null;
|
|
hideCalendarNotes?: boolean;
|
|
hideCalendarEventDetails?: boolean;
|
|
recurrence?: string;
|
|
recurringEvent?: RecurringEvent | null;
|
|
eventTypeId?: number | null;
|
|
appsStatus?: AppsStatus[];
|
|
seatsShowAttendees?: boolean | null;
|
|
seatsShowAvailabilityCount?: boolean | null;
|
|
attendeeSeatId?: string;
|
|
seatsPerTimeSlot?: number | null;
|
|
schedulingType?: SchedulingType | null;
|
|
iCalUID?: string | null;
|
|
iCalSequence?: number | null;
|
|
hideOrganizerEmail?: boolean;
|
|
disableCancelling?: boolean;
|
|
disableRescheduling?: boolean;
|
|
|
|
// It has responses to all the fields(system + user)
|
|
responses?: CalEventResponses | null;
|
|
|
|
// It just has responses to only the user fields. It allows to easily iterate over to show only user fields
|
|
userFieldsResponses?: CalEventResponses | null;
|
|
platformClientId?: string | null;
|
|
platformRescheduleUrl?: string | null;
|
|
platformCancelUrl?: string | null;
|
|
platformBookingUrl?: string | null;
|
|
oneTimePassword?: string | null;
|
|
delegationCredentialId?: string | null;
|
|
domainWideDelegationCredentialId?: string | null;
|
|
customReplyToEmail?: string | null;
|
|
rescheduledBy?: string;
|
|
organizationId?: number | null;
|
|
hasOrganizerChanged?: boolean;
|
|
}
|
|
|
|
export interface EntryPoint {
|
|
entryPointType?: string;
|
|
uri?: string;
|
|
label?: string;
|
|
pin?: string;
|
|
accessCode?: string;
|
|
meetingCode?: string;
|
|
passcode?: string;
|
|
password?: string;
|
|
}
|
|
|
|
export interface AdditionalInformation {
|
|
conferenceData?: ConferenceData;
|
|
entryPoints?: EntryPoint[];
|
|
hangoutLink?: string;
|
|
}
|
|
|
|
export interface IntegrationCalendar extends Ensure<Partial<_SelectedCalendar>, "externalId"> {
|
|
primary?: boolean;
|
|
name?: string;
|
|
readOnly?: boolean;
|
|
// For displaying the connected email address
|
|
email?: string;
|
|
primaryEmail?: string;
|
|
credentialId?: number | null;
|
|
integrationTitle?: string;
|
|
}
|
|
|
|
/**
|
|
* Mode for calendar fetch operations to control caching behavior:
|
|
* - "slots": For getting actual calendar availability (uses cache when available)
|
|
* - "overlay": For getting overlay calendar availability (does not use cache)
|
|
* - "booking": For booking confirmation (does not use cache)
|
|
* - "none": For operations that don't use getAvailability (e.g., deleteEvent, listCalendars)
|
|
*/
|
|
export type CalendarFetchMode = "slots" | "overlay" | "booking" | "none";
|
|
|
|
/**
|
|
* Parameters for getAvailability and getAvailabilityWithTimeZones methods
|
|
*/
|
|
export interface GetAvailabilityParams {
|
|
dateFrom: string;
|
|
dateTo: string;
|
|
selectedCalendars: IntegrationCalendar[];
|
|
mode: CalendarFetchMode;
|
|
fallbackToPrimary?: boolean;
|
|
}
|
|
|
|
/**
|
|
* null is to refer to user-level SelectedCalendar
|
|
*/
|
|
export type SelectedCalendarEventTypeIds = (number | null)[];
|
|
|
|
export interface CalendarServiceEvent extends CalendarEvent {
|
|
calendarDescription: string;
|
|
}
|
|
|
|
export interface Calendar {
|
|
getCredentialId?(): number;
|
|
createEvent(
|
|
event: CalendarServiceEvent,
|
|
credentialId: number,
|
|
externalCalendarId?: string
|
|
): Promise<NewCalendarEventType>;
|
|
|
|
updateEvent(
|
|
uid: string,
|
|
event: CalendarServiceEvent,
|
|
externalCalendarId?: string | null
|
|
): Promise<NewCalendarEventType | NewCalendarEventType[]>;
|
|
|
|
deleteEvent(uid: string, event: CalendarEvent, externalCalendarId?: string | null): Promise<unknown>;
|
|
|
|
getAvailability(params: GetAvailabilityParams): Promise<EventBusyDate[]>;
|
|
|
|
// for OOO calibration (only google calendar for now)
|
|
getAvailabilityWithTimeZones?(params: GetAvailabilityParams): Promise<EventBusyDate[]>;
|
|
|
|
fetchAvailabilityAndSetCache?(selectedCalendars: IntegrationCalendar[]): Promise<unknown>;
|
|
|
|
listCalendars(event?: CalendarEvent): Promise<IntegrationCalendar[]>;
|
|
|
|
testDelegationCredentialSetup?(): Promise<boolean>;
|
|
}
|
|
|
|
/**
|
|
* @see [How to inference class type that implements an interface](https://stackoverflow.com/a/64765554/6297100)
|
|
*/
|
|
type Class<I, Args extends unknown[] = unknown[]> = new (...args: Args) => I;
|
|
|
|
export type CalendarClass = Class<Calendar, [CredentialForCalendarService]>;
|
|
|
|
export type SelectedCalendar = Pick<
|
|
_SelectedCalendar,
|
|
"userId" | "integration" | "externalId" | "credentialId"
|
|
>;
|