* Initial commit * Adding feature flag * feat: Orgs Schema Changing `scopedMembers` to `orgUsers` (#9209) * Change scopedMembers to orgMembers * Change to orgUsers * Letting duplicate slugs for teams to support orgs * Covering null on unique clauses * Supporting having the orgId in the session cookie * feat: organization event type filter (#9253) Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * Missing changes to support orgs schema changes * feat: Onboarding process to create an organization (#9184) * Desktop first banner, mobile pending * Removing dead code and img * WIP * Adds Email verification template+translations for organizations (#9202) * First step done * Merge branch 'feat/organizations-onboarding' of github.com:calcom/cal.com into feat/organizations-onboarding * Step 2 done, avatar not working * Covering null on unique clauses * Onboarding admins step * Last step to create teams * Moving change password handler, improving verifying code flow * Clearing error before submitting * Reverting email testing api changes * Reverting having the banner for now * Consistent exported components * Remove unneeded files from banner * Removing uneeded code * Fixing avatar selector * Using meta component for head/descr * Missing i18n strings * Feedback * Making an org avatar (temp) * Check for subteams slug clashes with usernames * Fixing create teams onsuccess * feedback * Making sure we check requestedSlug now --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * feat: [CAL-1816] Organization subdomain support (#9345) * Desktop first banner, mobile pending * Removing dead code and img * WIP * Adds Email verification template+translations for organizations (#9202) * First step done * Merge branch 'feat/organizations-onboarding' of github.com:calcom/cal.com into feat/organizations-onboarding * Step 2 done, avatar not working * Covering null on unique clauses * Onboarding admins step * Last step to create teams * Moving change password handler, improving verifying code flow * Clearing error before submitting * Reverting email testing api changes * Reverting having the banner for now * Consistent exported components * Remove unneeded files from banner * Removing uneeded code * Fixing avatar selector * Using meta component for head/descr * Missing i18n strings * Feedback * Making an org avatar (temp) * Check for subteams slug clashes with usernames * Fixing create teams onsuccess * Covering users and subteams, excluding non-org users * Unpublished teams shows correctly * Create subdomain in Vercel * feedback * Renaming Vercel env vars * Vercel domain check before creation * Supporting cal-staging.com * Change to have vercel detect it * vercel domain check data message error * Remove check domain * Making sure we check requestedSlug now * Feedback and unneeded code * Reverting unneeded changes * Unneeded changes --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * Vercel subdomain creation in PROD only * Making sure we let localhost still work * Feedback * Type check fixes * feat: Organization branding in side menu (#9279) * Desktop first banner, mobile pending * Removing dead code and img * WIP * Adds Email verification template+translations for organizations (#9202) * First step done * Merge branch 'feat/organizations-onboarding' of github.com:calcom/cal.com into feat/organizations-onboarding * Step 2 done, avatar not working * Covering null on unique clauses * Onboarding admins step * Last step to create teams * Moving change password handler, improving verifying code flow * Clearing error before submitting * Reverting email testing api changes * Reverting having the banner for now * Consistent exported components * Remove unneeded files from banner * Removing uneeded code * Fixing avatar selector * Org branding provider used in shell sidebar * Using meta component for head/descr * Missing i18n strings * Feedback * Making an org avatar (temp) * Using org avatar (temp) * Not showing org logo if not set * User onboarding with org branding (slug) * Check for subteams slug clashes with usernames * Fixing create teams onsuccess * feedback * Feedback * Org public profile * Public profiles for team event types * Added setup profile alert * Using org avatar on subteams avatar * Making sure we show the set up profile on org only * Profile username availability rely on org hook * Update apps/web/pages/team/[slug].tsx Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * Update apps/web/pages/team/[slug].tsx Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * feat: Organization support for event types page (#9449) * Desktop first banner, mobile pending * Removing dead code and img * WIP * Adds Email verification template+translations for organizations (#9202) * First step done * Merge branch 'feat/organizations-onboarding' of github.com:calcom/cal.com into feat/organizations-onboarding * Step 2 done, avatar not working * Covering null on unique clauses * Onboarding admins step * Last step to create teams * Moving change password handler, improving verifying code flow * Clearing error before submitting * Reverting email testing api changes * Reverting having the banner for now * Consistent exported components * Remove unneeded files from banner * Removing uneeded code * Fixing avatar selector * Org branding provider used in shell sidebar * Using meta component for head/descr * Missing i18n strings * Feedback * Making an org avatar (temp) * Using org avatar (temp) * Not showing org logo if not set * User onboarding with org branding (slug) * Check for subteams slug clashes with usernames * Fixing create teams onsuccess * feedback * Feedback * Org public profile * Public profiles for team event types * Added setup profile alert * Using org avatar on subteams avatar * Processing orgs and children as profile options * Reverting change not belonging to this PR * Making sure we show the set up profile on org only * Removing console.log * Comparing memberships to choose the highest one --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * Type errors * Refactor and type fixes * Update orgDomains.ts * Feedback * Reverting * NIT * fix issue getting org slug from domain * Improving orgDomains util * Host comes with port * Update useRouterQuery.ts * add org users cache-calendar * fix typo * re-use the simple user calendar-cache page * Apply suggestions from code review * Update packages/core/CalendarManager.ts * type fixes --------- Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: Leo Giovanetti <hello@leog.me> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: zomars <zomars@me.com>
165 lines
4.7 KiB
TypeScript
165 lines
4.7 KiB
TypeScript
import type { Credential } from "@prisma/client";
|
|
|
|
import { getBusyCalendarTimes } from "@calcom/core/CalendarManager";
|
|
import dayjs from "@calcom/dayjs";
|
|
import logger from "@calcom/lib/logger";
|
|
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 type { EventBusyDetails } from "@calcom/types/Calendar";
|
|
|
|
export async function getBusyTimes(params: {
|
|
credentials: Credential[];
|
|
userId: number;
|
|
username: string;
|
|
organizationSlug?: string | null | undefined;
|
|
eventTypeId?: number;
|
|
startTime: string;
|
|
beforeEventBuffer?: number;
|
|
afterEventBuffer?: number;
|
|
endTime: string;
|
|
selectedCalendars: SelectedCalendar[];
|
|
}) {
|
|
const {
|
|
credentials,
|
|
userId,
|
|
username,
|
|
eventTypeId,
|
|
startTime,
|
|
endTime,
|
|
organizationSlug,
|
|
beforeEventBuffer,
|
|
afterEventBuffer,
|
|
selectedCalendars,
|
|
} = params;
|
|
logger.silly(
|
|
`Checking Busy time from Cal Bookings in range ${startTime} to ${endTime} for input ${JSON.stringify({
|
|
userId,
|
|
eventTypeId,
|
|
status: BookingStatus.ACCEPTED,
|
|
})}`
|
|
);
|
|
// get user email for attendee checking.
|
|
const user = await prisma.user.findUniqueOrThrow({
|
|
where: {
|
|
id: userId,
|
|
},
|
|
select: {
|
|
email: true,
|
|
},
|
|
});
|
|
|
|
/**
|
|
* 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 sharedQuery = {
|
|
startTime: { gte: new Date(startTime) },
|
|
endTime: { lte: new Date(endTime) },
|
|
status: {
|
|
in: [BookingStatus.ACCEPTED],
|
|
},
|
|
};
|
|
// Find bookings that block this user from hosting further bookings.
|
|
const busyTimes: EventBusyDetails[] = await prisma.booking
|
|
.findMany({
|
|
where: {
|
|
OR: [
|
|
// User is primary host (individual events, or primary organizer)
|
|
{
|
|
...sharedQuery,
|
|
userId,
|
|
},
|
|
// The current user has a different booking at this time he/she attends
|
|
{
|
|
...sharedQuery,
|
|
attendees: {
|
|
some: {
|
|
email: user.email,
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
select: {
|
|
id: true,
|
|
startTime: true,
|
|
endTime: true,
|
|
title: true,
|
|
eventType: {
|
|
select: {
|
|
id: true,
|
|
afterEventBuffer: true,
|
|
beforeEventBuffer: true,
|
|
},
|
|
},
|
|
},
|
|
})
|
|
.then((bookings) =>
|
|
bookings.map(({ startTime, endTime, title, id, eventType }) => ({
|
|
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}`,
|
|
}))
|
|
);
|
|
logger.silly(`Busy Time from Cal Bookings ${JSON.stringify(busyTimes)}`);
|
|
performance.mark("prismaBookingGetEnd");
|
|
performance.measure(`prisma booking get took $1'`, "prismaBookingGetStart", "prismaBookingGetEnd");
|
|
if (credentials?.length > 0) {
|
|
const startConnectedCalendarsGet = performance.now();
|
|
const calendarBusyTimes = await getBusyCalendarTimes(
|
|
username,
|
|
credentials,
|
|
startTime,
|
|
endTime,
|
|
selectedCalendars,
|
|
organizationSlug
|
|
);
|
|
const endConnectedCalendarsGet = performance.now();
|
|
logger.debug(
|
|
`Connected Calendars get took ${
|
|
endConnectedCalendarsGet - startConnectedCalendarsGet
|
|
} ms for user ${username}`
|
|
);
|
|
busyTimes.push(
|
|
...calendarBusyTimes.map((value) => ({
|
|
...value,
|
|
end: dayjs(value.end)
|
|
.add(beforeEventBuffer || 0, "minute")
|
|
.toDate(),
|
|
start: dayjs(value.start)
|
|
.subtract(afterEventBuffer || 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);
|
|
*/
|
|
}
|
|
return busyTimes;
|
|
}
|
|
|
|
export default getBusyTimes;
|