* Add endpoints for testing the flow * Add MVP * new route * Fixes * Fixes * Remove enable toggle support from domainWideDelegation * Fixes * Revert "Remove enable toggle support from domainWideDelegation" This reverts commit c29e729206cd1fa063f9c9ce0cf148ef1577d60b. * Revert yarn.lock * More fixes * Fix new workspace platform add * refactor: improvements * refactor: bug fixes and improvements * fix: type errors * fix: conflicts * chore: update test * fix: logic * chore: improvements * fix: toglle * fix: bugs * fix: type err * chore: check number type * fix: after conflicts * chore: fix type err * fix: type errors and tests * fix: tets * test * chore: remove unused * fix: google meet url on booking page and secondary calendar * fix: add property * fix: type err * fix: re assingment bug * fix: use getAllCredentials * chore: fix import * fix: installed count * fix: pass event type * fix: import * fix: [Stacked PR] Review fixes (#17958) * Review fixes * fix: destination calendar bug --------- Co-authored-by: Udit Takkar <udit222001@gmail.com> * refactor: use repository * chore: remove duplicate * fix: More review fixes for domain wide delegation (#17969) * Reuse buildCredentialPayloadForCalendar * fixes --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * fix ts error * Fix getSchedule not using dwd credentials (#17995) * fix: Remove direct DWD table access from google-calendar and remove delegatedToId column from Credential (#18015) * Remove fn rename to reduce number of files changed * chore: check feature globally * test: add unit tests * chore: move function * test: add booking test * wip * Remove domain-wide-delegation team feature flag * Make sure duplicate calendars are not shown due to DWD. Show DWD when there is conflict * Fix tests and their ts errors * Fix more tests * Move findUsersForAvailabilityCheck to separate file as it has AppStore dependency causing problem with Routing Forms. Build crashes * fix: Multiple calendar connections from Google not showing up in apps/installed * DestinationCalendar must have either credentialId or domainWideDeelgationId. Also handle the case when DWD is disabled and there was a non-dwd credential that could be used * Disable deletetion of DWD as it is destructive and prefer disabling instead * Show DWD credential calendars at the top * Fixed tests * Calendar Cache DWD support * Self-Review: Verify email required and add more selectedCalendar tests * Self Review: shorten names * Self ReviewL Dead code removal * Revert "Calendar Cache DWD support" This reverts commit 009f236470fa21eba5986117d4f6e4d4c5e38c34. * Some misc fixes * fixes * Performance improvememt in slots loading and booking * More cases for handling dwd credentials * simplify the logic. Ensure that EventManager and the modules below it in the flow have CredentialForCalendarService available * Fix tests * Fix installed/conferencing not showing gogole meet * Shorten name * Fix ApI v2 tests * Add some more tests * add getSchedule tests * Improve tests * Make Google Meet default when DWD for google is enabled * Enable feature flagging for DWD * chore: bump libraries * Encrypt serviceaccount private key * Fix ts errors * bump platform libraries * org add dwd * org add dwd * bump platform libraries * fix selected calendars * fix remove selected dwd calendar * remove oauthclient id aliad in authedCalendar * remove oauthclient id aliad in authedCalendar * refactor: OrganizationsDwdController * chore: export toggleDwdEnabled from platform-libraries * feat: v2 update (enable / disable) dwd * refactor: SelectedCalendarsController check if user belongs to dwd org & for not dwd use previous logic * wip: DestinationCalendar send domainWideDelegationCredentialId from frontend to api * try fix set destination calendar api v2 * fixup! try fix set destination calendar api v2 * setting google meet as default location working for dwd * bump platform libraries version * allow office 365 workspace slug * allow office 365 workspace slug * chore: v2 create dwd MS and Google service keys input * fix: CreateDwdInput serviceAccountKey * fix: CredentialForCalendarService type * fix: check workspace slug * feat: update serviceAccessKey of DWD * testing * fixup! testing * fix: getAuthUtl bug * fix: unit tests * fix: type err and unit test * fix: e2e test * fix: credentials bug and failing unit tests * Update CalendarService.ts * chore: refactor office365 calendar service and add testDomainWideDelegationSetup * fix: office365Calendar use correct clientId/Secret for DWD * fix: office365Calendar dwd no need refresh token * test: add unit test for outlook dwd and setup * feat: added dwd support for office365 calendar * feat: added dwd support for office365 video * test: finish test for outlook dwd * fix: create dialog bug * chore: remove console logs * fix: refreshToken bug * bump version libraries * refactor: fetch dwd credentials only in findQualifiedHosts * fixup! refactor: fetch dwd credentials only in findQualifiedHosts * fix: type err * fix: type err * fix: getUserDisplayName * fix: unit test * chore: bump platform lib --------- Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Udit Takkar <udit222001@gmail.com> Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
426 lines
13 KiB
TypeScript
426 lines
13 KiB
TypeScript
import type { Booking, EventType } from "@prisma/client";
|
|
import { Prisma } from "@prisma/client";
|
|
import * as Sentry from "@sentry/nextjs";
|
|
|
|
import { getBusyCalendarTimes } from "@calcom/core/CalendarManager";
|
|
import dayjs from "@calcom/dayjs";
|
|
import { subtract } from "@calcom/lib/date-ranges";
|
|
import { intervalLimitKeyToUnit } from "@calcom/lib/intervalLimit";
|
|
import logger from "@calcom/lib/logger";
|
|
import { getPiiFreeBooking } from "@calcom/lib/piiFreeData";
|
|
import { performance } from "@calcom/lib/server/perfObserver";
|
|
import prisma from "@calcom/prisma";
|
|
import type { SelectedCalendar } from "@calcom/prisma/client";
|
|
import { BookingStatus } from "@calcom/prisma/enums";
|
|
import { stringToDayjs } from "@calcom/prisma/zod-utils";
|
|
import type { EventBusyDetails, IntervalLimit } from "@calcom/types/Calendar";
|
|
import type { CredentialForCalendarService } from "@calcom/types/Credential";
|
|
|
|
import { getDefinedBufferTimes } from "../features/eventtypes/lib/getDefinedBufferTimes";
|
|
|
|
export async function getBusyTimes(params: {
|
|
credentials: CredentialForCalendarService[];
|
|
userId: number;
|
|
userEmail: string;
|
|
username: string;
|
|
eventTypeId?: number;
|
|
startTime: string;
|
|
beforeEventBuffer?: number;
|
|
afterEventBuffer?: number;
|
|
endTime: string;
|
|
selectedCalendars: SelectedCalendar[];
|
|
seatedEvent?: boolean;
|
|
rescheduleUid?: string | null;
|
|
duration?: number | null;
|
|
currentBookings?:
|
|
| (Pick<Booking, "id" | "uid" | "userId" | "startTime" | "endTime" | "title"> & {
|
|
eventType: Pick<
|
|
EventType,
|
|
"id" | "beforeEventBuffer" | "afterEventBuffer" | "seatsPerTimeSlot"
|
|
> | null;
|
|
_count?: {
|
|
seatsReferences: number;
|
|
};
|
|
})[]
|
|
| null;
|
|
bypassBusyCalendarTimes: boolean;
|
|
shouldServeCache?: boolean;
|
|
}) {
|
|
const {
|
|
credentials,
|
|
userId,
|
|
userEmail,
|
|
username,
|
|
eventTypeId,
|
|
startTime,
|
|
endTime,
|
|
beforeEventBuffer,
|
|
afterEventBuffer,
|
|
selectedCalendars,
|
|
seatedEvent,
|
|
rescheduleUid,
|
|
duration,
|
|
bypassBusyCalendarTimes = false,
|
|
shouldServeCache,
|
|
} = params;
|
|
|
|
logger.silly(
|
|
`Checking Busy time from Cal Bookings in range ${startTime} to ${endTime} for input ${JSON.stringify({
|
|
userId,
|
|
eventTypeId,
|
|
status: BookingStatus.ACCEPTED,
|
|
})}`
|
|
);
|
|
|
|
/**
|
|
* A user is considered busy within a given time period if there
|
|
* is a booking they own OR attend.
|
|
*
|
|
* Performs a query for all bookings where:
|
|
* - The given booking is owned by this user, or..
|
|
* - The current user has a different booking at this time he/she attends
|
|
*
|
|
* See further discussion within this GH issue:
|
|
* https://github.com/calcom/cal.com/issues/6374
|
|
*
|
|
* NOTE: Changes here will likely require changes to some mocking
|
|
* logic within getSchedule.test.ts:addBookings
|
|
*/
|
|
performance.mark("prismaBookingGetStart");
|
|
|
|
const startTimeDate =
|
|
rescheduleUid && duration ? dayjs(startTime).subtract(duration, "minute").toDate() : new Date(startTime);
|
|
const endTimeDate =
|
|
rescheduleUid && duration ? dayjs(endTime).add(duration, "minute").toDate() : new Date(endTime);
|
|
|
|
// to also get bookings that are outside of start and end time, but the buffer falls within the start and end time
|
|
const definedBufferTimes = getDefinedBufferTimes();
|
|
const maxBuffer = definedBufferTimes[definedBufferTimes.length - 1];
|
|
const startTimeAdjustedWithMaxBuffer = dayjs(startTimeDate).subtract(maxBuffer, "minute").toDate();
|
|
const endTimeAdjustedWithMaxBuffer = dayjs(endTimeDate).add(maxBuffer, "minute").toDate();
|
|
|
|
// startTime is less than endTimeDate and endTime grater than startTimeDate
|
|
const sharedQuery: Prisma.BookingWhereInput = {
|
|
startTime: { lte: endTimeAdjustedWithMaxBuffer },
|
|
endTime: { gte: startTimeAdjustedWithMaxBuffer },
|
|
status: {
|
|
in: [BookingStatus.ACCEPTED],
|
|
},
|
|
};
|
|
|
|
// INFO: Refactored to allow this method to take in a list of current bookings for the user.
|
|
// Will keep support for retrieving a user's bookings if the caller does not already supply them.
|
|
// This function is called from multiple places but we aren't refactoring all of them at this moment
|
|
// to avoid potential side effects.
|
|
let bookings = params.currentBookings;
|
|
|
|
if (!bookings) {
|
|
const getBookingsForBusyTimesSpan = Sentry.startInactiveSpan({ name: "getBookingsForBusyTimes" });
|
|
const bookingsSelect = Prisma.validator<Prisma.BookingSelect>()({
|
|
id: true,
|
|
uid: true,
|
|
userId: true,
|
|
startTime: true,
|
|
endTime: true,
|
|
title: true,
|
|
eventType: {
|
|
select: {
|
|
id: true,
|
|
afterEventBuffer: true,
|
|
beforeEventBuffer: true,
|
|
seatsPerTimeSlot: true,
|
|
},
|
|
},
|
|
...(seatedEvent && {
|
|
_count: {
|
|
select: {
|
|
seatsReferences: true,
|
|
},
|
|
},
|
|
}),
|
|
});
|
|
|
|
const currentBookingsAllUsersQueryOne = prisma.booking.findMany({
|
|
where: {
|
|
// User is primary host (individual events, or primary organizer)
|
|
...sharedQuery,
|
|
userId,
|
|
},
|
|
select: bookingsSelect,
|
|
});
|
|
|
|
const currentBookingsAllUsersQueryTwo = prisma.booking.findMany({
|
|
where: {
|
|
...sharedQuery,
|
|
attendees: {
|
|
some: {
|
|
email: userEmail,
|
|
},
|
|
},
|
|
},
|
|
select: bookingsSelect,
|
|
});
|
|
|
|
const unconfirmedBookingsBlockingSlots = eventTypeId
|
|
? prisma.booking.findMany({
|
|
where: {
|
|
startTime: { lte: endTimeDate },
|
|
endTime: { gte: startTimeDate },
|
|
eventType: {
|
|
id: eventTypeId,
|
|
requiresConfirmation: true,
|
|
requiresConfirmationWillBlockSlot: true,
|
|
},
|
|
status: {
|
|
in: [BookingStatus.PENDING],
|
|
},
|
|
},
|
|
select: bookingsSelect,
|
|
})
|
|
: null;
|
|
|
|
const [resultOne, resultTwo, resultThree] = await Promise.all([
|
|
currentBookingsAllUsersQueryOne,
|
|
currentBookingsAllUsersQueryTwo,
|
|
unconfirmedBookingsBlockingSlots,
|
|
]);
|
|
|
|
bookings = [...resultOne, ...resultTwo, ...(resultThree ?? [])];
|
|
|
|
getBookingsForBusyTimesSpan.end();
|
|
}
|
|
|
|
const bookingSeatCountMap: { [x: string]: number } = {};
|
|
const busyTimes = bookings.reduce(
|
|
(aggregate: EventBusyDetails[], { id, startTime, endTime, eventType, title, ...rest }) => {
|
|
if (rest._count?.seatsReferences) {
|
|
const bookedAt = `${dayjs(startTime).utc().format()}<>${dayjs(endTime).utc().format()}`;
|
|
bookingSeatCountMap[bookedAt] = bookingSeatCountMap[bookedAt] || 0;
|
|
bookingSeatCountMap[bookedAt]++;
|
|
// Seat references on the current event are non-blocking until the event is fully booked.
|
|
if (
|
|
// there are still seats available.
|
|
bookingSeatCountMap[bookedAt] < (eventType?.seatsPerTimeSlot || 1) &&
|
|
// and this is the seated event, other event types should be blocked.
|
|
eventTypeId === eventType?.id
|
|
) {
|
|
// then we do not add the booking to the busyTimes.
|
|
return aggregate;
|
|
}
|
|
// if it does get blocked at this point; we remove the bookingSeatCountMap entry
|
|
// doing this allows using the map later to remove the ranges from calendar busy times.
|
|
delete bookingSeatCountMap[bookedAt];
|
|
}
|
|
if (rest.uid === rescheduleUid) {
|
|
return aggregate;
|
|
}
|
|
aggregate.push({
|
|
start: dayjs(startTime)
|
|
.subtract((eventType?.beforeEventBuffer || 0) + (afterEventBuffer || 0), "minute")
|
|
.toDate(),
|
|
end: dayjs(endTime)
|
|
.add((eventType?.afterEventBuffer || 0) + (beforeEventBuffer || 0), "minute")
|
|
.toDate(),
|
|
title,
|
|
source: `eventType-${eventType?.id}-booking-${id}`,
|
|
});
|
|
return aggregate;
|
|
},
|
|
[]
|
|
);
|
|
|
|
logger.debug(
|
|
`Busy Time from Cal Bookings ${JSON.stringify({
|
|
busyTimes,
|
|
bookings: bookings?.map((booking) => getPiiFreeBooking(booking)),
|
|
numCredentials: credentials?.length,
|
|
})}`
|
|
);
|
|
performance.mark("prismaBookingGetEnd");
|
|
performance.measure(`prisma booking get took $1'`, "prismaBookingGetStart", "prismaBookingGetEnd");
|
|
if (credentials?.length > 0 && !bypassBusyCalendarTimes) {
|
|
const startConnectedCalendarsGet = performance.now();
|
|
const calendarBusyTimes = await getBusyCalendarTimes(
|
|
credentials,
|
|
startTime,
|
|
endTime,
|
|
selectedCalendars,
|
|
shouldServeCache
|
|
);
|
|
const endConnectedCalendarsGet = performance.now();
|
|
logger.debug(
|
|
`Connected Calendars get took ${
|
|
endConnectedCalendarsGet - startConnectedCalendarsGet
|
|
} ms for user ${username}`,
|
|
JSON.stringify({
|
|
calendarBusyTimes,
|
|
})
|
|
);
|
|
|
|
const openSeatsDateRanges = Object.keys(bookingSeatCountMap).map((key) => {
|
|
const [start, end] = key.split("<>");
|
|
return {
|
|
start: dayjs(start),
|
|
end: dayjs(end),
|
|
};
|
|
});
|
|
|
|
if (rescheduleUid) {
|
|
const originalRescheduleBooking = bookings.find((booking) => booking.uid === rescheduleUid);
|
|
// calendar busy time from original rescheduled booking should not be blocked
|
|
if (originalRescheduleBooking) {
|
|
openSeatsDateRanges.push({
|
|
start: dayjs(originalRescheduleBooking.startTime),
|
|
end: dayjs(originalRescheduleBooking.endTime),
|
|
});
|
|
}
|
|
}
|
|
|
|
const result = subtract(
|
|
calendarBusyTimes.map((value) => ({
|
|
...value,
|
|
end: dayjs(value.end),
|
|
start: dayjs(value.start),
|
|
})),
|
|
openSeatsDateRanges
|
|
);
|
|
|
|
busyTimes.push(
|
|
...result.map((busyTime) => ({
|
|
...busyTime,
|
|
start: busyTime.start.subtract(afterEventBuffer || 0, "minute").toDate(),
|
|
end: busyTime.end.add(beforeEventBuffer || 0, "minute").toDate(),
|
|
}))
|
|
);
|
|
|
|
/*
|
|
// TODO: Disabled until we can filter Zoom events by date. Also this is adding too much latency.
|
|
const videoBusyTimes = (await getBusyVideoTimes(credentials)).filter(notEmpty);
|
|
console.log("videoBusyTimes", videoBusyTimes);
|
|
busyTimes.push(...videoBusyTimes);
|
|
*/
|
|
}
|
|
logger.debug(
|
|
"getBusyTimes:",
|
|
JSON.stringify({
|
|
allBusyTimes: busyTimes,
|
|
})
|
|
);
|
|
return busyTimes;
|
|
}
|
|
|
|
export function getStartEndDateforLimitCheck(
|
|
startDate: string,
|
|
endDate: string,
|
|
bookingLimits?: IntervalLimit | null,
|
|
durationLimits?: IntervalLimit | null
|
|
) {
|
|
const startTimeAsDayJs = stringToDayjs(startDate);
|
|
const endTimeAsDayJs = stringToDayjs(endDate);
|
|
|
|
let limitDateFrom = stringToDayjs(startDate);
|
|
let limitDateTo = stringToDayjs(endDate);
|
|
|
|
// expand date ranges by absolute minimum required to apply limits
|
|
// (yearly limits are handled separately for performance)
|
|
for (const key of ["PER_MONTH", "PER_WEEK", "PER_DAY"] as Exclude<keyof IntervalLimit, "PER_YEAR">[]) {
|
|
if (bookingLimits?.[key] || durationLimits?.[key]) {
|
|
const unit = intervalLimitKeyToUnit(key);
|
|
limitDateFrom = dayjs.min(limitDateFrom, startTimeAsDayJs.startOf(unit));
|
|
limitDateTo = dayjs.max(limitDateTo, endTimeAsDayJs.endOf(unit));
|
|
}
|
|
}
|
|
|
|
return { limitDateFrom, limitDateTo };
|
|
}
|
|
|
|
export async function getBusyTimesForLimitChecks(params: {
|
|
userIds: number[];
|
|
eventTypeId: number;
|
|
startDate: string;
|
|
endDate: string;
|
|
rescheduleUid?: string | null;
|
|
bookingLimits?: IntervalLimit | null;
|
|
durationLimits?: IntervalLimit | null;
|
|
}) {
|
|
const { userIds, eventTypeId, startDate, endDate, rescheduleUid, bookingLimits, durationLimits } = params;
|
|
|
|
performance.mark("getBusyTimesForLimitChecksStart");
|
|
|
|
let busyTimes: EventBusyDetails[] = [];
|
|
|
|
if (!bookingLimits && !durationLimits) {
|
|
return busyTimes;
|
|
}
|
|
|
|
const { limitDateFrom, limitDateTo } = getStartEndDateforLimitCheck(
|
|
startDate,
|
|
endDate,
|
|
bookingLimits,
|
|
durationLimits
|
|
);
|
|
|
|
logger.silly(
|
|
`Fetch limit checks bookings in range ${limitDateFrom} to ${limitDateTo} for input ${JSON.stringify({
|
|
eventTypeId,
|
|
status: BookingStatus.ACCEPTED,
|
|
})}`
|
|
);
|
|
|
|
const where: Prisma.BookingWhereInput = {
|
|
userId: {
|
|
in: userIds,
|
|
},
|
|
eventTypeId,
|
|
status: BookingStatus.ACCEPTED,
|
|
// FIXME: bookings that overlap on one side will never be counted
|
|
startTime: {
|
|
gte: limitDateFrom.toDate(),
|
|
},
|
|
endTime: {
|
|
lte: limitDateTo.toDate(),
|
|
},
|
|
};
|
|
|
|
if (rescheduleUid) {
|
|
where.NOT = {
|
|
uid: rescheduleUid,
|
|
};
|
|
}
|
|
|
|
const bookings = await prisma.booking.findMany({
|
|
where,
|
|
select: {
|
|
id: true,
|
|
startTime: true,
|
|
endTime: true,
|
|
eventType: {
|
|
select: {
|
|
id: true,
|
|
},
|
|
},
|
|
title: true,
|
|
userId: true,
|
|
},
|
|
});
|
|
|
|
busyTimes = bookings.map(({ id, startTime, endTime, eventType, title, userId }) => ({
|
|
start: dayjs(startTime).toDate(),
|
|
end: dayjs(endTime).toDate(),
|
|
title,
|
|
source: `eventType-${eventType?.id}-booking-${id}`,
|
|
userId,
|
|
}));
|
|
|
|
logger.silly(`Fetch limit checks bookings for eventId: ${eventTypeId} ${JSON.stringify(busyTimes)}`);
|
|
performance.mark("getBusyTimesForLimitChecksEnd");
|
|
performance.measure(
|
|
`prisma booking get for limits took $1'`,
|
|
"getBusyTimesForLimitChecksStart",
|
|
"getBusyTimesForLimitChecksEnd"
|
|
);
|
|
return busyTimes;
|
|
}
|
|
|
|
export default getBusyTimes;
|