* chore: Upgrade prisma to 6.7.0 * Build fixes * type fixes Signed-off-by: Omar López <zomars@me.com> * Update schema.prisma * Patching * Revert "Update schema.prisma" This reverts commit 47d8618bf89ef4d007b30084df766f17281e21a1. * Revert "Patching" This reverts commit a1d2e3040e71690a44d4324db95d73b4d68c6adb. * Revert schema changes Signed-off-by: Omar López <zomars@me.com> * WIP Signed-off-by: Omar López <zomars@me.com> * Update getPublicEvent.ts * Update imports Signed-off-by: Omar López <zomars@me.com> * Update gitignore Signed-off-by: Omar López <zomars@me.com> * update remaining imports Signed-off-by: Omar López <zomars@me.com> * Delete .cursor/config.json * Discard changes to packages/features/eventtypes/lib/getPublicEvent.ts * Update _get.ts * Update user.ts * Update .gitignore * update * Update WorkflowStepContainer.tsx * Update next-auth-custom-adapter.ts * Update getPublicEvent.ts * Update workflow.ts * Update next-auth-custom-adapter.ts * Update next-auth-options.ts * Update bookingScenario.ts * fix missing imports * upgrades prismock Signed-off-by: Omar López <zomars@me.com> * patches prismock Signed-off-by: Omar López <zomars@me.com> * Update reschedule.test.ts * Update prisma.ts * patch prismock Signed-off-by: Omar López <zomars@me.com> * fix enums imports Signed-off-by: Omar López <zomars@me.com> * Revert "Update prisma.ts" This reverts commit 64edcf8db54171ff4456c209d563b5d431d99619. * Revert "patch prismock" This reverts commit e95819113dc9d88e7130947aa120cd42710977c8. * fix patch * Fix test that overrun the boundary, it shouldn't test too much * Move prisma import to changeSMSLockState * Bring back broken test without illegal imports * Merge with main and fix filter hosts by same round robin host * Fixed buildDryRunBooking fn tests * Fix and move ooo create or update handler test * Fix packages/features/eventtypes/lib/isCurrentlyAvailable.test.ts * Fix packages/trpc/server/routers/viewer/organizations/listMembers.handler.test.ts * Mock @calcom/prisma * Fix: verify-email.test.ts * fix: Moved WebhookService test and fixed default import mock * Fix: Added missing prisma mock, handleNewBooking uses that of course * We're not testing createContext here * fix: Prisma mock fix for listMembers.test.ts * More fixes to broken testcases * Forgot to remove borked test * Prevent the need to mock a lot of dependencies by moving out buildBaseWhereCondition to its own file * Temporarily skip getCalendarEvents, needs a rewrite * Fix: turns out you can access protected in testcases * fix further mocks * Added packages/features/insights/server/buildBaseWhereCondition.ts, types * Always great to have a mock and then not use it * And one less again. * fix: confirm.handler.test, didn't mock prisma * fix: Address minor nit by @eunjae & fix ImpersonationProvider test * Updated isPrismaAvailableCheck that doesn't crash on import * fix: Get Prisma directly from the client, it usually involves the Validator and does not need 'local' inclusion * Add zod-prisma-types without the generator enabled (commented out) * Uncomment and see what happens * Change method of import as imports did not work in Input Schemas * Remove custom 'zod' booking model, it does not belong with Prisma * Fix all other global Model imports * Rewrite most schema includes AND remove barrel file * Add bookingCreateBodySchema to features/bookings * Flurry of type fixes for compatibility with new zod gen * Refactor out the custom prisma type createEventTypeInput * Work around nullable eventTypeLocations * HandlePayment type fix * More fixes, final fix remaining is CompleteEventType * Should fix a bunch more booking related type errors * Missed one * Some props missing from BookingCreateBodySchema * Fix location type in handleChildrenEventTypes * Little bit hacky imo but it works * Final type error \o/ * Forgot to include Prisma * Do not include zod-utils in booker/types * Oops, was already including Booker/types * Fix membership type, also disallow updating createdAt/updatedAt, make part of patch/post * Fix api v1 type errors * Fix EventTypeDescription typings * Remove getParserWithGeneric, use userBodySchema with UserSchema * use centralized timeZoneSchema * Implement feedback by @zomars * Couple of WIP pushes * Fix tests * Type fixes in `handleChildrenEventTypes` test * Try and parse metadata before use * Change zod-prisma-types configuration for optimal performance * Fix prisma validator error in `prisma/selects/credential` * Disable seperate relations model, hits a bug * Import absolute - this makes rollup work in @platform/libraries * Attempt at removing resolutions override * Refactor using `Prisma.validator` to `satisfies` * Build atoms using @calcom/prisma/client * Build atoms using @calcom/prisma/client * fixes * Update eventTypeSelect.ts * Adjust `eventTypeMetaDataSchemaWithUntypedApps` from `unknown` to `record(any)` * `EventTypeDescription` rely on `descriptionAsSafeHTML` instead of `description` * Add `seatsPerTimeSlot` to event type public select * Fix typing in `users-public-view` getServerSide props * Add missing `schedulingType` to prop * chore: bump platform libraries * Function return type is illegal, not sure how this passed eslint (#21567) * Merged with main * Update updateTokenObject.ts * Update handleResponse.ts * Update index.ts * Update handleChildrenEventTypes.ts * Update booking-idempotency-key.ts * Update WebhookService.test.ts * Update events.test.ts * Update queued-response.test.ts * Update events.test.ts * Update getRoutedUrl.test.ts * fix: type checks Signed-off-by: Omar López <zomars@me.com> * fixes Signed-off-by: Omar López <zomars@me.com> * chore: bump platform libraries * Update yarn.lock * more fixes Signed-off-by: Omar López <zomars@me.com> * fixes Signed-off-by: Omar López <zomars@me.com> * biuld fixes * chore: bump platform libraries * Update conferencing.repository.ts * Update conferencing.repository.ts * Update getCalendarsEvents.test.ts * Update vite.config.js * chore: bump platform libraries * Update users.ts * Discard changes to docs/api-reference/v2/openapi.json * Update vite.config.ts * updated platform libraries * Update get.handler.test.ts * Update get.handler.test.ts * Update schema.prisma * Discard changes to docs/api-reference/v2/openapi.json * Update next-auth-custom-adapter.ts * Update team.ts * Flurry of type fixes * Fix majority of insight related type errors * Type fixes for unlink of account * Make user nullable again * Fixed a bunch of unit tests and one type error * Attempted mock fix * Attempted fix for Attribute type * Ensure default import becomes prisma, but not direct usage * Import default as prisma in prisma.module * Add attributeOption to attribute type * Fix calcom/prisma mock * Refactor Prisma client imports to @calcom/prisma/client Updated all imports from '@prisma/client' to '@calcom/prisma/client' across tests and repository files for consistency and to use the correct Prisma client package. This change improves maintainability and ensures the correct client is referenced throughout the codebase. * Undo removal of max-warnings=0 to get main to merge * Remove unit tests for e2e fixtures, provide new prisma mock * Mock @calcom/prisma in event manager * Mock @calcom/prisma in event manager * Add correct format even with --no-verify * Mock prisma in CalendarManager * Add mock for permission-check.service * Better injection in PrismaApiKeyRepository imports * More mock fixes :) * Fix listMembers.handler.test * Fix User import * Appropriately adjust all types to be imported as types, there were a lot of types imported as normal deps * Why was this a thing? * Strictly speaking; Not using prismock anymore * Ditched patch file for prismock * Fix output.service.ts platform type imports, need concrete for plainToClass * Better typing and tests for unlinkConnectedAccount.handler * Small type fix * Disable calendar cache tests as they are dependent on prismock * chore: bump platform lib * getRoutedUrl test remove of unused import * Extract select to external const on getEventTypesFromDB * Direct select of userSelect from selects/user * fix type error from merging 23653 * Fixed integration tests by removing hardcoded values that were possible due to mocking, but as its now directly hitting the db no longer * fix: vite config atoms prisma client type location * revert: example app prisma client * revert: example app prisma client * bump platform libs * fix: use class instead of type for DI of PlatformBookingsService * update platform libs * remove unused variable * chore: generate prisma client for api v2 * fix: api v2 e2e * fix: atoms e2e * fix: atoms e2e * fix: atoms e2e * fix: api v2 e2e * fix: tsconfig apiv2 enums * publish libraries * Simplify check for existence teamId --------- Signed-off-by: Omar López <zomars@me.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com>
348 lines
11 KiB
TypeScript
348 lines
11 KiB
TypeScript
import type short from "short-uuid";
|
|
import type { z } from "zod";
|
|
|
|
import type { routingFormResponseInDbSchema } from "@calcom/app-store/routing-forms/zod";
|
|
import dayjs from "@calcom/dayjs";
|
|
import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";
|
|
import { withReporting } from "@calcom/lib/sentryWrapper";
|
|
import prisma from "@calcom/prisma";
|
|
import { Prisma } from "@calcom/prisma/client";
|
|
import { BookingStatus } from "@calcom/prisma/enums";
|
|
import type { CreationSource } from "@calcom/prisma/enums";
|
|
import type { CalendarEvent } from "@calcom/types/Calendar";
|
|
|
|
import type { TgetBookingDataSchema } from "../getBookingDataSchema";
|
|
import type { AwaitedBookingData, EventTypeId } from "./getBookingData";
|
|
import type { NewBookingEventType } from "./getEventTypesFromDB";
|
|
import type { LoadedUsers } from "./loadUsers";
|
|
import type { OriginalRescheduledBooking } from "./originalRescheduledBookingUtils";
|
|
import type { PaymentAppData, Tracking } from "./types";
|
|
|
|
type ReqBodyWithEnd = TgetBookingDataSchema & { end: string };
|
|
|
|
type CreateBookingParams = {
|
|
uid: short.SUUID;
|
|
routingFormResponseId: number | undefined;
|
|
reroutingFormResponses: z.infer<typeof routingFormResponseInDbSchema> | null;
|
|
rescheduledBy: string | undefined;
|
|
reqBody: {
|
|
user: ReqBodyWithEnd["user"];
|
|
metadata: ReqBodyWithEnd["metadata"];
|
|
recurringEventId: ReqBodyWithEnd["recurringEventId"];
|
|
};
|
|
eventType: {
|
|
eventTypeData: NewBookingEventType;
|
|
id: EventTypeId;
|
|
slug: AwaitedBookingData["eventTypeSlug"];
|
|
organizerUser: LoadedUsers[number] & {
|
|
isFixed?: boolean;
|
|
metadata?: Prisma.JsonValue;
|
|
};
|
|
isConfirmedByDefault: boolean;
|
|
paymentAppData: PaymentAppData;
|
|
};
|
|
input: {
|
|
bookerEmail: AwaitedBookingData["email"];
|
|
rescheduleReason: AwaitedBookingData["rescheduleReason"];
|
|
smsReminderNumber: AwaitedBookingData["smsReminderNumber"];
|
|
responses: ReqBodyWithEnd["responses"] | null;
|
|
};
|
|
evt: CalendarEvent;
|
|
originalRescheduledBooking: OriginalRescheduledBooking;
|
|
creationSource?: CreationSource;
|
|
tracking?: Tracking;
|
|
};
|
|
|
|
function updateEventDetails(
|
|
evt: CalendarEvent,
|
|
originalRescheduledBooking: OriginalRescheduledBooking | null
|
|
) {
|
|
if (originalRescheduledBooking) {
|
|
evt.description = originalRescheduledBooking?.description || evt.description;
|
|
evt.location = evt.location || originalRescheduledBooking?.location;
|
|
}
|
|
}
|
|
|
|
async function getAssociatedBookingForFormResponse(formResponseId: number) {
|
|
const formResponse = await prisma.app_RoutingForms_FormResponse.findUnique({
|
|
where: {
|
|
id: formResponseId,
|
|
},
|
|
});
|
|
return formResponse?.routedToBookingUid ?? null;
|
|
}
|
|
|
|
// Define the function with underscore prefix
|
|
const _createBooking = async ({
|
|
uid,
|
|
reqBody,
|
|
eventType,
|
|
input,
|
|
evt,
|
|
originalRescheduledBooking,
|
|
routingFormResponseId,
|
|
reroutingFormResponses,
|
|
rescheduledBy,
|
|
creationSource,
|
|
tracking,
|
|
}: CreateBookingParams & { rescheduledBy: string | undefined }) => {
|
|
updateEventDetails(evt, originalRescheduledBooking);
|
|
const associatedBookingForFormResponse = routingFormResponseId
|
|
? await getAssociatedBookingForFormResponse(routingFormResponseId)
|
|
: null;
|
|
|
|
const bookingAndAssociatedData = buildNewBookingData({
|
|
uid,
|
|
rescheduledBy,
|
|
routingFormResponseId: shouldConnectBookingToFormResponse() ? routingFormResponseId : undefined,
|
|
reroutingFormResponses,
|
|
reqBody,
|
|
eventType,
|
|
input,
|
|
evt,
|
|
originalRescheduledBooking,
|
|
creationSource,
|
|
tracking,
|
|
});
|
|
|
|
return await saveBooking(
|
|
bookingAndAssociatedData,
|
|
originalRescheduledBooking,
|
|
eventType.paymentAppData,
|
|
eventType.organizerUser
|
|
);
|
|
|
|
function shouldConnectBookingToFormResponse() {
|
|
const isRerouting = !!reroutingFormResponses;
|
|
|
|
// During rerouting, we want to connect the new booking to the existing form response for booking being rescheduled(original booking)
|
|
if (isRerouting) {
|
|
return true;
|
|
}
|
|
// If not rerouting and there is already an associated booking for the form response, we don't want to connect the new booking to the form response
|
|
// We allow only the first booking to be connected to the form response
|
|
// Other bookings could happen due to user doing a booking by using browser back button to reach the same booking form with same query params and changing the time
|
|
// Such case isn't what the Routing Form redirected the user to, so we avoid this at the moment.
|
|
if (associatedBookingForFormResponse) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
};
|
|
|
|
export const createBooking = withReporting(_createBooking, "createBooking");
|
|
|
|
async function saveBooking(
|
|
bookingAndAssociatedData: ReturnType<typeof buildNewBookingData>,
|
|
originalRescheduledBooking: OriginalRescheduledBooking,
|
|
paymentAppData: PaymentAppData,
|
|
organizerUser: CreateBookingParams["eventType"]["organizerUser"]
|
|
) {
|
|
const { newBookingData, reroutingFormResponseUpdateData, originalBookingUpdateDataForCancellation } =
|
|
bookingAndAssociatedData;
|
|
const createBookingObj = {
|
|
include: {
|
|
user: {
|
|
select: { email: true, name: true, timeZone: true, username: true },
|
|
},
|
|
attendees: true,
|
|
payment: true,
|
|
references: true,
|
|
},
|
|
data: newBookingData,
|
|
};
|
|
|
|
if (originalRescheduledBooking?.paid && originalRescheduledBooking?.payment) {
|
|
const bookingPayment = originalRescheduledBooking.payment.find((payment) => payment.success);
|
|
if (bookingPayment) {
|
|
createBookingObj.data.payment = { connect: { id: bookingPayment.id } };
|
|
}
|
|
}
|
|
|
|
if (typeof paymentAppData.price === "number" && paymentAppData.price > 0) {
|
|
await prisma.credential.findFirstOrThrow({
|
|
where: {
|
|
appId: paymentAppData.appId,
|
|
...(paymentAppData.credentialId ? { id: paymentAppData.credentialId } : { userId: organizerUser.id }),
|
|
},
|
|
select: { id: true },
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Reschedule(Cancellation + Creation) with an update of reroutingFormResponse should be atomic
|
|
*/
|
|
return prisma.$transaction(async (tx) => {
|
|
if (originalBookingUpdateDataForCancellation) {
|
|
await tx.booking.update(originalBookingUpdateDataForCancellation);
|
|
}
|
|
|
|
const booking = await tx.booking.create(createBookingObj);
|
|
if (reroutingFormResponseUpdateData) {
|
|
await tx.app_RoutingForms_FormResponse.update(reroutingFormResponseUpdateData);
|
|
}
|
|
|
|
return booking;
|
|
});
|
|
}
|
|
|
|
function getEventTypeRel(eventTypeId: EventTypeId) {
|
|
return eventTypeId ? { connect: { id: eventTypeId } } : {};
|
|
}
|
|
|
|
function getAttendeesData(evt: Pick<CalendarEvent, "attendees" | "team">) {
|
|
//if attendee is team member, it should fetch their locale not booker's locale
|
|
//perhaps make email fetch request to see if his locale is stored, else
|
|
const teamMembers = evt?.team?.members ?? [];
|
|
|
|
return evt.attendees.concat(teamMembers).map((attendee) => ({
|
|
name: attendee.name,
|
|
email: attendee.email,
|
|
timeZone: attendee.timeZone,
|
|
locale: attendee.language.locale,
|
|
phoneNumber: attendee.phoneNumber,
|
|
}));
|
|
}
|
|
|
|
function buildNewBookingData(params: CreateBookingParams) {
|
|
const {
|
|
uid,
|
|
evt,
|
|
reqBody,
|
|
eventType,
|
|
input,
|
|
originalRescheduledBooking,
|
|
routingFormResponseId,
|
|
reroutingFormResponses,
|
|
rescheduledBy,
|
|
creationSource,
|
|
tracking,
|
|
} = params;
|
|
|
|
const attendeesData = getAttendeesData(evt);
|
|
const eventTypeRel = getEventTypeRel(eventType.id);
|
|
const reroutingFormResponseUpdateData = getReroutingFormResponseUpdateData({
|
|
reroutingFormResponses,
|
|
routingFormResponseId,
|
|
});
|
|
|
|
const newBookingData: Prisma.BookingCreateInput = {
|
|
uid,
|
|
userPrimaryEmail: evt.organizer.email,
|
|
responses: input.responses === null || evt.seatsPerTimeSlot ? Prisma.JsonNull : input.responses,
|
|
title: evt.title,
|
|
startTime: dayjs.utc(evt.startTime).toDate(),
|
|
endTime: dayjs.utc(evt.endTime).toDate(),
|
|
description: evt.seatsPerTimeSlot ? null : evt.additionalNotes,
|
|
customInputs: isPrismaObjOrUndefined(evt.customInputs),
|
|
status: eventType.isConfirmedByDefault ? BookingStatus.ACCEPTED : BookingStatus.PENDING,
|
|
oneTimePassword: evt.oneTimePassword,
|
|
location: evt.location,
|
|
eventType: eventTypeRel,
|
|
smsReminderNumber: input.smsReminderNumber,
|
|
metadata: reqBody.metadata,
|
|
attendees: {
|
|
createMany: {
|
|
data: attendeesData,
|
|
},
|
|
},
|
|
dynamicEventSlugRef: !eventType.id ? eventType.slug : null,
|
|
dynamicGroupSlugRef: !eventType.id ? (reqBody.user as string).toLowerCase() : null,
|
|
iCalUID: evt.iCalUID ?? "",
|
|
iCalSequence: originalRescheduledBooking ? evt.iCalSequence || 1 : 0,
|
|
user: {
|
|
connect: {
|
|
id: eventType.organizerUser.id,
|
|
},
|
|
},
|
|
destinationCalendar:
|
|
evt.destinationCalendar && evt.destinationCalendar.length > 0
|
|
? {
|
|
connect: { id: evt.destinationCalendar[0].id },
|
|
}
|
|
: undefined,
|
|
|
|
routedFromRoutingFormReponse: routingFormResponseId
|
|
? { connect: { id: routingFormResponseId } }
|
|
: undefined,
|
|
creationSource,
|
|
tracking: tracking ? { create: tracking } : undefined,
|
|
};
|
|
|
|
if (reqBody.recurringEventId) {
|
|
newBookingData.recurringEventId = reqBody.recurringEventId;
|
|
}
|
|
|
|
let originalBookingUpdateDataForCancellation: Prisma.BookingUpdateArgs | undefined = undefined;
|
|
|
|
if (originalRescheduledBooking) {
|
|
newBookingData.metadata = {
|
|
...(typeof originalRescheduledBooking.metadata === "object" && originalRescheduledBooking.metadata),
|
|
...reqBody.metadata,
|
|
};
|
|
newBookingData.paid = originalRescheduledBooking.paid;
|
|
newBookingData.fromReschedule = originalRescheduledBooking.uid;
|
|
if (originalRescheduledBooking.uid) {
|
|
newBookingData.cancellationReason = input.rescheduleReason;
|
|
}
|
|
// Reschedule logic with booking with seats
|
|
if (
|
|
newBookingData.attendees?.createMany?.data &&
|
|
eventType?.eventTypeData?.seatsPerTimeSlot &&
|
|
input.bookerEmail
|
|
) {
|
|
newBookingData.attendees.createMany.data = attendeesData.filter(
|
|
(attendee) => attendee.email === input.bookerEmail
|
|
);
|
|
}
|
|
|
|
if (originalRescheduledBooking.recurringEventId) {
|
|
newBookingData.recurringEventId = originalRescheduledBooking.recurringEventId;
|
|
}
|
|
|
|
if (!evt.seatsPerTimeSlot && originalRescheduledBooking?.uid) {
|
|
originalBookingUpdateDataForCancellation = {
|
|
where: {
|
|
id: originalRescheduledBooking.id,
|
|
},
|
|
data: {
|
|
rescheduled: true,
|
|
status: BookingStatus.CANCELLED,
|
|
rescheduledBy: rescheduledBy,
|
|
},
|
|
};
|
|
}
|
|
}
|
|
|
|
return {
|
|
newBookingData,
|
|
reroutingFormResponseUpdateData,
|
|
originalBookingUpdateDataForCancellation,
|
|
};
|
|
|
|
function getReroutingFormResponseUpdateData({
|
|
reroutingFormResponses,
|
|
routingFormResponseId,
|
|
}: {
|
|
reroutingFormResponses: z.infer<typeof routingFormResponseInDbSchema> | null;
|
|
routingFormResponseId: number | undefined | null;
|
|
}) {
|
|
if (!routingFormResponseId) {
|
|
return null;
|
|
}
|
|
|
|
if (!reroutingFormResponses) {
|
|
return null;
|
|
}
|
|
|
|
return {
|
|
where: { id: routingFormResponseId },
|
|
data: {
|
|
response: reroutingFormResponses,
|
|
},
|
|
};
|
|
}
|
|
}
|
|
|
|
export type Booking = Awaited<ReturnType<typeof createBooking>>;
|