refactor: decouple @calcom/prisma from @calcom/features, @calcom/ee, and @calcom/lib (calcom#24802)

volnei · devin-ai-integration[bot] · web-flow · commit c6ad767565b7 · 2025-11-04T06:51:13.000-03:00
* refactor: decouple @calcom/prisma from @calcom/features, @calcom/ee, and @calcom/lib

- Inline helper functions in zod-utils.ts (emailSchema, slugify, getValidRhfFieldName, isPasswordValid, intervalLimitsType, zodAttributesQueryValue)
- Update schema.prisma @zod.import comments to reference zod-utils instead of @calcom/lib
- Inline idempotency key generation in booking-idempotency-key extension using uuid v5
- Move usage-tracking extension to @calcom/ee/prisma-extensions/
- Remove usage-tracking extension from packages/prisma/index.ts
- Move Prisma DI module from @calcom/prisma to @calcom/features/di/modules/Prisma.ts
- Update 20 import paths in @calcom/features to use new Prisma DI module
- Remove @calcom/lib dependency from @calcom/prisma package.json
- Add uuid dependency to @calcom/prisma package.json

This reduces the dependency footprint of @calcom/prisma and breaks circular dependencies between packages.

Co-Authored-By: Volnei Munhoz &lt;volnei.munhoz@gmail.com&gt;

* feat: add EE-specific Prisma DI module with usage tracking

Create packages/ee/di/modules/PrismaEE.ts to apply the usage-tracking extension in EE contexts. This module:
- Imports the base prisma client from @calcom/prisma
- Applies the usageTrackingExtention from @calcom/ee/prisma-extensions/usage-tracking
- Exports the same DI tokens as the base Prisma module for override in EE containers

This ensures usage tracking functionality is preserved in EE builds while keeping the base @calcom/prisma package free of EE dependencies.

Note: EE containers should load this module after the base Prisma module to override the bindings.
Co-Authored-By: Volnei Munhoz &lt;volnei.munhoz@gmail.com&gt;

---------

Co-authored-by: Devin AI &lt;158243242+devin-ai-integration[bot]@users.noreply.github.com&gt;
diff --git a/packages/ee/di/modules/PrismaEE.ts b/packages/ee/di/modules/PrismaEE.ts
@@ -0,0 +1,23 @@
+import { type Container, createModule } from "@calcom/features/di/di";
+import { DI_TOKENS } from "@calcom/features/di/tokens";
+import { prisma, readonlyPrisma } from "@calcom/prisma";
+
+import { usageTrackingExtention } from "../../prisma-extensions/usage-tracking";
+
+export const prismaEEModule = createModule();
+const token = DI_TOKENS.PRISMA_CLIENT;
+const readOnlyToken = DI_TOKENS.READ_ONLY_PRISMA_CLIENT;
+const moduleToken = DI_TOKENS.PRISMA_MODULE;
+
+const prismaWithUsageTracking = prisma.$extends(usageTrackingExtention(prisma));
+
+prismaEEModule.bind(token).toFactory(() => prismaWithUsageTracking, "singleton");
+prismaEEModule.bind(readOnlyToken).toFactory(() => readonlyPrisma, "singleton");
+
+export const moduleLoader = {
+  token,
+  readOnlyToken,
+  loadModule: (container: Container) => {
+    container.load(moduleToken, prismaEEModule);
+  },
+};
diff --git a/packages/ee/prisma-extensions/usage-tracking.ts b/packages/ee/prisma-extensions/usage-tracking.ts
diff --git a/packages/features/bookings/di/BookingCancelService.module.ts b/packages/features/bookings/di/BookingCancelService.module.ts
@@ -1,7 +1,7 @@
 import { BookingCancelService } from "@calcom/features/bookings/lib/handleCancelBooking";
 import { bindModuleToClassOnToken, createModule } from "@calcom/lib/di/di";
 import { DI_TOKENS } from "@calcom/lib/di/tokens";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 const thisModule = createModule();
 const token = DI_TOKENS.BOOKING_CANCEL_SERVICE;
diff --git a/packages/features/bookings/di/InstantBookingCreateService.module.ts b/packages/features/bookings/di/InstantBookingCreateService.module.ts
@@ -1,7 +1,7 @@
 import { InstantBookingCreateService } from "@calcom/features/bookings/lib/service/InstantBookingCreateService";
 import { createModule, bindModuleToClassOnToken } from "@calcom/features/di/di";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 export const instantBookingCreateServiceModule = createModule();
 const token = DI_TOKENS.INSTANT_BOOKING_CREATE_SERVICE;
diff --git a/packages/features/bookings/di/RegularBookingService.module.ts b/packages/features/bookings/di/RegularBookingService.module.ts
@@ -7,7 +7,7 @@ import { moduleLoader as luckyUserServiceModuleLoader } from "@calcom/features/d
 import { moduleLoader as userRepositoryModuleLoader } from "@calcom/features/di/modules/User";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { moduleLoader as hashedLinkServiceModuleLoader } from "@calcom/features/hashedLink/di/HashedLinkService.module";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 const thisModule = createModule();
 const token = DI_TOKENS.REGULAR_BOOKING_SERVICE;
diff --git a/packages/features/di/containers/AvailableSlots.ts b/packages/features/di/containers/AvailableSlots.ts
@@ -1,6 +1,6 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { redisModule } from "@calcom/features/redis/di/redisModule";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 import type { AvailableSlotsService } from "@calcom/trpc/server/routers/viewer/slots/util";
 import { membershipRepositoryModule } from "@calcom/features/users/di/MembershipRepository.module";
 import { createContainer } from "../di";
diff --git a/packages/features/di/containers/BookingLimits.ts b/packages/features/di/containers/BookingLimits.ts
@@ -1,6 +1,6 @@
 import type { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 
 import type { CheckBookingAndDurationLimitsService } from "../../bookings/lib/handleNewBooking/checkBookingAndDurationLimits";
 import { createContainer } from "../di";
diff --git a/packages/features/di/containers/BusyTimes.ts b/packages/features/di/containers/BusyTimes.ts
@@ -1,6 +1,6 @@
 import type { BusyTimesService } from "@calcom/features/busyTimes/services/getBusyTimes";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 
 import { createContainer } from "../di";
 import { bookingRepositoryModule } from "../modules/Booking";
diff --git a/packages/features/di/containers/Cache.ts b/packages/features/di/containers/Cache.ts
@@ -1,5 +1,5 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 
 import type { CacheService } from "../../../features/calendar-cache/lib/getShouldServeCache";
 import { createContainer } from "../di";
diff --git a/packages/features/di/containers/FilterHosts.ts b/packages/features/di/containers/FilterHosts.ts
@@ -1,6 +1,6 @@
 import type { FilterHostsService } from "@calcom/features/bookings/lib/host-filtering/filterHostsBySameRoundRobinHost";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 
 import { createContainer } from "../di";
 import { bookingRepositoryModule } from "../modules/Booking";
diff --git a/packages/features/di/containers/GetUserAvailability.ts b/packages/features/di/containers/GetUserAvailability.ts
@@ -1,7 +1,7 @@
 import type { UserAvailabilityService } from "@calcom/features/availability/lib/getUserAvailability";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { redisModule } from "@calcom/features/redis/di/redisModule";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 
 import { createContainer } from "../di";
 import { bookingRepositoryModule } from "../modules/Booking";
diff --git a/packages/features/di/containers/InsightsBooking.ts b/packages/features/di/containers/InsightsBooking.ts
@@ -5,7 +5,7 @@ import type {
   InsightsBookingBaseService,
 } from "@calcom/features/insights/services/InsightsBookingBaseService";
 import type { InsightsBookingService } from "@calcom/features/insights/services/InsightsBookingDIService";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 
 import { createContainer } from "../di";
 import { insightsBookingModule } from "../modules/InsightsBooking";
diff --git a/packages/features/di/containers/InsightsRouting.ts b/packages/features/di/containers/InsightsRouting.ts
@@ -5,7 +5,7 @@ import type {
   InsightsRoutingBaseService,
 } from "@calcom/features/insights/services/InsightsRoutingBaseService";
 import type { InsightsRoutingService } from "@calcom/features/insights/services/InsightsRoutingDIService";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 
 import { createContainer } from "../di";
 import { insightsRoutingModule } from "../modules/InsightsRouting";
diff --git a/packages/features/di/containers/NoSlotsNotification.ts b/packages/features/di/containers/NoSlotsNotification.ts
@@ -1,7 +1,7 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { redisModule } from "@calcom/features/redis/di/redisModule";
 import { membershipRepositoryModule } from "@calcom/features/users/di/MembershipRepository.module";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 import type { NoSlotsNotificationService } from "@calcom/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots";
 
 import { createContainer } from "../di";
diff --git a/packages/features/di/containers/QualifiedHosts.ts b/packages/features/di/containers/QualifiedHosts.ts
@@ -1,6 +1,6 @@
 import type { QualifiedHostsService } from "@calcom/features/bookings/lib/host-filtering/findQualifiedHostsWithDelegationCredentials";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { prismaModule } from "@calcom/prisma/prisma.module";
+import { prismaModule } from "@calcom/features/di/modules/Prisma";
 
 import { createContainer } from "../di";
 import { bookingRepositoryModule } from "../modules/Booking";
diff --git a/packages/features/di/modules/Attribute.ts b/packages/features/di/modules/Attribute.ts
@@ -1,6 +1,6 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 import { createModule, bindModuleToClassOnToken, type ModuleLoader } from "../di";
 
diff --git a/packages/features/di/modules/Host.ts b/packages/features/di/modules/Host.ts
@@ -1,6 +1,6 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { HostRepository } from "@calcom/lib/server/repository/host";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 import { createModule, bindModuleToClassOnToken, type ModuleLoader } from "../di";
 
diff --git a/packages/features/di/modules/Ooo.ts b/packages/features/di/modules/Ooo.ts
@@ -1,6 +1,6 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { PrismaOOORepository } from "@calcom/lib/server/repository/ooo";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 import { createModule, bindModuleToClassOnToken, type ModuleLoader } from "../di";
 
diff --git a/packages/features/di/modules/Prisma.ts b/packages/features/di/modules/Prisma.ts
@@ -1,7 +1,6 @@
 import { type Container, createModule } from "@calcom/features/di/di";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-
-import { prisma, readonlyPrisma } from "./index";
+import { prisma, readonlyPrisma } from "@calcom/prisma";
 
 export const prismaModule = createModule();
 const token = DI_TOKENS.PRISMA_CLIENT;
diff --git a/packages/features/di/modules/User.ts b/packages/features/di/modules/User.ts
@@ -1,6 +1,6 @@
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 import { createModule, bindModuleToClassOnToken, type ModuleLoader } from "../di";
 
diff --git a/packages/features/di/watchlist/containers/watchlist.ts b/packages/features/di/watchlist/containers/watchlist.ts
@@ -13,7 +13,7 @@ import type { GlobalBlockingService } from "@calcom/features/watchlist/lib/servi
 import type { OrganizationBlockingService } from "@calcom/features/watchlist/lib/service/OrganizationBlockingService";
 import type { WatchlistAuditService } from "@calcom/features/watchlist/lib/service/WatchlistAuditService";
 import type { WatchlistService } from "@calcom/features/watchlist/lib/service/WatchlistService";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 import { WATCHLIST_DI_TOKENS } from "../Watchlist.tokens";
 import { watchlistModule } from "../modules/Watchlist.module";
diff --git a/packages/features/hashedLink/di/HashedLinkRepository.module.ts b/packages/features/hashedLink/di/HashedLinkRepository.module.ts
@@ -1,6 +1,6 @@
 import { bindModuleToClassOnToken, createModule, type ModuleLoader } from "@calcom/features/di/di";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 import { HashedLinkRepository } from "../lib/repository/HashedLinkRepository";
 
diff --git a/packages/features/users/di/MembershipRepository.module.ts b/packages/features/users/di/MembershipRepository.module.ts
@@ -1,7 +1,7 @@
 import { bindModuleToClassOnToken, createModule, type ModuleLoader } from "@calcom/features/di/di";
 import { DI_TOKENS } from "@calcom/features/di/tokens";
 import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
-import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module";
+import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
 
 export const membershipRepositoryModule = createModule();
 const token = DI_TOKENS.MEMBERSHIP_REPOSITORY;
diff --git a/packages/prisma/extensions/booking-idempotency-key.ts b/packages/prisma/extensions/booking-idempotency-key.ts
@@ -1,14 +1,32 @@
-import { IdempotencyKeyService } from "@calcom/lib/idempotencyKey/idempotencyKeyService";
+import { v5 as uuidv5 } from "uuid";
+
 import { Prisma } from "@calcom/prisma/client";
 import { BookingStatus } from "@calcom/prisma/enums";
 
+function generateIdempotencyKey({
+  startTime,
+  endTime,
+  userId,
+  reassignedById,
+}: {
+  startTime: Date | string;
+  endTime: Date | string;
+  userId?: number;
+  reassignedById?: number | null;
+}) {
+  return uuidv5(
+    `${startTime.valueOf()}.${endTime.valueOf()}.${userId}${reassignedById ? `.${reassignedById}` : ""}`,
+    uuidv5.URL
+  );
+}
+
 export function bookingIdempotencyKeyExtension() {
   return Prisma.defineExtension({
     query: {
       booking: {
         async create({ args, query }) {
           if (args.data.status === BookingStatus.ACCEPTED) {
-            const idempotencyKey = IdempotencyKeyService.generate({
+            const idempotencyKey = generateIdempotencyKey({
               startTime: args.data.startTime,
               endTime: args.data.endTime,
               userId: args.data.user?.connect?.id,
diff --git a/packages/prisma/index.ts b/packages/prisma/index.ts
@@ -5,7 +5,6 @@ import { bookingIdempotencyKeyExtension } from "./extensions/booking-idempotency
 import { disallowUndefinedDeleteUpdateManyExtension } from "./extensions/disallow-undefined-delete-update-many";
 import { excludeLockedUsersExtension } from "./extensions/exclude-locked-users";
 import { excludePendingPaymentsExtension } from "./extensions/exclude-pending-payment-teams";
-import { usageTrackingExtention } from "./extensions/usage-tracking";
 import { PrismaClient, type Prisma } from "./generated/prisma/client";
 
 const connectionString = process.env.DATABASE_URL || "";
@@ -66,7 +65,6 @@ export const customPrisma = (options?: Prisma.PrismaClientOptions) => {
   }
 
   return new PrismaClient(finalOptions)
-    .$extends(usageTrackingExtention(baseClient))
     .$extends(excludeLockedUsersExtension())
     .$extends(excludePendingPaymentsExtension())
     .$extends(bookingIdempotencyKeyExtension())
@@ -79,7 +77,6 @@ export const customPrisma = (options?: Prisma.PrismaClientOptions) => {
 // Explanation why we cast as PrismaClient. When we leave Prisma to its devices it tries to infer logic based on the extensions, but this is not a simple extends.
 // this makes the PrismaClient export type-hint impossible and it also is a massive hit on Prisma type hinting performance.
 export const prisma: PrismaClient = baseClient
-  .$extends(usageTrackingExtention(baseClient))
   .$extends(excludeLockedUsersExtension())
   .$extends(excludePendingPaymentsExtension())
   .$extends(bookingIdempotencyKeyExtension())
diff --git a/packages/prisma/package.json b/packages/prisma/package.json
@@ -23,14 +23,14 @@
     "seed-pbac": "ts-node --transpile-only ../../scripts/seed-pbac-organization.ts"
   },
   "dependencies": {
-    "@calcom/lib": "workspace:*",
     "@prisma/adapter-pg": "^6.16.0",
     "@prisma/client": "^6.16.0",
     "@prisma/extension-accelerate": "^1.3.0",
     "@prisma/generator-helper": "^6.16.0",
     "prisma": "^6.16.0",
     "prisma-kysely": "2.2.0",
     "ts-node": "^10.9.1",
+    "uuid": "^8.3.2",
     "zod": "^3.22.4",
     "zod-prisma-types": "^3.2.4"
   },
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
@@ -223,7 +223,7 @@ model EventType {
   hideOrganizerEmail                       Boolean                   @default(false)
   maxActiveBookingsPerBooker               Int?
   maxActiveBookingPerBookerOfferReschedule Boolean                   @default(false)
-  /// @zod.import(["import { emailSchema } from '@calcom/lib/emailSchema'"]).custom.use(emailSchema)
+  /// @zod.import(["import { emailSchema } from '../../zod-utils'"]).custom.use(emailSchema)
   customReplyToEmail                       String?
   calVideoSettings                         CalVideoSettings?
 
@@ -300,7 +300,7 @@ model DestinationCalendar {
   id                               Int                   @id @default(autoincrement())
   integration                      String
   externalId                       String
-  /// @zod.import(["import { emailSchema } from '@calcom/lib/emailSchema'"]).custom.use(emailSchema)
+  /// @zod.import(["import { emailSchema } from '../../zod-utils'"]).custom.use(emailSchema)
   primaryEmail                     String?
   user                             User?                 @relation(fields: [userId], references: [id], onDelete: Cascade)
   userId                           Int?                  @unique
@@ -352,7 +352,7 @@ model User {
   uuid                String               @unique @default(uuid()) @db.Uuid
   username            String?
   name                String?
-  /// @zod.import(["import { emailSchema } from '@calcom/lib/emailSchema'"]).custom.use(emailSchema)
+  /// @zod.import(["import { emailSchema } from '../../zod-utils'"]).custom.use(emailSchema)
   email               String
   emailVerified       DateTime?
   password            UserPassword?
@@ -796,7 +796,7 @@ model Booking {
   user                         User?                             @relation(fields: [userId], references: [id], onDelete: Cascade)
   userId                       Int?
   // User's email at the time of booking
-  /// @zod.import(["import { emailSchema } from '@calcom/lib/emailSchema'"]).custom.use(emailSchema)
+  /// @zod.import(["import { emailSchema } from '../../zod-utils'"]).custom.use(emailSchema)
   userPrimaryEmail             String?
   references                   BookingReference[]
   eventType                    EventType?                        @relation(fields: [eventTypeId], references: [id])
@@ -842,9 +842,9 @@ model Booking {
   noShowHost                   Boolean?                          @default(false)
   scheduledTriggers            WebhookScheduledTriggers[]
   oneTimePassword              String?                           @unique @default(uuid())
-  /// @zod.import(["import { emailSchema } from '@calcom/lib/emailSchema'"]).custom.use(emailSchema)
+  /// @zod.import(["import { emailSchema } from '../../zod-utils'"]).custom.use(emailSchema)
   cancelledBy                  String?
-  /// @zod.import(["import { emailSchema } from '@calcom/lib/emailSchema'"]).custom.use(emailSchema)
+  /// @zod.import(["import { emailSchema } from '../../zod-utils'"]).custom.use(emailSchema)
   rescheduledBy                String?
   // Ah, made a typo here. Should have been routedFromRoutingFormRe"s"ponse. Live with it :(
   routedFromRoutingFormReponse App_RoutingForms_FormResponse?
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
