* 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>
443 lines
13 KiB
TypeScript
443 lines
13 KiB
TypeScript
import { prisma } from "@calcom/prisma";
|
|
import type { Prisma } from "@calcom/prisma/client";
|
|
import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
|
|
import type { SelectedCalendarEventTypeIds } from "@calcom/types/Calendar";
|
|
|
|
import { buildCredentialPayloadForPrisma } from "../buildCredentialPayloadForCalendar";
|
|
|
|
export type UpdateArguments = {
|
|
where: FindManyArgs["where"];
|
|
data: Prisma.SelectedCalendarUpdateManyArgs["data"];
|
|
};
|
|
export type FindManyArgs = {
|
|
// https://github.com/microsoft/TypeScript/issues/55217 It crashes atoms build with this if we become too generic here. Seems like a TS bug with complex prisma types.
|
|
where?: {
|
|
userId?:
|
|
| number
|
|
| {
|
|
in: number[];
|
|
};
|
|
credentialId?: number | null;
|
|
integration?: string;
|
|
externalId?: string;
|
|
eventTypeId?: number | null;
|
|
googleChannelId?:
|
|
| string
|
|
| null
|
|
| {
|
|
not: null;
|
|
};
|
|
};
|
|
orderBy?: {
|
|
userId?: "asc" | "desc";
|
|
};
|
|
select?: Prisma.SelectedCalendarSelect;
|
|
};
|
|
|
|
const ensureUserLevelWhere = {
|
|
eventTypeId: null,
|
|
};
|
|
|
|
export class SelectedCalendarRepository {
|
|
private static async findConflicting(data: {
|
|
userId: number;
|
|
integration: string;
|
|
externalId: string;
|
|
eventTypeId?: number | null;
|
|
}) {
|
|
// Because userId_integration_externalId_eventTypeId is a unique constraint but with eventTypeId being nullable,
|
|
// it allows for multiple entries with the same (userId, integration, externalId) with eventTypeId=null in DB.
|
|
// We restrict it at app level by ensuring that an entry doesn't exist already before creating a new one
|
|
return await SelectedCalendarRepository.findFirst({
|
|
where: {
|
|
userId: data.userId,
|
|
integration: data.integration,
|
|
externalId: data.externalId,
|
|
eventTypeId: data.eventTypeId || null,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async findById(id: string) {
|
|
return await prisma.selectedCalendar.findUnique({ where: { id } });
|
|
}
|
|
|
|
static async create(data: Prisma.SelectedCalendarUncheckedCreateInput) {
|
|
const conflictingCalendar = await SelectedCalendarRepository.findConflicting(data);
|
|
|
|
if (conflictingCalendar) {
|
|
throw new Error(
|
|
`Selected calendar already exists for userId: ${data.userId}, integration: ${data.integration}, externalId: ${data.externalId}, eventTypeId: ${data.eventTypeId}`
|
|
);
|
|
}
|
|
|
|
return await prisma.selectedCalendar.create({
|
|
data: {
|
|
...data,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async upsert(data: Prisma.SelectedCalendarUncheckedCreateInput) {
|
|
// userId_integration_externalId_eventTypeId is a unique constraint but with eventTypeId being nullable
|
|
// So, this unique constraint can't be used in upsert. Prisma doesn't allow that, So, we do create and update separately
|
|
const credentialPayload = buildCredentialPayloadForPrisma({
|
|
credentialId: data.credentialId,
|
|
delegationCredentialId: data.delegationCredentialId,
|
|
});
|
|
|
|
const newData = {
|
|
...data,
|
|
...credentialPayload,
|
|
};
|
|
|
|
const conflictingCalendar = await SelectedCalendarRepository.findConflicting(newData);
|
|
if (conflictingCalendar) {
|
|
return await prisma.selectedCalendar.update({
|
|
where: {
|
|
id: conflictingCalendar.id,
|
|
},
|
|
data: newData,
|
|
});
|
|
}
|
|
|
|
return await prisma.selectedCalendar.create({
|
|
data: newData,
|
|
});
|
|
}
|
|
|
|
static async delete({ where }: { where: Prisma.SelectedCalendarUncheckedCreateInput }) {
|
|
const calendarsToDelete = await SelectedCalendarRepository.findMany({ where });
|
|
|
|
if (calendarsToDelete.length === 0) {
|
|
// Same behaviour as Prisma.delete as it throws error if no record is found
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
|
|
if (calendarsToDelete.length > 1) {
|
|
throw new Error("Multiple SelectedCalendar records found to delete. deleteMany should be used instead");
|
|
}
|
|
|
|
// We can't use delete because unique constraint on userId_integration_externalId_eventTypeId has eventTypeId as nullable
|
|
return await prisma.selectedCalendar.delete({
|
|
where: {
|
|
id: calendarsToDelete[0].id,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async deleteById({ id }: { id: string }) {
|
|
return await prisma.selectedCalendar.delete({
|
|
where: {
|
|
id,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async createIfNotExists(data: Prisma.SelectedCalendarUncheckedCreateInput) {
|
|
const conflictingCalendar = await SelectedCalendarRepository.findConflicting(data);
|
|
|
|
if (conflictingCalendar) return conflictingCalendar;
|
|
return await prisma.selectedCalendar.create({
|
|
data,
|
|
});
|
|
}
|
|
|
|
/** Retrieve calendars that need to be watched */
|
|
static async getNextBatchToWatch(limit = 100) {
|
|
// Get selected calendars from users that belong to a team that has calendar cache enabled
|
|
const oneDayInMS = 24 * 60 * 60 * 1000;
|
|
const tomorrowTimestamp = String(new Date().getTime() + oneDayInMS);
|
|
const nextBatch = await prisma.selectedCalendar.findMany({
|
|
take: limit,
|
|
where: {
|
|
user: {
|
|
teams: {
|
|
some: {
|
|
team: {
|
|
features: {
|
|
some: {
|
|
featureId: "calendar-cache",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
// RN we only support google calendar subscriptions for now
|
|
integration: "google_calendar",
|
|
AND: [
|
|
{
|
|
OR: [
|
|
// Either is a calendar that has not errored
|
|
{ error: null },
|
|
// Or is a calendar that has errored but has not reached max attempts
|
|
{
|
|
error: { not: null },
|
|
watchAttempts: {
|
|
lt: {
|
|
// Using ts-ignore instead of ts-expect-error because I am seeing conflicting errors in CI. In one case ts-expect-error fails with `Unused '@ts-expect-error' directive.`
|
|
// Removing ts-expect-error fails in another case that _ref isn't defined
|
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
// @ts-ignore
|
|
_ref: "maxAttempts",
|
|
_container: "SelectedCalendar",
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
{
|
|
OR: [
|
|
// Either is a calendar pending to be watched
|
|
{ googleChannelExpiration: null },
|
|
// Or is a calendar that is about to expire
|
|
{ googleChannelExpiration: { lt: tomorrowTimestamp } },
|
|
],
|
|
},
|
|
],
|
|
},
|
|
});
|
|
return nextBatch;
|
|
}
|
|
/**
|
|
* Retrieve calendars that are being watched but shouldn't be anymore
|
|
* e.g. when a user disables calendar cache for the organization
|
|
*/
|
|
static async getNextBatchToUnwatch(limit = 100) {
|
|
const where: Prisma.SelectedCalendarWhereInput = {
|
|
// RN we only support google calendar subscriptions for now
|
|
integration: "google_calendar",
|
|
googleChannelExpiration: { not: null },
|
|
AND: [
|
|
{
|
|
OR: [
|
|
// Either is a calendar that has not errored during unwatch
|
|
{ error: null },
|
|
// Or is a calendar that has errored during unwatch but has not reached max attempts
|
|
{
|
|
error: { not: null },
|
|
unwatchAttempts: {
|
|
lt: {
|
|
// Using ts-ignore instead of ts-expect-error because I am seeing conflicting errors in CI. In one case ts-expect-error fails with `Unused '@ts-expect-error' directive.`
|
|
// Removing ts-expect-error fails in another case that _ref isn't defined
|
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
// @ts-ignore
|
|
_ref: "maxAttempts",
|
|
_container: "SelectedCalendar",
|
|
},
|
|
},
|
|
},
|
|
],
|
|
},
|
|
{
|
|
user: {
|
|
teams: {
|
|
every: {
|
|
team: {
|
|
features: {
|
|
none: {
|
|
featureId: "calendar-cache",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
],
|
|
};
|
|
// If calendar cache is disabled globally, we skip team features and unwatch all subscriptions
|
|
const nextBatch = await prisma.selectedCalendar.findMany({
|
|
take: limit,
|
|
where,
|
|
});
|
|
return nextBatch;
|
|
}
|
|
|
|
static async findMany({ where, select, orderBy }: FindManyArgs) {
|
|
const args = {
|
|
where,
|
|
select,
|
|
orderBy,
|
|
} satisfies Prisma.SelectedCalendarFindManyArgs;
|
|
return await prisma.selectedCalendar.findMany(args);
|
|
}
|
|
|
|
static async findUniqueOrThrow({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
|
|
const calendars = await prisma.selectedCalendar.findMany({ where });
|
|
if (calendars.length === 0) {
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
return calendars[0];
|
|
}
|
|
|
|
static async findFirstByGoogleChannelId(googleChannelId: string) {
|
|
return await prisma.selectedCalendar.findFirst({
|
|
where: {
|
|
googleChannelId,
|
|
},
|
|
select: {
|
|
credential: {
|
|
select: {
|
|
...credentialForCalendarServiceSelect,
|
|
selectedCalendars: {
|
|
orderBy: {
|
|
externalId: "asc",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
});
|
|
}
|
|
|
|
static async findFirst({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
|
|
return await prisma.selectedCalendar.findFirst({
|
|
where,
|
|
});
|
|
}
|
|
|
|
static async findFirstOrThrow({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
|
|
const calendar = await SelectedCalendarRepository.findFirst({ where });
|
|
if (!calendar) {
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
return calendar;
|
|
}
|
|
|
|
static async update(args: UpdateArguments) {
|
|
const calendarsToUpdate = await SelectedCalendarRepository.findMany({ where: args.where });
|
|
|
|
if (calendarsToUpdate.length === 0) {
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
|
|
if (calendarsToUpdate.length > 1) {
|
|
throw new Error("Multiple SelectedCalendar records found to update. updateMany should be used instead");
|
|
}
|
|
|
|
const calendarToUpdate = calendarsToUpdate[0];
|
|
|
|
return await prisma.selectedCalendar.update({
|
|
where: {
|
|
id: calendarToUpdate.id,
|
|
},
|
|
data: args.data,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Following methods ensure that they operate on user level calendars only
|
|
*/
|
|
static async findUserLevelUniqueOrThrow({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
|
|
const calendars = await SelectedCalendarRepository.findUniqueOrThrow({
|
|
where: {
|
|
...where,
|
|
...ensureUserLevelWhere,
|
|
},
|
|
});
|
|
|
|
if (!calendars) {
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
return calendars;
|
|
}
|
|
|
|
static async findManyUserLevel(args: FindManyArgs) {
|
|
return SelectedCalendarRepository.findMany({
|
|
...args,
|
|
where: {
|
|
...args.where,
|
|
...ensureUserLevelWhere,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async updateUserLevel(args: UpdateArguments) {
|
|
return SelectedCalendarRepository.update({
|
|
where: {
|
|
...args.where,
|
|
...ensureUserLevelWhere,
|
|
},
|
|
data: args.data,
|
|
});
|
|
}
|
|
|
|
static async deleteUserLevel({ where }: { where: Prisma.SelectedCalendarUncheckedCreateInput }) {
|
|
return await SelectedCalendarRepository.delete({
|
|
where: {
|
|
...where,
|
|
...ensureUserLevelWhere,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async upsertManyForEventTypeIds({
|
|
data,
|
|
eventTypeIds,
|
|
}: {
|
|
data: Prisma.SelectedCalendarUncheckedCreateInput;
|
|
eventTypeIds: SelectedCalendarEventTypeIds;
|
|
}) {
|
|
const userId = data.userId;
|
|
return await Promise.all(
|
|
eventTypeIds.map((eventTypeId) =>
|
|
SelectedCalendarRepository.upsert({
|
|
...data,
|
|
eventTypeId,
|
|
userId,
|
|
integration: data.integration,
|
|
externalId: data.externalId,
|
|
credentialId: data.credentialId,
|
|
})
|
|
)
|
|
);
|
|
}
|
|
static async updateById(id: string, data: Prisma.SelectedCalendarUpdateInput) {
|
|
return await prisma.selectedCalendar.update({
|
|
where: { id },
|
|
data,
|
|
});
|
|
}
|
|
|
|
static async updateManyByCredentialId(credentialId: number, data: Prisma.SelectedCalendarUpdateInput) {
|
|
return await prisma.selectedCalendar.updateMany({
|
|
where: { credentialId },
|
|
data,
|
|
});
|
|
}
|
|
|
|
static async setErrorInWatching({ id, error }: { id: string; error: string }) {
|
|
await SelectedCalendarRepository.updateById(id, {
|
|
error,
|
|
lastErrorAt: new Date(),
|
|
watchAttempts: { increment: 1 },
|
|
});
|
|
}
|
|
|
|
static async setErrorInUnwatching({ id, error }: { id: string; error: string }) {
|
|
await SelectedCalendarRepository.updateById(id, {
|
|
error,
|
|
lastErrorAt: new Date(),
|
|
unwatchAttempts: { increment: 1 },
|
|
});
|
|
}
|
|
|
|
static async removeWatchingError({ id }: { id: string }) {
|
|
await SelectedCalendarRepository.updateById(id, {
|
|
error: null,
|
|
lastErrorAt: null,
|
|
watchAttempts: 0,
|
|
});
|
|
}
|
|
|
|
static async removeUnwatchingError({ id }: { id: string }) {
|
|
await SelectedCalendarRepository.updateById(id, {
|
|
error: null,
|
|
lastErrorAt: null,
|
|
unwatchAttempts: 0,
|
|
});
|
|
}
|
|
}
|