* 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>
189 lines
6.9 KiB
TypeScript
189 lines
6.9 KiB
TypeScript
import { uniqueBy } from "@calcom/lib/array";
|
|
import { isInMemoryDelegationCredential } from "@calcom/lib/delegationCredential/clientAndServer";
|
|
import logger from "@calcom/lib/logger";
|
|
import { safeStringify } from "@calcom/lib/safeStringify";
|
|
import prisma from "@calcom/prisma";
|
|
import type { Prisma } from "@calcom/prisma/client";
|
|
import type { Calendar, SelectedCalendarEventTypeIds } from "@calcom/types/Calendar";
|
|
|
|
import type { ICalendarCacheRepository } from "./calendar-cache.repository.interface";
|
|
|
|
const log = logger.getSubLogger({ prefix: ["CalendarCacheRepository"] });
|
|
|
|
const MS_PER_DAY = 24 * 60 * 60 * 1000;
|
|
const ONE_MONTH_IN_MS = 30 * MS_PER_DAY;
|
|
const CACHING_TIME = ONE_MONTH_IN_MS;
|
|
|
|
function parseKeyForCache(args: FreeBusyArgs): string {
|
|
// Ensure that calendarIds are unique
|
|
const uniqueItems = uniqueBy(args.items, ["id"]);
|
|
const key = JSON.stringify({
|
|
timeMin: args.timeMin,
|
|
timeMax: args.timeMax,
|
|
items: uniqueItems,
|
|
});
|
|
return key;
|
|
}
|
|
|
|
type FreeBusyArgs = { timeMin: string; timeMax: string; items: { id: string }[] };
|
|
|
|
/**
|
|
* It means that caller can only work with DB Credentials
|
|
* In-memory delegation credentials aren't supported here. Delegation User Credentials, that are in DB and have credential.delegationCredential relation can be used though
|
|
*/
|
|
function assertCalendarHasDbCredential(calendar: Calendar | null) {
|
|
if (!calendar?.getCredentialId) {
|
|
return;
|
|
}
|
|
const credentialId = calendar.getCredentialId();
|
|
if (credentialId < 0) {
|
|
throw new Error(`Received invalid credentialId ${credentialId}`);
|
|
}
|
|
}
|
|
/**
|
|
* It means that caller can work with in-memory credential
|
|
*/
|
|
function declareCanWorkWithInMemoryCredential() {
|
|
// No assertion required here, it is for readability who reads the caller's code
|
|
}
|
|
|
|
export class CalendarCacheRepository implements ICalendarCacheRepository {
|
|
calendar: Calendar | null;
|
|
constructor(calendar: Calendar | null = null) {
|
|
this.calendar = calendar;
|
|
}
|
|
async watchCalendar(args: { calendarId: string; eventTypeIds: SelectedCalendarEventTypeIds }) {
|
|
assertCalendarHasDbCredential(this.calendar);
|
|
const { calendarId, eventTypeIds } = args;
|
|
if (typeof this.calendar?.watchCalendar !== "function") {
|
|
log.info(
|
|
'[handleWatchCalendar] Skipping watching calendar due to calendar not having "watchCalendar" method'
|
|
);
|
|
return;
|
|
}
|
|
await this.calendar?.watchCalendar({ calendarId, eventTypeIds });
|
|
}
|
|
|
|
async unwatchCalendar(args: { calendarId: string; eventTypeIds: SelectedCalendarEventTypeIds }) {
|
|
assertCalendarHasDbCredential(this.calendar);
|
|
const { calendarId, eventTypeIds } = args;
|
|
if (typeof this.calendar?.unwatchCalendar !== "function") {
|
|
log.info(
|
|
'[unwatchCalendar] Skipping unwatching calendar due to calendar not having "unwatchCalendar" method'
|
|
);
|
|
return;
|
|
}
|
|
const response = await this.calendar?.unwatchCalendar({ calendarId, eventTypeIds });
|
|
return response;
|
|
}
|
|
|
|
async getCachedAvailability({
|
|
credentialId,
|
|
userId,
|
|
args,
|
|
}: {
|
|
credentialId: number;
|
|
userId: number | null;
|
|
args: FreeBusyArgs;
|
|
}) {
|
|
declareCanWorkWithInMemoryCredential();
|
|
log.debug("Getting cached availability", safeStringify({ credentialId, userId, args }));
|
|
const key = parseKeyForCache(args);
|
|
let cached;
|
|
let usedInMemoryDelegationCredential = false;
|
|
if (isInMemoryDelegationCredential({ credentialId })) {
|
|
usedInMemoryDelegationCredential = true;
|
|
if (!userId) {
|
|
log.warn("userId is not available when querying cache for in-memory delegation credential");
|
|
return null;
|
|
}
|
|
// We don't have credentialId available when querying the cache, as we use in-memory delegation credentials for this which don't have valid credentialId
|
|
// Also, we would prefer to reuse the existing calendar-cache(connected to regular credentials) when enabling delegation credentials, for which we can't use credentialId in querying as that is not in DB
|
|
// Security/Privacy wise, it is fine to query solely based on userId as userId and key(which has external email Ids in there) together can be used to uniquely identify the cache
|
|
// A user could have multiple third party calendars connected, but they key would still be different for each case in calendar-cache because of the presence of emails in there.
|
|
// Sample key: {"timeMin":"2025-04-01T00:00:00.000Z","timeMax":"2025-08-01T00:00:00.000Z","items":[{"id":"owner@example.com"}]} <- Notice it has emailId in there for which busytimes are fetched, we could assume that these emailIds would be unique across different calendars like Google/Outlook
|
|
cached = await prisma.calendarCache.findFirst({
|
|
// We have index on userId and key, so this should be fast
|
|
// TODO: Should we consider index on all three - userId, key and expiresAt?
|
|
where: {
|
|
userId,
|
|
key,
|
|
expiresAt: { gte: new Date(Date.now()) },
|
|
},
|
|
orderBy: {
|
|
// In case of multiple entries for same key and userId, we prefer the one with highest expiry, which will be the most updated one
|
|
// TODO: For better tracking we could also want to use updatedAt directly which doesn't exist yet in CalendarCache table
|
|
expiresAt: "desc",
|
|
},
|
|
});
|
|
} else {
|
|
cached = await prisma.calendarCache.findUnique({
|
|
where: {
|
|
credentialId_key: {
|
|
credentialId,
|
|
key,
|
|
},
|
|
expiresAt: { gte: new Date(Date.now()) },
|
|
},
|
|
});
|
|
}
|
|
log.info(
|
|
"Got cached availability",
|
|
safeStringify({ key, cached, credentialId, usedInMemoryDelegationCredential })
|
|
);
|
|
return cached;
|
|
}
|
|
async upsertCachedAvailability({
|
|
credentialId,
|
|
userId,
|
|
args,
|
|
value,
|
|
}: {
|
|
credentialId: number;
|
|
userId: number | null;
|
|
args: FreeBusyArgs;
|
|
value: Prisma.JsonNullValueInput | Prisma.InputJsonValue;
|
|
}) {
|
|
assertCalendarHasDbCredential(this.calendar);
|
|
const key = parseKeyForCache(args);
|
|
await prisma.calendarCache.upsert({
|
|
where: {
|
|
credentialId_key: {
|
|
credentialId,
|
|
key,
|
|
},
|
|
},
|
|
update: {
|
|
// Ensure that on update userId is also set(It handles the case where userId is not set for legacy records)
|
|
userId,
|
|
value,
|
|
expiresAt: new Date(Date.now() + CACHING_TIME),
|
|
},
|
|
create: {
|
|
value,
|
|
credentialId,
|
|
userId,
|
|
key,
|
|
expiresAt: new Date(Date.now() + CACHING_TIME),
|
|
},
|
|
});
|
|
}
|
|
|
|
async getCacheStatusByCredentialIds(credentialIds: number[]) {
|
|
const cacheStatuses = await prisma.calendarCache.groupBy({
|
|
by: ["credentialId"],
|
|
where: {
|
|
credentialId: { in: credentialIds },
|
|
},
|
|
_max: {
|
|
updatedAt: true,
|
|
},
|
|
});
|
|
|
|
return cacheStatuses.map((cache) => ({
|
|
credentialId: cache.credentialId,
|
|
updatedAt: cache._max.updatedAt,
|
|
}));
|
|
}
|
|
}
|