feat: upgrade Prisma to 6.16.0 with no-rust engine (#23816)

* feat: upgrade Prisma to 6.16.0 with no-rust engine - Update Prisma packages to 6.16.0 - Add PostgreSQL adapter dependency - Configure engineType: 'client' and provider: 'prisma-client' in schema - Update Prisma client instantiation with PostgreSQL adapter - Remove binaryTargets from generators (not needed with library engine) - Fix schema view issue by removing @id decorator from BookingTimeStatusDenormalized - Fix ESLint warning by removing non-null assertion Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Web app running but types wrecked * web app running but build and type issues * Removed the connection pool * Fixed zod type issue * Fixed types in booking reference extension * Fixed test issues * Type checks passing it seems * Using cjs as moduleFormat * Fixing Prisma undefined * fix: update prismock initialization for Prisma 6.16 compatibility - Add @prisma/internals dependency for getDMMF() - Restructure prismock initialization to use createPrismock() with DMMF - Create Proxy that's returned from mock factory for proper spy support - Fixes 89 failing unit tests with 'Cannot read properties of undefined (reading datamodel)' error - Based on workaround from prismock issue #1482 All unit tests now pass (375 test files, 3323 tests passed) Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: cast serviceAccountKey to Prisma.InputJsonValue in bookingScenario.ts - Apply type cast at lines 2493 and 2535 - Fixes type errors from Prisma 6.16 upgrade - Follows established pattern from delegationCredential.ts - Add eslint-disable for pre-existing any types - Rename unused appStoreLookupKey parameter to satisfy lint - All 3323 tests passing Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * chore: remove whitespace-only lines from bookingScenario.ts - Remove blank lines where eslint-disable comments were replaced - Cleanup from pre-commit hook formatting Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Update is-prisma-available-check.ts * fix: remove datasources config when using Prisma Driver Adapters - Update customPrisma to create new adapter when datasources URL is provided - Remove datasources config from API v2 Prisma services (already in adapter) - Fixes 'Custom datasource configuration is not compatible with Prisma Driver Adapters' error Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: use Pool instances for PrismaPg adapters in index.ts - Create Pool instance before passing to PrismaPg adapter - Update customPrisma to create Pool for custom connection strings - Matches working pattern from API v2 services - Fixes 'Invalid `prisma.$queryRawUnsafe()` invocation' error Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Not using queryRawUnsafe * Trying anything at this point * Make sure the DB is ready first * Don't auto run migrations in CI mode * Revert "Make sure the DB is ready first" This reverts commit 2b20bd45c974f3d7e07d8b904bc7fcdae37cce03. * Dynamic import of prisma * Commenting where it seems to break * Backwards compatability for API v2 * fix: add explicit type annotations for map callbacks in API v2 - Add type annotation for map parameter in memberships.repository.ts - Add type annotation for map parameter in stripe.service.ts - Fixes implicit 'any' type errors from stricter Prisma 6.16.0 type inference Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add explicit type annotations for API v2 map callbacks - users.repository.ts:292: add Profile & { user: User } type - memberships.service.ts:19-20: add Membership type to filter callbacks Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add explicit type annotation for attributeToUser in organizations-users.repository.ts - organizations-users.repository.ts:63: add AttributeToUser with nested relations type Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add explicit Membership type annotations in teams.repository.ts Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: use API v2 dedicated Prisma client to support adapter in PrismaClientOptions Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Running API v2 build commands together so they all get the space size var * Fixing Maximum call depth exceeded error * fixed type issues * Trying to make the seed more stable * Revert "Trying to make the seed more stable" This reverts commit 1fd4495e6af7acd7981cda7dedec3168979b0e9d. * Fixed path to prisma client * Fixed type check * Fix eslint warnings * fix: externalize @prisma/adapter-pg and pg in platform-libraries Vite config - Add @prisma/adapter-pg and pg to external dependencies list - Add corresponding globals for these packages - Fix Prisma client aliases to point to packages/prisma/client instead of node_modules - Add Node.js resolve conditions to prefer Node.js exports - Keep commonjsOptions.include for proper CommonJS transformation - Add eslint-disable for __dirname in Vite config file - Remove problematic prettier/prettier eslint comment This fixes the 'Extensions.defineExtension is unable to run in this browser environment' error when running yarn generate-swagger in apps/api/v2 after upgrading to Prisma v6.16 with the no-rust engine approach. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update Prisma imports in API v2 services to use package path - Change imports from '../../../generated/prisma/client' to '@calcom/prisma/client' - Fixes CI error: Cannot find module '../../../../../packages/prisma/generated/prisma/client.ts' - Aligns with backwards compatibility re-export structure after Prisma v6.16 upgrade Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: remove .ts extension from Prisma client path mapping in tsconfig - Remove file extension from @calcom/prisma/client path mapping - Fixes runtime error: Cannot find module '../../../../../packages/prisma/generated/prisma/client.ts' - TypeScript path mappings should not include file extensions per best practices - Allows Node.js to correctly resolve to .js files at runtime Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: resolve Prisma 6.16.0 type incompatibilities in bookingScenario tests - Changed InputPayment.data type from PaymentData to Prisma.InputJsonValue - Changed createCredentials key parameter from JsonValue to InputJsonValue - Removed unused PaymentData type definition - Resolves type errors at lines 709 and 1088 without using 'as any' casts Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: remove non-existent Watchlist fields from test fixtures - Remove createdById from isLockedOrBlocked.test.ts (lines 15, 20) - Remove severity and createdById from _post.test.ts (line 110) - These fields don't exist in Watchlist model schema after Prisma 6.16.0 upgrade - Resolves TS2353 errors without using 'as any' casts Relates to PR #23816 Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: api v2 imports generated prisma and platform libraries * fix: resolve type errors from Prisma 6.16 upgrade - Add missing markdownToSafeHTML import in AppCard.tsx - Fix organizationId null handling in fresh-booking.test.ts - Remove non-existent createdById field from Watchlist test utils Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Put back some external rollups * Added back the resolve conditions * Stop using Pool directly * chore: remove prisma bookingReferenceExtension and update calls * fix: organizations-admin-not-team-member-event-types.e2e-spec.ts * chore: bring back POOL in api v2 prisma clients * chore: remove Pool but await connect * fixup! chore: remove Pool but await connect * chore: bring back Pool on all clients * chore: end pool manually * chore: test with pool max 1 * chore: e2e test prisma max pool of 1 connection * chore: give more control over pool for prisma module with env * remove pool from base prisma client * chore: prisma client in libraries use pool * Fixed types * chore: log pool events and improve pooling * Fixing some types and tests * Changing the parsing of USE_POOL * fix: ensure Prisma client is connected before seeding to prevent transaction errors Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * chore: adjust pools * chore: add process.env.USE_POOL to libraries vite config * fix: v1 _patch reference check bookingRef on the booking find * fix: v1 get references deleted null for system admin * test: add integration tests for bookingReference soft-delete behavior - Add bookingReference.integration-test.ts to test repository methods - Add handleDeleteCredential.integration-test.ts to test credential deletion cascade - Add booking-references.integration-test.ts for API v1 integration tests - All tests verify soft-delete behavior without using mocks - Tests use real database operations to ensure soft-deleted records persist - Cover scenarios: replacing references, credential deletion, querying with filters Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor: convert booking-references test to actual API endpoint testing - Modified _get.ts to export handler function for testing - Refactored integration test to call API handler instead of directly testing Prisma - Added timestamps to test data to avoid conflicts - Tests now verify API layer correctly filters soft-deleted references - All 4 tests passing Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add explicit prisma.$connect() call to seed-insights script With Prisma 6.16 and the PostgreSQL adapter, scripts need to explicitly call $connect() before running database operations to ensure the connection pool is properly initialized. This prevents 'Transaction already closed' errors. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add $connect() to main() execution in seed-insights Both main() and createPerformanceData() entry points need explicit prisma.$connect() calls with the Prisma 6.16 PostgreSQL adapter. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: always use connection pool for Prisma PostgreSQL adapter Enable connection pooling by default for the Prisma adapter to prevent transaction state issues during seed operations. Without a pool, each operation creates a new connection which can lead to 'Transaction already closed' errors during heavy database operations like seeding. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Revert "fix: always use connection pool for Prisma PostgreSQL adapter" This reverts commit 6724bb08e42bc0a94846069de83b04db0aeb8e8b. * fix: enable connection pool for db-seed in cache-db action Set USE_POOL=true when running yarn db-seed to use connection pooling with the Prisma PostgreSQL adapter. This prevents 'Transaction already closed' errors during seeding by maintaining stable database connections. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add safety check for undefined ownerForEvent in seed script Prevent 'Cannot read properties of undefined' error when orgMembersInDBWithProfileId is empty. This can happen if organization members fail to create or when there's a duplicate constraint violation causing early return. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: v1 _patch reference check bookingRef * fix: increase pool size and add timeout settings to prevent transaction errors - Increase max connections from 5 to 10 - Add connectionTimeoutMillis: 30000 (30 seconds) - Add statement_timeout: 60000 (60 seconds) These settings help prevent 'Unknown transaction status' errors during heavy database operations like seeding by giving transactions more time to complete and allowing more concurrent connections. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Revert "fix: increase pool size and add timeout settings to prevent transaction errors" This reverts commit 148264f1f1861dfb09a082937a3e2b49e78fc41a. * fix: remove standalone execution in seed-app-store to prevent premature disconnect The seed-app-store.ts file had a standalone main() call at the bottom that would execute immediately when imported, including a prisma.$disconnect() in its .finally() block. This caused issues because: 1. seed.ts imports and calls mainAppStore() 2. The import triggers the standalone main() execution 3. This standalone execution disconnects prisma after completion 4. seed.ts then tries to call mainHugeEventTypesSeed() but prisma is disconnected 5. This leads to 'Unknown transaction status' errors Fixed by removing the standalone execution since mainAppStore() is already called programmatically from seed.ts which manages the connection lifecycle. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: use require.main check to prevent premature disconnect when imported Added require.main === module check so seed-app-store.ts: - Runs standalone with proper connection management when executed directly via 'yarn seed-app-store' or 'ts-node seed-app-store.ts' - Does NOT run standalone when imported as a module by seed.ts, preventing premature prisma disconnect This fixes 'Unknown transaction status' errors while maintaining backward compatibility for direct execution. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: seed apps before creating users to prevent foreign key constraint violation Reordered seeding operations to call mainAppStore() before main() because: - main() creates users with credentials that reference apps via appId foreign key - mainAppStore() seeds the App table with app records - Apps must exist before credentials can reference them This fixes the 'Foreign key constraint violated on Credential_appId_fkey' error that occurred when creating credentials before the apps they reference existed. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Apply suggestion from @cubic-dev-ai[bot] Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com> * Removing functional changes of deleted: null * Apply suggestion from @keithwillcode * refactor: move seedAppData call to bottom of main() in seed.ts Moved seedAppData() call from seed-app-store.ts to the bottom of main() in seed.ts to ensure the 'pro' user is created before attempting to create routing form data for them. Changes: - Exported seedAppData function from seed-app-store.ts - Removed seedAppData() call from the main() export in seed-app-store.ts - Added seedAppData() call at the bottom of main() in seed.ts - Updated standalone execution in seed-app-store.ts to still call seedAppData() when run directly via 'yarn seed-app-store' This ensures proper ordering: apps seeded → users created → routing form data created for existing users. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor: move routing form seeding from seed-app-store.ts to seed.ts Moved the routing form seeding logic (previously in seedAppData function) from seed-app-store.ts to be inline at the bottom of main() in seed.ts. This ensures the 'pro' user is created before attempting to create routing form data for them. Changes: - Removed seedAppData function and seededForm export from seed-app-store.ts - Removed import of seedAppData from seed.ts - Added routing form seeding logic inline at bottom of main() in seed.ts Seeding order: apps → users (including 'pro') → routing forms Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add deleted: null filter to bookingReference update operations - Add deleted: null filter to API v1 PATCH endpoint to prevent updating soft-deleted booking references - Add deleted: null filter to DailyVideo updateMeetingTokenIfExpired and setEnableRecordingUIAndUserIdForOrganizer - Add comprehensive test coverage for PATCH endpoint soft-delete behavior - Tests verify that soft-deleted booking references cannot be updated - Tests verify that only active booking references can be updated successfully Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * revert: remove deleted: null filters to preserve existing functionality Per @keithwillcode's feedback, reverting the soft-delete filtering changes to preserve existing functionality in this PR. This PR should focus only on the Prisma upgrade itself. - Reverted API v1 PATCH endpoint change - Reverted DailyVideo adapter changes (updateMeetingTokenIfExpired and setEnableRecordingUIAndUserIdForOrganizer) - Removed test file that was added for soft-delete behavior testing Addresses comments: - https://github.com/calcom/cal.com/pull/23816#discussion_r2448854197 - https://github.com/calcom/cal.com/pull/23816#discussion_r2448860594 - https://github.com/calcom/cal.com/pull/23816#discussion_r2448860833 Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * test: restore and update booking reference tests to match existing functionality Updated tests to verify existing behavior where PATCH endpoint can update booking references regardless of their deleted status. This matches the current implementation after reverting the deleted: null filters. Changes: - Restored test file that was previously deleted - Updated PATCH tests to expect successful updates of soft-deleted references - Renamed test suite to 'Existing functionality' to clarify intent - Tests now verify that the PATCH endpoint preserves existing behavior Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * test: rename booking-references test to integration-test The test requires a database connection and should run in the integration test job, not the unit test job. Renamed from .test.ts to .integration-test.ts to match the repository's testing conventions. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
2025-10-21 20:02:03 +01:00
parent e639237088
commit 6923b97cd2
324 changed files with 3221 additions and 1401 deletions
@@ -26,7 +26,7 @@ runs:
      with:
        path: ${{ inputs.path }}
        key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}
-    - run: echo ${{ env.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }} && yarn db-seed
+    - run: USE_POOL=true yarn db-seed
      if: steps.cache-db.outputs.cache-hit != 'true'
      shell: bash
    - name: Postgres Dump Backup
@@ -56,8 +56,8 @@ jobs:
        if: steps.cache-api-v2-build.outputs.cache-hit != 'true'
        run: |
          export NODE_OPTIONS="--max_old_space_size=8192"
-          yarn workspace @calcom/api-v2 run generate-schemas
-          rm -rf apps/api/v2/node_modules
-          yarn install
+          yarn workspace @calcom/api-v2 run generate-schemas &&
+          rm -rf apps/api/v2/node_modules &&
+          yarn install &&
          yarn workspace @calcom/api-v2 run build
        shell: bash
@@ -66,7 +66,8 @@ tsconfig.tsbuildinfo
 .turbo

 # Prisma generated files
-packages/prisma/client/*
+apps/api/v2/generated/prisma/*
+packages/prisma/generated/prisma/*
 packages/prisma/zod/**/*.ts
 packages/prisma/enums

@@ -12,7 +12,7 @@ async function authMiddleware(req: NextApiRequest) {
  if (isSystemWideAdmin) return;
  // Find all references where the user has bookings
  const bookingReference = await prisma.bookingReference.findFirst({
-    where: { id, booking: { userId } },
+    where: { id, booking: { userId }, deleted: null },
  });
  if (!bookingReference) throw new HttpError({ statusCode: 403, message: "Forbidden" });
 }
@@ -37,7 +37,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
 export async function deleteHandler(req: NextApiRequest) {
  const { query } = req;
  const { id } = schemaQueryIdParseInt.parse(query);
-  await prisma.bookingReference.delete({ where: { id } });
+  await prisma.bookingReference.update({ where: { id }, data: { deleted: true } });
  return { message: `BookingReference with id: ${id} deleted` };
 }

@@ -38,7 +38,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
 export async function getHandler(req: NextApiRequest) {
  const { query } = req;
  const { id } = schemaQueryIdParseInt.parse(query);
-  const booking_reference = await prisma.bookingReference.findUniqueOrThrow({ where: { id } });
+  const booking_reference = await prisma.bookingReference.findUniqueOrThrow({ where: { id, deleted: null } });
  return { booking_reference: schemaBookingReferenceReadPublic.parse(booking_reference) };
 }

@@ -29,13 +29,13 @@ import { schemaBookingReferenceReadPublic } from "~/lib/validations/booking-refe
 *       404:
 *         description: No booking references were found
 */
-async function getHandler(req: NextApiRequest) {
+export async function handler(req: NextApiRequest) {
  const { userId, isSystemWideAdmin } = req;
  const args: Prisma.BookingReferenceFindManyArgs = isSystemWideAdmin
-    ? {}
-    : { where: { booking: { userId } } };
+    ? { where: { deleted: null } }
+    : { where: { booking: { userId }, deleted: null } };
  const data = await prisma.bookingReference.findMany(args);
  return { booking_references: data.map((br) => schemaBookingReferenceReadPublic.parse(br)) };
 }

-export default defaultResponder(getHandler);
+export default defaultResponder(handler);
@@ -3,8 +3,8 @@ import utc from "dayjs/plugin/utc";
 import type { NextApiRequest, NextApiResponse } from "next";

 import dayjs from "@calcom/dayjs";
-import { isSupportedTimeZone } from "@calcom/lib/dayjs";
 import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots";
+import { isSupportedTimeZone } from "@calcom/lib/dayjs";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import { createContext } from "@calcom/trpc/server/createContext";
@@ -48,7 +48,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
      : availableSlots.slots;

    return { slots: slotsInProvidedTimeZone };
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+     
  } catch (cause) {
    if (cause instanceof TRPCError) {
      const statusCode = getHTTPStatusCodeFromError(cause);
@@ -0,0 +1,486 @@
+import type { Request, Response } from "express";
+import type { NextApiRequest, NextApiResponse } from "next";
+import { createMocks } from "node-mocks-http";
+import { describe, it, expect, beforeAll, afterAll } from "vitest";
+
+import prisma from "@calcom/prisma";
+import type { Booking, Credential, EventType, User } from "@calcom/prisma/client";
+import { BookingStatus } from "@calcom/prisma/enums";
+
+import { patchHandler } from "../../pages/api/booking-references/[id]/_patch";
+import { handler } from "../../pages/api/booking-references/_get";
+
+type CustomNextApiRequest = NextApiRequest & Request;
+type CustomNextApiResponse = NextApiResponse & Response;
+
+describe("GET /api/booking-references - Soft-delete filtering", () => {
+  let testUser: User;
+  let testCredential: Credential;
+  let testEventType: EventType;
+  let testBooking: Booking;
+  const createdBookingReferenceIds: number[] = [];
+
+  beforeAll(async () => {
+    testUser = await prisma.user.create({
+      data: {
+        email: "api-bookingreference-test@example.com",
+        username: "api-bookingreference-test",
+      },
+    });
+
+    testCredential = await prisma.credential.create({
+      data: {
+        type: "google_calendar",
+        key: {},
+        userId: testUser.id,
+      },
+    });
+
+    testEventType = await prisma.eventType.create({
+      data: {
+        title: "Test Event Type",
+        slug: "api-test-event-type",
+        length: 30,
+        userId: testUser.id,
+      },
+    });
+
+    testBooking = await prisma.booking.create({
+      data: {
+        uid: "api-test-booking-uid",
+        title: "API Test Booking",
+        startTime: new Date(Date.now() + 86400000),
+        endTime: new Date(Date.now() + 90000000),
+        userId: testUser.id,
+        eventTypeId: testEventType.id,
+        status: BookingStatus.ACCEPTED,
+      },
+    });
+  });
+
+  afterAll(async () => {
+    if (createdBookingReferenceIds.length > 0) {
+      await prisma.bookingReference.deleteMany({
+        where: {
+          id: {
+            in: createdBookingReferenceIds,
+          },
+        },
+      });
+    }
+
+    await prisma.booking.delete({
+      where: {
+        id: testBooking.id,
+      },
+    });
+
+    await prisma.eventType.delete({
+      where: {
+        id: testEventType.id,
+      },
+    });
+
+    await prisma.credential.delete({
+      where: {
+        id: testCredential.id,
+      },
+    });
+
+    await prisma.user.delete({
+      where: {
+        id: testUser.id,
+      },
+    });
+  });
+
+  it("should only return active booking references, excluding soft-deleted ones", async () => {
+    const timestamp = Date.now();
+    const activeRef = await prisma.bookingReference.create({
+      data: {
+        type: "google_calendar",
+        uid: `api-active-ref-${timestamp}`,
+        meetingId: `api-active-meeting-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+      },
+    });
+    createdBookingReferenceIds.push(activeRef.id);
+
+    const deletedRef = await prisma.bookingReference.create({
+      data: {
+        type: "google_calendar",
+        uid: `api-deleted-ref-${timestamp}`,
+        meetingId: `api-deleted-meeting-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+        deleted: true,
+      },
+    });
+    createdBookingReferenceIds.push(deletedRef.id);
+
+    const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "GET",
+    });
+
+    req.userId = testUser.id;
+
+    const responseData = await handler(req);
+
+    expect(responseData.booking_references).toBeDefined();
+    expect(Array.isArray(responseData.booking_references)).toBe(true);
+
+    const returnedActiveRef = responseData.booking_references.find(
+      (ref: { id: number }) => ref.id === activeRef.id
+    );
+    const returnedDeletedRef = responseData.booking_references.find(
+      (ref: { id: number }) => ref.id === deletedRef.id
+    );
+
+    expect(returnedActiveRef).toBeDefined();
+    expect(returnedDeletedRef).toBeUndefined();
+  });
+
+  it("should filter booking references by user when not system admin", async () => {
+    const timestamp = Date.now();
+    const otherUser = await prisma.user.create({
+      data: {
+        email: `other-user-bookingreference-${timestamp}@example.com`,
+        username: `other-user-bookingreference-${timestamp}`,
+      },
+    });
+
+    const otherBooking = await prisma.booking.create({
+      data: {
+        uid: `other-user-booking-uid-${timestamp}`,
+        title: "Other User Booking",
+        startTime: new Date(Date.now() + 86400000),
+        endTime: new Date(Date.now() + 90000000),
+        userId: otherUser.id,
+        eventTypeId: testEventType.id,
+        status: BookingStatus.ACCEPTED,
+      },
+    });
+
+    const otherUserRef = await prisma.bookingReference.create({
+      data: {
+        type: "zoom_video",
+        uid: `other-user-ref-${timestamp}`,
+        meetingId: `other-user-meeting-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: otherBooking.id,
+      },
+    });
+    createdBookingReferenceIds.push(otherUserRef.id);
+
+    const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "GET",
+    });
+
+    req.userId = testUser.id;
+
+    const responseData = await handler(req);
+
+    const userRefs = responseData.booking_references.filter(
+      (ref: { id: number }) => ref.id === otherUserRef.id
+    );
+
+    expect(userRefs).toHaveLength(0);
+
+    await prisma.booking.delete({ where: { id: otherBooking.id } });
+    await prisma.user.delete({ where: { id: otherUser.id } });
+  });
+
+  it("should return only active booking references for user, not soft-deleted ones for system admin", async () => {
+    const timestamp = Date.now();
+    const activeRef1 = await prisma.bookingReference.create({
+      data: {
+        type: "daily_video",
+        uid: `admin-active-ref-1-${timestamp}`,
+        meetingId: `admin-active-meeting-1-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+      },
+    });
+    createdBookingReferenceIds.push(activeRef1.id);
+
+    const activeRef2 = await prisma.bookingReference.create({
+      data: {
+        type: "daily_video",
+        uid: `admin-active-ref-2-${timestamp}`,
+        meetingId: `admin-active-meeting-2-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+      },
+    });
+    createdBookingReferenceIds.push(activeRef2.id);
+
+    const deletedRef = await prisma.bookingReference.create({
+      data: {
+        type: "daily_video",
+        uid: `admin-deleted-ref-${timestamp}`,
+        meetingId: `admin-deleted-meeting-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+        deleted: true,
+      },
+    });
+    createdBookingReferenceIds.push(deletedRef.id);
+
+    const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "GET",
+    });
+
+    req.userId = testUser.id;
+
+    const responseData = await handler(req);
+
+    const activeRefs = responseData.booking_references.filter(
+      (ref: { id: number }) => ref.id === activeRef1.id || ref.id === activeRef2.id
+    );
+    const returnedDeletedRef = responseData.booking_references.find(
+      (ref: { id: number }) => ref.id === deletedRef.id
+    );
+
+    expect(activeRefs.length).toBe(2);
+    expect(returnedDeletedRef).toBeUndefined();
+  });
+
+  it("should verify soft-deleted references are never returned through the API", async () => {
+    const timestamp = Date.now();
+    const activeRef = await prisma.bookingReference.create({
+      data: {
+        type: "office365_calendar",
+        uid: `never-return-active-${timestamp}`,
+        meetingId: `never-return-active-meeting-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+      },
+    });
+    createdBookingReferenceIds.push(activeRef.id);
+
+    await prisma.bookingReference.update({
+      where: { id: activeRef.id },
+      data: { deleted: true },
+    });
+
+    const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "GET",
+    });
+
+    req.userId = testUser.id;
+
+    const responseData = await handler(req);
+
+    const softDeletedRef = responseData.booking_references.find(
+      (ref: { id: number }) => ref.id === activeRef.id
+    );
+
+    expect(softDeletedRef).toBeUndefined();
+
+    const refInDb = await prisma.bookingReference.findUnique({
+      where: { id: activeRef.id },
+    });
+    expect(refInDb).toBeDefined();
+    expect(refInDb?.deleted).toBe(true);
+  });
+});
+
+describe("PATCH /api/booking-references/[id] - Existing functionality", () => {
+  let testUser: User;
+  let testCredential: Credential;
+  let testEventType: EventType;
+  let testBooking: Booking;
+  const createdBookingReferenceIds: number[] = [];
+
+  beforeAll(async () => {
+    testUser = await prisma.user.create({
+      data: {
+        email: "api-bookingreference-patch-test@example.com",
+        username: "api-bookingreference-patch-test",
+      },
+    });
+
+    testCredential = await prisma.credential.create({
+      data: {
+        type: "google_calendar",
+        key: {},
+        userId: testUser.id,
+      },
+    });
+
+    testEventType = await prisma.eventType.create({
+      data: {
+        title: "Test Event Type",
+        slug: "api-patch-test-event-type",
+        length: 30,
+        userId: testUser.id,
+      },
+    });
+
+    testBooking = await prisma.booking.create({
+      data: {
+        uid: "api-patch-test-booking-uid",
+        title: "API Patch Test Booking",
+        startTime: new Date(Date.now() + 86400000),
+        endTime: new Date(Date.now() + 90000000),
+        userId: testUser.id,
+        eventTypeId: testEventType.id,
+        status: BookingStatus.ACCEPTED,
+      },
+    });
+  });
+
+  afterAll(async () => {
+    if (createdBookingReferenceIds.length > 0) {
+      await prisma.bookingReference.deleteMany({
+        where: {
+          id: {
+            in: createdBookingReferenceIds,
+          },
+        },
+      });
+    }
+
+    await prisma.booking.delete({
+      where: {
+        id: testBooking.id,
+      },
+    });
+
+    await prisma.eventType.delete({
+      where: {
+        id: testEventType.id,
+      },
+    });
+
+    await prisma.credential.delete({
+      where: {
+        id: testCredential.id,
+      },
+    });
+
+    await prisma.user.delete({
+      where: {
+        id: testUser.id,
+      },
+    });
+  });
+
+  it("should successfully update an active booking reference", async () => {
+    const timestamp = Date.now();
+    const activeRef = await prisma.bookingReference.create({
+      data: {
+        type: "google_calendar",
+        uid: `patch-active-ref-${timestamp}`,
+        meetingId: `patch-active-meeting-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+      },
+    });
+    createdBookingReferenceIds.push(activeRef.id);
+
+    const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "PATCH",
+      query: { id: activeRef.id.toString() },
+      body: {
+        meetingPassword: "new-password-123",
+      },
+    });
+
+    req.userId = testUser.id;
+    req.isSystemWideAdmin = false;
+
+    const responseData = await patchHandler(req);
+
+    expect(responseData.booking_reference).toBeDefined();
+    expect(responseData.booking_reference.id).toBe(activeRef.id);
+    expect(responseData.booking_reference.meetingPassword).toBe("new-password-123");
+
+    const updatedRef = await prisma.bookingReference.findUnique({
+      where: { id: activeRef.id },
+    });
+    expect(updatedRef?.meetingPassword).toBe("new-password-123");
+  });
+
+  it("should allow updating a soft-deleted booking reference (existing functionality)", async () => {
+    const timestamp = Date.now();
+    const deletedRef = await prisma.bookingReference.create({
+      data: {
+        type: "google_calendar",
+        uid: `patch-deleted-ref-${timestamp}`,
+        meetingId: `patch-deleted-meeting-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+        deleted: true,
+        meetingPassword: "original-password",
+      },
+    });
+    createdBookingReferenceIds.push(deletedRef.id);
+
+    const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "PATCH",
+      query: { id: deletedRef.id.toString() },
+      body: {
+        meetingPassword: "updated-password",
+      },
+    });
+
+    req.userId = testUser.id;
+    req.isSystemWideAdmin = false;
+
+    const responseData = await patchHandler(req);
+
+    expect(responseData.booking_reference).toBeDefined();
+    expect(responseData.booking_reference.id).toBe(deletedRef.id);
+    expect(responseData.booking_reference.meetingPassword).toBe("updated-password");
+
+    const updatedRef = await prisma.bookingReference.findUnique({
+      where: { id: deletedRef.id },
+    });
+    expect(updatedRef?.meetingPassword).toBe("updated-password");
+    expect(updatedRef?.deleted).toBe(true);
+  });
+
+  it("should verify that booking references can be updated regardless of deleted status", async () => {
+    const timestamp = Date.now();
+    const activeRef = await prisma.bookingReference.create({
+      data: {
+        type: "zoom_video",
+        uid: `patch-verify-active-${timestamp}`,
+        meetingId: `patch-verify-active-meeting-${timestamp}`,
+        credentialId: testCredential.id,
+        bookingId: testBooking.id,
+        meetingPassword: "original-password",
+      },
+    });
+    createdBookingReferenceIds.push(activeRef.id);
+
+    await prisma.bookingReference.update({
+      where: { id: activeRef.id },
+      data: { deleted: true },
+    });
+
+    const { req } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "PATCH",
+      query: { id: activeRef.id.toString() },
+      body: {
+        meetingPassword: "updated-password",
+      },
+    });
+
+    req.userId = testUser.id;
+    req.isSystemWideAdmin = false;
+
+    const responseData = await patchHandler(req);
+
+    expect(responseData.booking_reference).toBeDefined();
+    expect(responseData.booking_reference.meetingPassword).toBe("updated-password");
+
+    const refInDb = await prisma.bookingReference.findUnique({
+      where: { id: activeRef.id },
+    });
+    expect(refInDb?.meetingPassword).toBe("updated-password");
+    expect(refInDb?.deleted).toBe(true);
+  });
+});
@@ -5,11 +5,11 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { createMocks } from "node-mocks-http";
 import { describe, expect, test, vi, afterEach } from "vitest";

-import { buildBooking } from "@calcom/lib/test/builder";
 import {
  getRecordingsOfCalVideoByRoomName,
  getDownloadLinkOfCalVideoByRecordingId,
 } from "@calcom/features/conferencing/lib/videoClient";
+import { buildBooking } from "@calcom/lib/test/builder";

 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";

@@ -5,8 +5,8 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { createMocks } from "node-mocks-http";
 import { describe, expect, test, vi, afterEach } from "vitest";

-import { buildBooking } from "@calcom/lib/test/builder";
 import { getAllTranscriptsAccessLinkFromRoomName } from "@calcom/features/conferencing/lib/videoClient";
+import { buildBooking } from "@calcom/lib/test/builder";

 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";

@@ -42,4 +42,5 @@ lerna-debug.log*
 .env.*
 !.env.example
 !.env.appStore.example
-/client/*
+/client/*
+/generated/prisma/*
@@ -22,6 +22,10 @@ const loadConfig = (): AppConfig => {
    db: {
      readUrl: getEnv("DATABASE_READ_URL"),
      writeUrl: getEnv("DATABASE_WRITE_URL"),
+      readPoolMax: getEnv("DATABASE_READ_POOL_MAX", 9),
+      writePoolMax: getEnv("DATABASE_WRITE_POOL_MAX", 7),
+      workerReadPoolMax: getEnv("DATABASE_READ_WORKER_POOL_MAX", 4),
+      workerWritePoolMax: getEnv("DATABASE_WRITE_WORKER_POOL_MAX", 6),
      redisUrl: getEnv("REDIS_URL"),
    },
    next: {
@@ -13,6 +13,10 @@ export type AppConfig = {
  db: {
    readUrl: string;
    writeUrl: string;
+    readPoolMax: number;
+    writePoolMax: number;
+    workerReadPoolMax: number;
+    workerWritePoolMax: number;
    redisUrl: string;
  };
  next: {
@@ -9,7 +9,7 @@ export class BookingReferencesRepository_2024_08_13 {
  constructor(private readonly dbRead: PrismaReadService) {}

  async getBookingReferences(bookingId: number, filter?: BookingReferencesFilterInput_2024_08_13) {
-    const whereClause: Prisma.BookingReferenceWhereInput = { bookingId };
+    const whereClause: Prisma.BookingReferenceWhereInput = { bookingId, deleted: null };

    if (filter?.type) {
      whereClause.type = filter.type;
@@ -30,6 +30,7 @@ export class BookingReferencesRepository_2024_08_13 {
    return this.dbRead.prisma.bookingReference.findFirst({
      where: {
        uid: eventUid,
+        deleted: null,
      },
      include: {
        credential: true,
@@ -39,9 +39,11 @@ export class EventTypesService_2024_06_14 {
    }
    await this.checkCanCreateEventType(user.id, body);
    const eventTypeUser = await this.getUserToCreateEvent(user);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+     
    const { destinationCalendar: _destinationCalendar, ...rest } = body;

+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
    const { eventType: eventTypeCreated } = await createEventType({
      input: rest,
      ctx: {
@@ -34,6 +34,10 @@ export type Environment = {
  IS_TEAM_BILLING_ENABLED: boolean;
  // Used to enable/disable the rewrite of /api/v2 to /v2, active by default.
  REWRITE_API_V2_PREFIX: string;
+  DATABASE_READ_POOL_MAX: number;
+  DATABASE_WRITE_POOL_MAX: number;
+  DATABASE_READ_WORKER_POOL_MAX: number;
+  DATABASE_WRITE_WORKER_POOL_MAX: number;
 };

 export const getEnv = <K extends keyof Environment>(key: K, fallback?: Environment[K]): Environment[K] => {
@@ -16,12 +16,12 @@ import { FilterHostsService } from "@/lib/services/filter-hosts.service";
 import { NoSlotsNotificationService } from "@/lib/services/no-slots-notification.service";
 import { QualifiedHostsService } from "@/lib/services/qualified-hosts.service";
 import { UserAvailabilityService } from "@/lib/services/user-availability.service";
-import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { PrismaWorkerModule } from "@/modules/prisma/prisma-worker.module";
 import { RedisService } from "@/modules/redis/redis.service";
 import { Module } from "@nestjs/common";

@Module({
-  imports: [PrismaModule],
+  imports: [PrismaWorkerModule],
  providers: [
    PrismaOOORepository,
    PrismaScheduleRepository,
@@ -5,9 +5,7 @@ import { BookingCancelService as BaseBookingCancelService } from "@calcom/featur

@Injectable()
 export class BookingCancelService extends BaseBookingCancelService {
-  constructor(
-    prismaWriteService: PrismaWriteService,
-  ) {
+  constructor(prismaWriteService: PrismaWriteService) {
    super({
      prismaClient: prismaWriteService.prisma,
    });
@@ -1,6 +1,7 @@
 import { PlatformPlan } from "@/modules/billing/types";
 import type { StripeService } from "@/modules/stripe/stripe.service";
 import Stripe from "stripe";
+
 import { PlatformBilling, Team } from "@calcom/prisma/client";

 export type BillingData = {
@@ -107,7 +107,7 @@ export class MembershipsRepository {
      },
    });

-    return userOrgAdminMemberships.map((m) => m.teamId);
+    return userOrgAdminMemberships.map((m: { teamId: number }) => m.teamId);
  }

  async createMembership(teamId: number, userId: number, role: MembershipRole, accepted: boolean) {
@@ -2,6 +2,8 @@ import { MembershipsRepository } from "@/modules/memberships/memberships.reposit
 import { Injectable } from "@nestjs/common";
 import { intersectionBy } from "lodash";

+import type { Membership } from "@calcom/prisma/client";
+
@Injectable()
 export class MembershipsService {
  constructor(private readonly membershipsRepository: MembershipsRepository) {}
@@ -16,8 +18,8 @@ export class MembershipsService {
    const secondUserMemberships = await this.membershipsRepository.findUserMemberships(secondUserId);

    return intersectionBy(
-      firstUserMemberships.filter((m) => m.accepted),
-      secondUserMemberships.filter((m) => m.accepted),
+      firstUserMemberships.filter((m: Membership) => m.accepted),
+      secondUserMemberships.filter((m: Membership) => m.accepted),
      "teamId"
    );
  }
@@ -434,20 +434,19 @@ describe("Organizations Event Types Endpoints", () => {

          const responseTeamEvent = responseBody.data.find((event) => event.teamId === team.id);
          expect(responseTeamEvent).toBeDefined();
-          expect(responseTeamEvent?.hosts).toEqual([
-            {
-              userId: teammate1.id,
-              name: teammate1.name,
-              username: teammate1.username,
-              avatarUrl: teammate1.avatarUrl,
-            },
-            {
-              userId: teammate2.id,
-              name: teammate2.name,
-              username: teammate2.username,
-              avatarUrl: teammate2.avatarUrl,
-            },
-          ]);
+          expect(responseTeamEvent?.hosts?.find((host) => host.userId === teammate1.id)).toEqual({
+            userId: teammate1.id,
+            name: teammate1.name,
+            username: teammate1.username,
+            avatarUrl: teammate1.avatarUrl,
+          });
+
+          expect(responseTeamEvent?.hosts?.find((host) => host.userId === teammate2.id)).toEqual({
+            userId: teammate2.id,
+            name: teammate2.name,
+            username: teammate2.username,
+            avatarUrl: teammate2.avatarUrl,
+          });

          if (!responseTeamEvent) {
            throw new Error("Team event not found");
@@ -122,7 +122,6 @@ describe("Organizations Teams Invite Endpoints", () => {
        .expect(404);
    });

-
    afterAll(async () => {
      await userRepositoryFixture.deleteByEmail(user.email);
      await organizationsRepositoryFixture.delete(org.id);
@@ -131,5 +130,3 @@ describe("Organizations Teams Invite Endpoints", () => {
    });
  });
 });
-
-
@@ -1,5 +1,9 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
-import { OPTIONAL_API_KEY_HEADER, OPTIONAL_X_CAL_CLIENT_ID_HEADER, OPTIONAL_X_CAL_SECRET_KEY_HEADER } from "@/lib/docs/headers";
+import {
+  OPTIONAL_API_KEY_HEADER,
+  OPTIONAL_X_CAL_CLIENT_ID_HEADER,
+  OPTIONAL_X_CAL_SECRET_KEY_HEADER,
+} from "@/lib/docs/headers";
 import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard";
@@ -11,10 +15,8 @@ import { Controller, UseGuards, Post, Param, ParseIntPipe, HttpCode, HttpStatus
 import { ApiHeader, ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";

 import { SUCCESS_STATUS } from "@calcom/platform-constants";
-
 import { TeamService } from "@calcom/platform-libraries";

-
 import { CreateInviteOutputDto } from "./outputs/invite.output";

@Controller({
@@ -39,5 +41,3 @@ export class OrganizationsTeamsInviteController {
    return { status: SUCCESS_STATUS, data: result };
  }
 }
-
-
@@ -11,7 +11,8 @@ export class InviteDataDto {
  @ApiProperty({
    description:
      "Complete invitation URL that can be shared with prospective members. Opens the signup page with the token and redirects to getting started after signup.",
-    example: "http://app.cal.com/signup?token=f6a5c8b1d2e34c7f90a1b2c3d4e5f6a5b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2&callbackUrl=/getting-started",
+    example:
+      "http://app.cal.com/signup?token=f6a5c8b1d2e34c7f90a1b2c3d4e5f6a5b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2&callbackUrl=/getting-started",
  })
  inviteLink!: string;
 }
@@ -23,5 +24,3 @@ export class CreateInviteOutputDto {
  @ApiProperty({ type: InviteDataDto })
  data!: InviteDataDto;
 }
-
-
@@ -1,7 +1,8 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
-import type { Prisma } from "@calcom/prisma/client";
+
+import type { Prisma, AttributeToUser, Membership, User, Profile } from "@calcom/prisma/client";

@Injectable()
 export class OrganizationsUsersRepository {
@@ -60,7 +61,11 @@ export class OrganizationsUsersRepository {
      skip,
      take,
    });
-    return attributeToUsersWithProfile.map((attributeToUser) => attributeToUser.member.user);
+    return attributeToUsersWithProfile.map(
+      (
+        attributeToUser: AttributeToUser & { member: Membership & { user: User & { profiles: Profile[] } } }
+      ) => attributeToUser.member.user
+    );
  }

  async getOrganizationUsersByEmails(
@@ -1,36 +1,79 @@
 import type { OnModuleDestroy, OnModuleInit } from "@nestjs/common";
 import { Injectable, Logger } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
+import { PrismaPg } from "@prisma/adapter-pg";
+import { Pool } from "pg";

 import { PrismaClient } from "@calcom/prisma/client";

+const DB_MAX_POOL_CONNECTION = 10;
+
+export interface PrismaServiceOptions {
+  readUrl?: string;
+  maxReadConnections?: number;
+  e2e?: boolean;
+  type: "main" | "worker";
+}
+
@Injectable()
 export class PrismaReadService implements OnModuleInit, OnModuleDestroy {
  private logger = new Logger("PrismaReadService");

-  public prisma: PrismaClient;
+  public prisma!: PrismaClient;
+  private pool!: Pool;
+  private options!: PrismaServiceOptions;

-  constructor(readonly configService: ConfigService) {
-    const dbUrl = configService.get("db.readUrl", { infer: true });
+  constructor(private configService?: ConfigService) {
+    if (configService) {
+      // Use ConfigService defaults
+      const readUrl = configService.get<string>("db.readUrl", { infer: true });
+      const poolMax = parseInt(
+        configService.get<number>("db.readPoolMax", { infer: true }) ?? DB_MAX_POOL_CONNECTION
+      );
+      const e2e = configService.get<boolean>("e2e", { infer: true }) ?? false;

-    this.prisma = new PrismaClient({
-      datasources: {
-        db: {
-          url: dbUrl,
-        },
-      },
+      this.setOptions({
+        readUrl,
+        maxReadConnections: poolMax,
+        e2e,
+        type: "main",
+      });
+    }
+  }
+
+  setOptions(options: PrismaServiceOptions) {
+    this.options = options;
+
+    const dbUrl = options.readUrl;
+    const isE2E = options.e2e ?? false;
+
+    this.pool = new Pool({
+      connectionString: dbUrl,
+      max: isE2E ? 1 : options.maxReadConnections ?? DB_MAX_POOL_CONNECTION,
+      idleTimeoutMillis: 300000,
    });
+
+    const adapter = new PrismaPg(this.pool);
+    this.prisma = new PrismaClient({ adapter });
  }

  async onModuleInit() {
-    this.prisma.$connect();
+    if (!this.prisma) return;
+
+    try {
+      await this.prisma.$connect();
+      this.logger.log("Connected to read database");
+    } catch (error) {
+      this.logger.error("Database connection failed", error);
+    }
  }

  async onModuleDestroy() {
    try {
-      await this.prisma.$disconnect();
+      if (this.prisma) await this.prisma.$disconnect();
+      if (this.pool) await this.pool.end();
    } catch (error) {
-      this.logger.error(error);
+      this.logger.error("Error disconnecting from read database", error);
    }
  }
 }
@@ -0,0 +1,40 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Module } from "@nestjs/common";
+import { ConfigModule, ConfigService } from "@nestjs/config";
+
+@Module({
+  imports: [ConfigModule],
+  providers: [
+    {
+      provide: PrismaReadService,
+      useFactory: (config: ConfigService) => {
+        const service = new PrismaReadService();
+        service.setOptions({
+          readUrl: config.get<string>("db.readUrl", { infer: true }),
+          maxReadConnections: parseInt(config.get<number>("db.workerReadPoolMax", { infer: true })),
+          e2e: config.get<boolean>("e2e", { infer: true }) ?? false,
+          type: "worker",
+        });
+        return service;
+      },
+      inject: [ConfigService],
+    },
+    {
+      provide: PrismaWriteService,
+      useFactory: (config: ConfigService) => {
+        const service = new PrismaWriteService();
+        service.setOptions({
+          writeUrl: config.get<string>("db.writeUrl", { infer: true }),
+          maxWriteConnections: parseInt(config.get<number>("db.workerWritePoolMax", { infer: true })),
+          e2e: config.get<boolean>("e2e", { infer: true }) ?? false,
+          type: "worker",
+        });
+        return service;
+      },
+      inject: [ConfigService],
+    },
+  ],
+  exports: [PrismaReadService, PrismaWriteService],
+})
+export class PrismaWorkerModule {}
@@ -1,36 +1,75 @@
-import { OnModuleDestroy, OnModuleInit } from "@nestjs/common";
-import { Injectable, Logger } from "@nestjs/common";
+import { OnModuleDestroy, OnModuleInit, Injectable, Logger } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
+import { PrismaPg } from "@prisma/adapter-pg";
+import { Pool } from "pg";

 import { PrismaClient } from "@calcom/prisma/client";

+const DB_MAX_POOL_CONNECTION = 5;
+
+export interface PrismaServiceOptions {
+  writeUrl?: string;
+  maxWriteConnections?: number;
+  e2e?: boolean;
+  type: "main" | "worker";
+}
+
@Injectable()
 export class PrismaWriteService implements OnModuleInit, OnModuleDestroy {
  private logger = new Logger("PrismaWriteService");
+  public prisma!: PrismaClient;
+  private pool!: Pool;
+  private options!: PrismaServiceOptions;

-  public prisma: PrismaClient;
+  constructor(private configService?: ConfigService) {
+    if (configService) {
+      const writeUrl = configService.get<string>("db.writeUrl", { infer: true });
+      const poolMax = parseInt(
+        configService.get<number>("db.writePoolMax", { infer: true }) ?? DB_MAX_POOL_CONNECTION
+      );
+      const e2e = configService.get<boolean>("e2e", { infer: true }) ?? false;

-  constructor(readonly configService: ConfigService) {
-    const dbUrl = configService.get("db.writeUrl", { infer: true });
+      this.setOptions({
+        writeUrl,
+        maxWriteConnections: poolMax,
+        e2e,
+        type: "main",
+      });
+    }
+  }

-    this.prisma = new PrismaClient({
-      datasources: {
-        db: {
-          url: dbUrl,
-        },
-      },
+  setOptions(options: PrismaServiceOptions) {
+    this.options = options;
+
+    const dbUrl = options.writeUrl;
+    const isE2E = options.e2e ?? false;
+    this.pool = new Pool({
+      connectionString: dbUrl,
+      max: isE2E ? 1 : options.maxWriteConnections ?? DB_MAX_POOL_CONNECTION,
+      idleTimeoutMillis: 300000,
    });
+
+    const adapter = new PrismaPg(this.pool);
+    this.prisma = new PrismaClient({ adapter });
  }

  async onModuleInit() {
-    this.prisma.$connect();
+    if (!this.prisma) return;
+
+    try {
+      await this.prisma.$connect();
+      this.logger.log("Connected to write database");
+    } catch (error) {
+      this.logger.error("Database connection failed", error);
+    }
  }

  async onModuleDestroy() {
    try {
-      await this.prisma.$disconnect();
+      if (this.prisma) await this.prisma.$disconnect();
+      if (this.pool) await this.pool.end();
    } catch (error) {
-      this.logger.error(error);
+      this.logger.error("Error disconnecting from write database", error);
    }
  }
 }
@@ -1,9 +1,40 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Module } from "@nestjs/common";
+import { ConfigModule, ConfigService } from "@nestjs/config";

@Module({
-  providers: [PrismaReadService, PrismaWriteService],
+  imports: [ConfigModule],
+  providers: [
+    {
+      provide: PrismaReadService,
+      useFactory: (config: ConfigService) => {
+        const service = new PrismaReadService();
+        service.setOptions({
+          readUrl: config.get<string>("db.readUrl", { infer: true }),
+          maxReadConnections: parseInt(config.get<number>("db.readPoolMax", { infer: true })),
+          e2e: config.get<boolean>("e2e", { infer: true }) ?? false,
+          type: "main",
+        });
+        return service;
+      },
+      inject: [ConfigService],
+    },
+    {
+      provide: PrismaWriteService,
+      useFactory: (config: ConfigService) => {
+        const service = new PrismaWriteService();
+        service.setOptions({
+          writeUrl: config.get<string>("db.writeUrl", { infer: true }),
+          maxWriteConnections: parseInt(config.get<number>("db.writePoolMax", { infer: true })),
+          e2e: config.get<boolean>("e2e", { infer: true }) ?? false,
+          type: "main",
+        });
+        return service;
+      },
+      inject: [ConfigService],
+    },
+  ],
  exports: [PrismaReadService, PrismaWriteService],
 })
 export class PrismaModule {}
@@ -2,7 +2,7 @@
 // Needed if ConfigService is used anywhere
 import appConfig from "@/config/app";
 import { AvailableSlotsModule } from "@/lib/modules/available-slots.module";
-import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { PrismaWorkerModule } from "@/modules/prisma/prisma-worker.module";
 import { Module, Logger } from "@nestjs/common";
 import { ConfigModule } from "@nestjs/config";
 import { SentryModule } from "@sentry/nestjs/setup";
@@ -15,7 +15,7 @@ import { SentryModule } from "@sentry/nestjs/setup";
      isGlobal: true,
      load: [appConfig],
    }),
-    PrismaModule,
+    PrismaWorkerModule,
    AvailableSlotsModule,
  ],
  providers: [Logger],
@@ -118,7 +118,7 @@ export class StripeService {
      userId
    );

-    const credentialIdsToDelete = existingCredentials.map((item) => item.id);
+    const credentialIdsToDelete = existingCredentials.map((item: Credential) => item.id);
    if (credentialIdsToDelete.length > 0) {
      await this.appsRepository.deleteAppCredentials(credentialIdsToDelete, userId);
    }
@@ -17,7 +17,7 @@ export const MembershipUserSelect: Prisma.UserSelect = {
  name: true,
  metadata: true,
  bio: true,
-};
+} satisfies Prisma.UserSelect;

@Injectable()
 export class TeamsMembershipsRepository {
@@ -3,7 +3,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable, NotFoundException } from "@nestjs/common";

 import { teamMetadataSchema } from "@calcom/platform-libraries";
-import { Prisma } from "@calcom/prisma/client";
+import type { Membership, Prisma } from "@calcom/prisma/client";

@Injectable()
 export class TeamsRepository {
@@ -41,7 +41,7 @@ export class TeamsRepository {
      return [];
    }

-    return teamMembers.map((member) => member.userId);
+    return teamMembers.map((member: Membership) => member.userId);
  }

  async getTeamManagedUsersIds(teamId: number) {
@@ -57,7 +57,7 @@ export class TeamsRepository {
      return [];
    }

-    return teamMembers.map((member) => member.userId);
+    return teamMembers.map((member: Membership) => member.userId);
  }

  async getTeamsUserIsMemberOf(userId: number) {
@@ -289,7 +289,7 @@ export class UsersRepository {
        user: true,
      },
    });
-    return profiles.map((profile) => profile.user);
+    return profiles.map((profile: Profile & { user: User }) => profile.user);
  }

  async setDefaultConferencingApp(userId: number, appSlug?: string, appLink?: string) {
@@ -14,7 +14,7 @@
    "jsx": "react-jsx",
    "paths": {
      "@/*": ["./src/*"],
-      "@prisma/client/*": ["./client/*"],
+      "@calcom/prisma/client": ["../../../packages/prisma/generated/prisma/client"],
      "@calcom/prisma/enums": ["../../../packages/prisma/enums"],
      "@calcom/platform-constants": ["../../../packages/platform/constants/index.ts"],
      "@calcom/platform-types": ["../../../packages/platform/types/index.ts"],
@@ -3,6 +3,7 @@ import { unstable_cache } from "next/cache";

 import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-utils";
 import { getTeamData } from "@calcom/features/ee/teams/lib/getTeamData";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import {
  getEventTypeHosts,
  getProfileFromEvent,
@@ -11,10 +12,9 @@ import {
 } from "@calcom/features/eventtypes/lib/getPublicEvent";
 import { getTeamEventType } from "@calcom/features/eventtypes/lib/getTeamEventType";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { SchedulingType } from "@calcom/prisma/enums";
@@ -23,8 +23,14 @@ const ServerPage = async ({ searchParams: _searchParams }: ServerPageProps) => {
  const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
  const searchParams = await _searchParams;
  const token = Array.isArray(searchParams?.token) ? searchParams.token[0] : searchParams?.token;
-  const autoAccept = Array.isArray(searchParams?.autoAccept) ? searchParams.autoAccept[0] : searchParams?.autoAccept;
-  const callbackUrl = token ? `/teams?token=${encodeURIComponent(token)}${autoAccept ? `&autoAccept=${encodeURIComponent(autoAccept)}` : ''}` : null;
+  const autoAccept = Array.isArray(searchParams?.autoAccept)
+    ? searchParams.autoAccept[0]
+    : searchParams?.autoAccept;
+  const callbackUrl = token
+    ? `/teams?token=${encodeURIComponent(token)}${
+        autoAccept ? `&autoAccept=${encodeURIComponent(autoAccept)}` : ""
+      }`
+    : null;

  if (!session) {
    redirect(callbackUrl ? `/auth/login?callbackUrl=${callbackUrl}` : "/auth/login");
@@ -3,9 +3,9 @@ import type { Session } from "next-auth";
 import { unstable_cache } from "next/cache";

 import { TeamsListing } from "@calcom/features/ee/teams/components/TeamsListing";
-import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { TeamService } from "@calcom/features/ee/teams/services/teamService";
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import prisma from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";

@@ -33,7 +33,9 @@ export const ServerTeamsListing = async ({
  session: Session;
 }) => {
  const token = Array.isArray(searchParams?.token) ? searchParams.token[0] : searchParams?.token;
-  const autoAccept = Array.isArray(searchParams?.autoAccept) ? searchParams.autoAccept[0] : searchParams?.autoAccept;
+  const autoAccept = Array.isArray(searchParams?.autoAccept)
+    ? searchParams.autoAccept[0]
+    : searchParams?.autoAccept;
  const userId = session.user.id;
  let invitationAccepted = false;

@@ -42,7 +44,7 @@ export const ServerTeamsListing = async ({

  if (token) {
    try {
-       if (autoAccept === "true") {
+      if (autoAccept === "true") {
        await TeamService.acceptInvitationByToken(token, userId);
        invitationAccepted = true;
      } else {
@@ -308,7 +308,7 @@ const WeightedAttributesSelector = ({
          />
        </div>
        <div className="bg-muted mt-1 rounded-xl p-2">
-          {!!attributeIdForWeights ? (
+          {attributeIdForWeights ? (
            <SelectField
              size="sm"
              containerClassName="data-testid-select-router"
@@ -76,7 +76,6 @@ export default function RoutingForms({ appUrl }: { appUrl: string }) {

  useEffect(() => {
    hookForm.reset({});
-    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);
  const filters = getTeamsFiltersFromQuery(routerQuery);

@@ -5,8 +5,8 @@ import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";

 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import { APP_NAME } from "@calcom/lib/constants";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { APP_NAME } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";
 import { meRouter } from "@calcom/trpc/server/routers/viewer/me/_router";

@@ -4,8 +4,8 @@ import { z } from "zod";

 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { OrgForm } from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgEditPage";
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
+import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";

 const orgIdSchema = z.object({ id: z.coerce.number() });

@@ -369,7 +369,6 @@ const TeamListCollapsible = ({ teamFeatures }: { teamFeatures?: Record<number, T
        const tabMembers = Array.from(document.getElementsByTagName("a")).filter(
          (bottom) => bottom.dataset.testid === "vertical-tab-Members"
        )[1];
-        // eslint-disable-next-line @calcom/eslint/no-scroll-into-view-embed -- Settings layout isn't embedded
        tabMembers?.scrollIntoView({ behavior: "smooth" });
      }, 100);
    }
@@ -568,7 +567,6 @@ const SettingsSidebarContainer = ({
        const tabMembers = Array.from(document.getElementsByTagName("a")).filter(
          (bottom) => bottom.dataset.testid === "vertical-tab-Members"
        )[1];
-        // eslint-disable-next-line @calcom/eslint/no-scroll-into-view-embed -- Settings layout isn't embedded
        tabMembers?.scrollIntoView({ behavior: "smooth" });
      }, 100);
    }
@@ -2,9 +2,9 @@ import type { PageProps } from "app/_types";
 import { getTranslate, _generateMetadata } from "app/_utils";

 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import { WebhookRepository } from "@calcom/features/webhooks/lib/repository/WebhookRepository";
 import { EditWebhookView } from "@calcom/features/webhooks/pages/webhook-edit-view";
 import { APP_NAME } from "@calcom/lib/constants";
-import { WebhookRepository } from "@calcom/features/webhooks/lib/repository/WebhookRepository";

 export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
  await _generateMetadata(
@@ -1,7 +1,7 @@
 import { _generateMetadata, getTranslate } from "app/_utils";
 import { unstable_cache } from "next/cache";
-import { notFound } from "next/navigation";
 import { revalidatePath } from "next/cache";
+import { notFound } from "next/navigation";

 import type { AppFlags } from "@calcom/features/flags/config";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
@@ -2,8 +2,8 @@ import { _generateMetadata, getTranslate } from "app/_utils";
 import { redirect } from "next/navigation";

 import { OtherTeamsListing } from "@calcom/features/ee/organizations/pages/components/OtherTeamsListing";
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
+import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";

 import { validateUserHasOrg } from "../../../actions/validateUserHasOrg";

@@ -6,11 +6,14 @@ import { z } from "zod";

 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { CalendarCache } from "@calcom/features/calendar-cache/calendar-cache";
-import { getCalendarCredentials, getConnectedCalendars } from "@calcom/features/calendars/lib/CalendarManager";
+import {
+  getCalendarCredentials,
+  getConnectedCalendars,
+} from "@calcom/features/calendars/lib/CalendarManager";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { HttpError } from "@calcom/lib/http-error";
 import notEmpty from "@calcom/lib/notEmpty";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";

 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
@@ -13,7 +13,7 @@ async function handler(req: NextRequest) {
  let appDirRequestBody;
  try {
    appDirRequestBody = await req.json();
-  } catch (error) {
+  } catch {
    return NextResponse.json({ success: false, message: "Invalid JSON" }, { status: 400 });
  }
  const bookingData = bookingCancelWithCsrfSchema.parse(appDirRequestBody);
@@ -1,6 +1,7 @@
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";

+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { DefaultAdapterFactory } from "@calcom/features/calendar-subscription/adapters/AdaptersFactory";
 import { CalendarSubscriptionService } from "@calcom/features/calendar-subscription/lib/CalendarSubscriptionService";
 import { CalendarCacheEventRepository } from "@calcom/features/calendar-subscription/lib/cache/CalendarCacheEventRepository";
@@ -8,7 +9,6 @@ import { CalendarCacheEventService } from "@calcom/features/calendar-subscriptio
 import { CalendarSyncService } from "@calcom/features/calendar-subscription/lib/sync/CalendarSyncService";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/SelectedCalendarRepository";
-import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 import { defaultResponderForAppDir } from "@calcom/web/app/api/defaultResponderForAppDir";

@@ -6,13 +6,13 @@
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";

-import GoogleCalendarService from "@calcom/app-store/googlecalendar/lib/CalendarService";
-import { CalendarAppDelegationCredentialInvalidGrantError } from "@calcom/lib/CalendarAppError";
 import { findUniqueDelegationCalendarCredential } from "@calcom/app-store/delegationCredential";
+import GoogleCalendarService from "@calcom/app-store/googlecalendar/lib/CalendarService";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import { CalendarAppDelegationCredentialInvalidGrantError } from "@calcom/lib/CalendarAppError";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";
 import type { Ensure } from "@calcom/types/utils";
@@ -9,15 +9,15 @@ import {
  sendDailyVideoRecordingEmails,
  sendDailyVideoTranscriptEmails,
 } from "@calcom/emails/daily-video-emails";
+import {
+  getAllTranscriptsAccessLinkFromMeetingId,
+  submitBatchProcessorTranscriptionJob,
+} from "@calcom/features/conferencing/lib/videoClient";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import {
-  getAllTranscriptsAccessLinkFromMeetingId,
-  submitBatchProcessorTranscriptionJob,
-} from "@calcom/features/conferencing/lib/videoClient";
 import { generateVideoToken } from "@calcom/lib/videoTokens";
 import prisma from "@calcom/prisma";
 import { getBooking } from "@calcom/web/lib/daily-webhook/getBooking";
@@ -6,11 +6,11 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { BillingPlanService } from "@calcom/features/ee/billing/domain/billing-plans";
 import type { Contact } from "@calcom/features/ee/support/lib/intercom/intercom";
 import { intercom } from "@calcom/features/ee/support/lib/intercom/intercom";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";

 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
@@ -2,6 +2,7 @@ import type { Params } from "app/_types";
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";

+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import type { CalendarSubscriptionProvider } from "@calcom/features/calendar-subscription/adapters/AdaptersFactory";
 import { DefaultAdapterFactory } from "@calcom/features/calendar-subscription/adapters/AdaptersFactory";
 import { CalendarSubscriptionService } from "@calcom/features/calendar-subscription/lib/CalendarSubscriptionService";
@@ -11,7 +12,6 @@ import { CalendarSyncService } from "@calcom/features/calendar-subscription/lib/
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import logger from "@calcom/lib/logger";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/SelectedCalendarRepository";
-import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { prisma } from "@calcom/prisma";
 import { defaultResponderForAppDir } from "@calcom/web/app/api/defaultResponderForAppDir";

@@ -696,7 +696,15 @@ describe("Retell AI Webhook Handler", () => {
  describe("Web Call Tests", () => {
    const mockAgent: Pick<
      Agent,
-      "id" | "name" | "providerAgentId" | "enabled" | "userId" | "teamId" | "createdAt" | "updatedAt" | "inboundEventTypeId"
+      | "id"
+      | "name"
+      | "providerAgentId"
+      | "enabled"
+      | "userId"
+      | "teamId"
+      | "createdAt"
+      | "updatedAt"
+      | "inboundEventTypeId"
    > = {
      id: "agent-123",
      name: "Test Agent",
@@ -2,8 +2,8 @@

 import { revalidateTag, unstable_cache } from "next/cache";

-import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";
 import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
+import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";

 const CACHE_TAGS = {
  HAS_TEAM_PLAN: "MembershipRepository.findFirstAcceptedMembershipByUserId",
@@ -3,8 +3,8 @@
 import { useEffect, useState } from "react";
 import z from "zod";

-import type { PaymentPageProps } from "@calcom/features/ee/payments/pages/payment";
 import { useBookingSuccessRedirect } from "@calcom/features/bookings/lib/bookingSuccessRedirect";
+import type { PaymentPageProps } from "@calcom/features/ee/payments/pages/payment";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { useCopy } from "@calcom/lib/hooks/useCopy";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -115,7 +115,9 @@ export function getEditEventActions(context: BookingActionContext): ActionType[]
      icon: "clock",
      label: t("reschedule_booking"),
      href: `/reschedule/${booking.uid}${
-        booking.seatsReferences.length && isAttendee && seatReferenceUid ? `?seatReferenceUid=${seatReferenceUid}` : ""
+        booking.seatsReferences.length && isAttendee && seatReferenceUid
+          ? `?seatReferenceUid=${seatReferenceUid}`
+          : ""
      }`,
      disabled:
        (isBookingInPast && !booking.eventType.allowReschedulingPastBookings) || isDisabledRescheduling,
@@ -187,7 +187,7 @@ const useReroutingState = ({ isOpenDialog }: Pick<RerouteDialogProps, "isOpenDia
  const status = (() => {
    if (!value) return ReroutingStatusEnum.REROUTING_NOT_INITIATED;
    if (value.error) return ReroutingStatusEnum.REROUTING_FAILED;
-    if (!!value.newBooking) return ReroutingStatusEnum.REROUTING_COMPLETE;
+    if (value.newBooking) return ReroutingStatusEnum.REROUTING_COMPLETE;
    return ReroutingStatusEnum.REROUTING_IN_PROGRESS;
  })();

@@ -6,10 +6,10 @@ import type { LocationObject } from "@calcom/app-store/locations";
 import { isConferencing as isConferencingApp } from "@calcom/app-store/utils";
 import { getLocale } from "@calcom/features/auth/lib/getLocale";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps";
 import { CAL_URL } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
@@ -281,7 +281,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
    id: user.id,
    name: user.name,
    avatarUrl: user.avatarUrl,
-    alreadyInstalled: appInstalls.some((install) => !Boolean(install.teamId) && install.userId === user.id),
+    alreadyInstalled: appInstalls.some((install) => !install.teamId && install.userId === user.id),
  };

  const teamsWithIsAppInstalled = hasTeams
@@ -1,8 +1,8 @@
 import { enrichFormWithMigrationData } from "@calcom/app-store/routing-forms/enrichFormWithMigrationData";
 import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";
+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { Resource } from "@calcom/features/pbac/domain/types/permission-registry";
 import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions";
-import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { AppGetServerSidePropsContext, AppPrisma, AppUser } from "@calcom/types/AppGetServerSideProps";

@@ -5,8 +5,8 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { getMultipleDurationValue } from "@calcom/features/bookings/lib/get-booking";
 import { getSlugOrRequestedSlug } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { shouldHideBrandingForTeamEvent } from "@calcom/features/profile/lib/hideBranding";
 import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";
+import { shouldHideBrandingForTeamEvent } from "@calcom/features/profile/lib/hideBranding";
 import slugify from "@calcom/lib/slugify";
 import prisma from "@calcom/prisma";

@@ -2,10 +2,10 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { z } from "zod";

 import dayjs from "@calcom/dayjs";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { IS_STRIPE_ENABLED } from "@calcom/lib/constants";
-import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { prisma } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import { CreationSource } from "@calcom/prisma/enums";
@@ -1,5 +1,6 @@
 import type { GetServerSidePropsContext } from "next";

+import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
 import {
  getOrganizationSettings,
@@ -9,7 +10,6 @@ import { getTeamWithMembers } from "@calcom/features/ee/teams/lib/queries";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { IS_CALCOM } from "@calcom/lib/constants";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
-import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";
 import logger from "@calcom/lib/logger";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import slugify from "@calcom/lib/slugify";
@@ -7,14 +7,14 @@ import {
  updateMeetingTokenIfExpired,
 } from "@calcom/app-store/dailyvideo/lib/VideoApiAdapter";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
+import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { getCalVideoReference } from "@calcom/features/get-cal-video-reference";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { CAL_VIDEO_MEETING_LINK_FOR_TESTING } from "@calcom/lib/constants";
 import { isENVDev } from "@calcom/lib/env";
-import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
-import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import prisma from "@calcom/prisma";

 const md = new MarkdownIt("default", { html: true, breaks: true, linkify: true });
@@ -210,7 +210,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
    exp: epochTimeFourteenDaysAfter,
  });

-  const sessionUserId = !!session?.user?.impersonatedBy ? session.user.impersonatedBy.id : session?.user.id;
+  const sessionUserId = session?.user?.impersonatedBy ? session.user.impersonatedBy.id : session?.user.id;
  const isOrganizer = await checkIfUserIsHost({
    booking: {
      eventTypeId: bookingObj.eventType?.id,
@@ -238,7 +238,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
      videoReferencePassword,
      sessionUserId
    );
-    if (!!meetingPassword) {
+    if (meetingPassword) {
      bookingObj.references.forEach((bookRef) => {
        bookRef.meetingPassword = meetingPassword;
      });
@@ -8,6 +8,7 @@ import type { z } from "zod";

 import checkForMultiplePaymentApps from "@calcom/app-store/_utils/payments/checkForMultiplePaymentApps";
 import useAddAppMutation from "@calcom/app-store/_utils/useAddAppMutation";
+import type { LocationObject } from "@calcom/app-store/locations";
 import type { EventTypeAppSettingsComponentProps, EventTypeModel } from "@calcom/app-store/types";
 import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-utils";
 import type { LocationFormValues } from "@calcom/features/eventtypes/lib/types";
@@ -15,7 +16,6 @@ import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps";
 import { getAppOnboardingUrl } from "@calcom/lib/apps/getAppOnboardingUrl";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { LocationObject } from "@calcom/app-store/locations";
 import type { Team } from "@calcom/prisma/client";
 import type { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
 import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
@@ -309,21 +309,20 @@ const OnboardingPage = ({
                    handleSetUpLater={handleSetUpLater}
                  />
                )}
-              {currentStep === AppOnboardingSteps.CONFIGURE_STEP &&
-                eventTypeGroups && (
-                  <ConfigureStepCard
-                    slug={appMetadata.slug}
-                    categories={appMetadata.categories}
-                    credentialId={credentialId}
-                    userName={userName}
-                    loading={updateMutation.isPending}
-                    formPortalRef={formPortalRef}
-                    setConfigureStep={setConfigureStep}
-                    eventTypeGroups={eventTypeGroups}
-                    handleSetUpLater={handleSetUpLater}
-                    isConferencing={isConferencing}
-                  />
-                )}
+              {currentStep === AppOnboardingSteps.CONFIGURE_STEP && eventTypeGroups && (
+                <ConfigureStepCard
+                  slug={appMetadata.slug}
+                  categories={appMetadata.categories}
+                  credentialId={credentialId}
+                  userName={userName}
+                  loading={updateMutation.isPending}
+                  formPortalRef={formPortalRef}
+                  setConfigureStep={setConfigureStep}
+                  eventTypeGroups={eventTypeGroups}
+                  handleSetUpLater={handleSetUpLater}
+                  isConferencing={isConferencing}
+                />
+              )}
            </Form>
          </div>
        </div>
@@ -24,13 +24,9 @@ import {
 import { Price } from "@calcom/features/bookings/components/event-meta/Price";
 import { getCalendarLinks, CalendarLinkType } from "@calcom/features/bookings/lib/getCalendarLinks";
 import { RATING_OPTIONS, validateRating } from "@calcom/features/bookings/lib/rating";
-import {
-  SMS_REMINDER_NUMBER_FIELD,
-  SystemField,
-  TITLE_FIELD,
-} from "@calcom/lib/bookings/SystemField";
 import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
 import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
+import { SMS_REMINDER_NUMBER_FIELD, SystemField, TITLE_FIELD } from "@calcom/lib/bookings/SystemField";
 import { APP_NAME } from "@calcom/lib/constants";
 import { formatToLocalizedDate, formatToLocalizedTime, formatToLocalizedTimezone } from "@calcom/lib/dayjs";
 import useGetBrandingColours from "@calcom/lib/getBrandColours";
@@ -771,7 +767,6 @@ export default function Success(props: PageProps) {
                            <Fragment key={field.name}>
                              <div
                                className="text-emphasis mt-4 font-medium"
-                                 
                                dangerouslySetInnerHTML={{
                                  __html: markdownToSafeHTML(label),
                                }}
@@ -1084,7 +1079,8 @@ export default function Success(props: PageProps) {
                      <span className="underline">
                        <a
                          target="_blank"
-                          href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations" rel="noreferrer">
+                          href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations"
+                          rel="noreferrer">
                          {t("resolve")}
                        </a>
                      </span>
@@ -274,7 +274,7 @@ export default function Signup({
        };

        const constructCallBackIfUrlNotPresent = () => {
-          if (!!isPlatformUser) {
+          if (isPlatformUser) {
            return `${WEBAPP_URL}/${gettingStartedWithPlatform}?from=signup`;
          }

@@ -284,7 +284,7 @@ export default function Signup({
        const constructCallBackUrl = () => {
          const callbackUrlSearchParams = searchParams?.get("callbackUrl");

-          return !!callbackUrlSearchParams
+          return callbackUrlSearchParams
            ? constructCallBackIfUrlPresent()
            : constructCallBackIfUrlNotPresent();
        };
@@ -405,7 +405,7 @@ const nextConfig = (phase) => {
      }, */
      ];

-      if (Boolean(process.env.NEXT_PUBLIC_API_V2_URL)) {
+      if (process.env.NEXT_PUBLIC_API_V2_URL) {
        afterFiles.push({
          source: "/api/v2/:path*",
          destination: `${process.env.NEXT_PUBLIC_API_V2_URL}/:path*`,
@@ -3,13 +3,13 @@ import type { NextApiRequest } from "next";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { getRegularBookingService } from "@calcom/features/bookings/di/RegularBookingService.container";
 import { BotDetectionService } from "@calcom/features/bot-detection";
+import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
 import getIP from "@calcom/lib/getIP";
 import { piiHasher } from "@calcom/lib/server/PiiHasher";
 import { checkCfTurnstileToken } from "@calcom/lib/server/checkCfTurnstileToken";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
 import prisma from "@calcom/prisma";
 import { CreationSource } from "@calcom/prisma/enums";

@@ -1,6 +1,6 @@
 import { expect } from "@playwright/test";

-import type Prisma from "@calcom/prisma/client";
+import type { EventType } from "@calcom/prisma/client";

 import { test } from "./lib/fixtures";
 import { IS_STRIPE_ENABLED, selectFirstAvailableTimeSlotNextMonth } from "./lib/testUtils";
@@ -13,7 +13,7 @@ test.describe("Cancellation Fee Warning E2E", () => {
    // eslint-disable-next-line playwright/no-skipped-test
    test.skip(!IS_STRIPE_ENABLED, "It should only run if Stripe is installed");
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -41,7 +41,7 @@ test.describe("Cancellation Fee Warning E2E", () => {
    // eslint-disable-next-line playwright/no-skipped-test
    test.skip(!IS_STRIPE_ENABLED, "It should only run if Stripe is installed");
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -69,7 +69,7 @@ test.describe("Cancellation Fee Warning E2E", () => {
    // eslint-disable-next-line playwright/no-skipped-test
    test.skip(!IS_STRIPE_ENABLED, "It should only run if Stripe is installed");
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -6,13 +6,12 @@ import { v4 } from "uuid";

 import updateChildrenEventTypes from "@calcom/features/ee/managed-event-types/lib/handleChildrenEventTypes";
 import stripe from "@calcom/features/ee/payments/server/stripe";
+import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
 import { prisma } from "@calcom/prisma";
-import type Prisma from "@calcom/prisma/client";
 import type { Team } from "@calcom/prisma/client";
-import type { Prisma as PrismaType } from "@calcom/prisma/client";
+import type { Prisma, User, EventType } from "@calcom/prisma/client";
 import { MembershipRole, SchedulingType, TimeUnit, WorkflowTriggerEvents } from "@calcom/prisma/enums";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
 import type { Schedule } from "@calcom/types/schedule";
@@ -37,7 +36,7 @@ const userIncludes = {
  workflows: true,
  credentials: true,
  routingForms: true,
-} satisfies PrismaType.UserInclude;
+} satisfies Prisma.UserInclude;

 type InstallStripeParamsSkipTrue = {
  eventTypeIds?: number[];
@@ -63,16 +62,11 @@ type InstallStripeParams = InstallStripeParamsUnion & {
  page: Page;
 };

-const userWithEventTypes = {
+const _userWithEventTypes = {
  include: userIncludes,
-} satisfies PrismaType.UserDefaultArgs;
+} satisfies Prisma.UserDefaultArgs;

-const seededForm = {
-  id: "948ae412-d995-4865-875a-48302588de03",
-  name: "Seeded Form - Pro",
-};
-
-type UserWithIncludes = PrismaType.UserGetPayload<typeof userWithEventTypes>;
+type UserWithIncludes = Prisma.UserGetPayload<typeof _userWithEventTypes>;

 const createTeamWorkflow = async (user: { id: number }, team: { id: number }) => {
  return await prisma.workflow.create({
@@ -182,7 +176,7 @@ const createTeamAndAddUser = async (
    teamSlug ??
    orgRequestedSlug ??
    `${isOrg ? "org" : "team"}-${workerInfo.workerIndex}-${Date.now()}${slugIndex}`;
-  const data: PrismaType.TeamCreateInput = {
+  const data: Prisma.TeamCreateInput = {
    name: `user-id-${user.id}'s ${isOrg ? "Org" : "Team"}`,
    isOrganization: isOrg,
  };
@@ -471,7 +465,7 @@ export const createUsersFixture = (
                },
                data: {
                  orgProfiles: _user.profiles.length
-                  ? {
+                    ? {
                        connect: _user.profiles.map((profile) => ({ id: profile.id })),
                      }
                    : {
@@ -654,7 +648,6 @@ const createUserFixture = (user: UserWithIncludes, page: Page) => {

  // self is a reflective method that return the Prisma object that references this fixture.
  const self = async () =>
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
    (await prisma.user.findUnique({
      where: { id: store.user.id },
      include: { eventTypes: true },
@@ -791,9 +784,9 @@ const createUserFixture = (user: UserWithIncludes, page: Page) => {
        },
      });
    },
-    setupEventWithPrice: async (eventType: Pick<Prisma.EventType, "id">, slug: string) =>
+    setupEventWithPrice: async (eventType: Pick<EventType, "id">, slug: string) =>
      setupEventWithPrice(eventType, slug, store.page),
-    bookAndPayEvent: async (eventType: Pick<Prisma.EventType, "slug">) =>
+    bookAndPayEvent: async (eventType: Pick<EventType, "slug">) =>
      bookAndPayEvent(user, eventType, store.page),
    makePaymentUsingStripe: async () => makePaymentUsingStripe(store.page),
    installStripePersonal: async (params: InstallStripeParamsUnion) =>
@@ -819,11 +812,11 @@ const createUserFixture = (user: UserWithIncludes, page: Page) => {
  };
 };

-type SupportedTestEventTypes = PrismaType.EventTypeCreateInput & {
-  _bookings?: PrismaType.BookingCreateInput[];
+type SupportedTestEventTypes = Prisma.EventTypeCreateInput & {
+  _bookings?: Prisma.BookingCreateInput[];
 };

-type SupportedTestWorkflows = PrismaType.WorkflowCreateInput;
+type SupportedTestWorkflows = Prisma.WorkflowCreateInput;

 type CustomUserOptsKeys =
  | "username"
@@ -836,7 +829,7 @@ type CustomUserOptsKeys =
  | "disableImpersonation"
  | "role"
  | "identityProvider";
-type CustomUserOpts = Partial<Pick<Prisma.User, CustomUserOptsKeys>> & {
+type CustomUserOpts = Partial<Pick<User, CustomUserOptsKeys>> & {
  timeZone?: TimeZoneEnum;
  eventTypes?: SupportedTestEventTypes[];
  workflows?: SupportedTestWorkflows[];
@@ -857,7 +850,7 @@ const createUser = (
        organizationId?: number | null;
      })
    | null
-): PrismaType.UserUncheckedCreateInput => {
+): Prisma.UserUncheckedCreateInput => {
  const suffixToMakeUsernameUnique = `-${workerInfo.workerIndex}-${Date.now()}`;
  // build a unique name for our user
  const uname =
@@ -983,7 +976,7 @@ async function confirmPendingPayment(page: Page) {

 // login using a replay of an E2E routine.
 export async function login(
-  user: Pick<Prisma.User, "username"> & Partial<Pick<Prisma.User, "email">> & { password?: string | null },
+  user: Pick<User, "username"> & Partial<Pick<User, "email">> & { password?: string | null },
  page: Page
 ) {
  // get locators
@@ -997,7 +990,7 @@ export async function login(
  await page.waitForSelector("text=Welcome back");

  await emailLocator.fill(user.email ?? `${user.username}@example.com`);
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
  await passwordLocator.fill(user.password ?? user.username!);

  // waiting for specific login request to resolve
@@ -1007,7 +1000,7 @@ export async function login(
 }

 export async function apiLogin(
-  user: Pick<Prisma.User, "username"> & Partial<Pick<Prisma.User, "email">> & { password: string | null },
+  user: Pick<User, "username"> & Partial<Pick<User, "email">> & { password: string | null },
  page: Page,
  navigateToUrl?: string
 ) {
@@ -1047,14 +1040,14 @@ export async function apiLogin(
  // Only wait if we're on a protected page that would trigger the session API call
  try {
    await page.waitForResponse("/api/auth/session", { timeout: 2000 });
-  } catch (error) {
+  } catch {
    // Session API call not made (likely on a public page), continue anyway
  }

  return response;
 }

-export async function setupEventWithPrice(eventType: Pick<Prisma.EventType, "id">, slug: string, page: Page) {
+export async function setupEventWithPrice(eventType: Pick<EventType, "id">, slug: string, page: Page) {
  await page.goto(`/event-types/${eventType?.id}?tabName=apps`);
  await page.locator(`[data-testid='${slug}-app-switch']`).first().click();
  await page.getByPlaceholder("Price").fill("100");
@@ -1062,8 +1055,8 @@ export async function setupEventWithPrice(eventType: Pick<Prisma.EventType, "id"
 }

 export async function bookAndPayEvent(
-  user: Pick<Prisma.User, "username">,
-  eventType: Pick<Prisma.EventType, "slug">,
+  user: Pick<User, "username">,
+  eventType: Pick<EventType, "slug">,
  page: Page
 ) {
  // booking process with stripe integration
@@ -2,7 +2,7 @@ import { expect } from "@playwright/test";

 import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-utils";
 import prisma from "@calcom/prisma";
-import type Prisma from "@calcom/prisma/client";
+import type { EventType } from "@calcom/prisma/client";
 import { SchedulingType } from "@calcom/prisma/enums";

 import { test, todo } from "./lib/fixtures";
@@ -35,7 +35,7 @@ test.describe("Stripe integration skip true", () => {

    await user.installStripePersonal({ skip: true });

-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.setupEventWithPrice(eventType, "stripe");

    // Need to wait for the DB to be updated with the metadata
@@ -102,7 +102,7 @@ test.describe("Stripe integration skip true", () => {
  });
  test("Can book a paid booking", async ({ page, users }) => {
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -115,7 +115,7 @@ test.describe("Stripe integration skip true", () => {

  test("Pending payment booking should not be confirmed by default", async ({ page, users }) => {
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -139,7 +139,7 @@ test.describe("Stripe integration skip true", () => {

  test("Paid booking should be able to be rescheduled", async ({ page, users }) => {
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -162,7 +162,7 @@ test.describe("Stripe integration skip true", () => {

  test("Paid booking should be able to be cancelled", async ({ page, users }) => {
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -178,11 +178,11 @@ test.describe("Stripe integration skip true", () => {

  test.describe("When event is paid and confirmed", () => {
    let user: Awaited<ReturnType<Fixtures["users"]["create"]>>;
-    let eventType: Prisma.EventType;
+    let eventType: EventType;

    test.beforeEach(async ({ page, users }) => {
      user = await users.create();
-      eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+      eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
      await user.apiLogin();
      await page.goto("/apps/installed");

@@ -217,7 +217,7 @@ test.describe("Stripe integration skip true", () => {
  test.describe("Change stripe presented currency", () => {
    test("Should be able to change currency", async ({ page, users }) => {
      const user = await users.create();
-      const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+      const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
      await user.apiLogin();

      await user.installStripePersonal({ skip: true });
@@ -337,7 +337,7 @@ test.describe("Stripe integration with the new app install flow skip false", ()
  });
  test("Can book a paid booking skip false", async ({ page, users }) => {
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -348,7 +348,7 @@ test.describe("Stripe integration with the new app install flow skip false", ()
  });
  test("Pending payment booking should not be confirmed by default skip false", async ({ page, users }) => {
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -371,7 +371,7 @@ test.describe("Stripe integration with the new app install flow skip false", ()

  test("Paid booking should be able to be rescheduled skip false", async ({ page, users }) => {
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -393,7 +393,7 @@ test.describe("Stripe integration with the new app install flow skip false", ()

  test("Paid booking should be able to be cancelled skip false", async ({ page, users }) => {
    const user = await users.create();
-    const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+    const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
    await user.apiLogin();
    await page.goto("/apps/installed");

@@ -408,11 +408,11 @@ test.describe("Stripe integration with the new app install flow skip false", ()

  test.describe("When event is paid and confirmed skip false", () => {
    let user: Awaited<ReturnType<Fixtures["users"]["create"]>>;
-    let eventType: Prisma.EventType;
+    let eventType: EventType;

    test.beforeEach(async ({ page, users }) => {
      user = await users.create();
-      eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+      eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
      await user.apiLogin();
      await page.goto("/apps/installed");

@@ -449,7 +449,7 @@ test.describe("Stripe integration with the new app install flow skip false", ()
  test.describe("Change stripe presented currency skip false", () => {
    test("Should be able to change currency skip false", async ({ page, users }) => {
      const user = await users.create();
-      const eventType = user.eventTypes.find((e) => e.slug === "paid") as Prisma.EventType;
+      const eventType = user.eventTypes.find((e) => e.slug === "paid") as EventType;
      await user.apiLogin();

      await page.goto("/apps/stripe");
@@ -6,10 +6,10 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
 import { getBookingForReschedule, getBookingForSeatedEvent } from "@calcom/features/bookings/lib/get-booking";
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import type { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent";
 import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
-import { shouldHideBrandingForUserEvent } from "@calcom/features/profile/lib/hideBranding";
+import type { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent";
 import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";
+import { shouldHideBrandingForUserEvent } from "@calcom/features/profile/lib/hideBranding";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import slugify from "@calcom/lib/slugify";
 import { prisma } from "@calcom/prisma";
@@ -6,8 +6,8 @@ import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomain
 import stripe from "@calcom/features/ee/payments/server/stripe";
 import { hostedCal, isSAMLLoginEnabled, samlProductID, samlTenantID } from "@calcom/features/ee/sso/lib/saml";
 import { ssoTenantProduct } from "@calcom/features/ee/sso/lib/sso";
-import { IS_PREMIUM_USERNAME_ENABLED } from "@calcom/lib/constants";
 import { checkUsername } from "@calcom/features/profile/lib/checkUsername";
+import { IS_PREMIUM_USERNAME_ENABLED } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";

 import { asStringOrNull } from "@lib/asStringOrNull";
@@ -1,10 +1,7 @@
 import { describe, expect, it, vi } from "vitest";

 import dayjs from "@calcom/dayjs";
-import {
-  checkDurationLimit,
-  checkDurationLimits,
-} from "@calcom/features/bookings/lib/checkDurationLimits";
+import { checkDurationLimit, checkDurationLimits } from "@calcom/features/bookings/lib/checkDurationLimits";
 import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateIntervalLimitOrder";

 const mockGetTotalBookingDuration = vi.fn();
@@ -423,7 +423,7 @@ describe("handleChildrenEventTypes", () => {
        timeZone: _timeZone,
        parentId: _parentId,
        userId: _userId,
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+         
        requiresBookerEmailVerification,
        lockTimeZoneToggleOnBookingPage,
        useEventTypeDestinationCalendarEmail,
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import i18nMock from "../../../../../tests/libs/__mocks__/libServerI18n";
 import prismock from "../../../../../tests/libs/__mocks__/prisma";

@@ -118,17 +119,6 @@ type InputWorkflow = {
  verifiedAt?: Date;
 };

-type PaymentData = {
-  // Common payment data fields based on Stripe and other payment providers
-  paymentIntent?: string;
-  paymentMethodId?: string;
-  clientSecret?: string;
-  customerId?: string;
-  subscriptionId?: string;
-  metadata?: Record<string, string>;
-  [key: string]: unknown; // Allow additional provider-specific fields
-};
-
 type InputPayment = {
  id?: number;
  uid: string;
@@ -139,7 +129,7 @@ type InputPayment = {
  currency: string;
  success: boolean;
  refunded: boolean;
-  data: PaymentData;
+  data: Prisma.InputJsonValue;
  externalId: string;
  paymentOption?: PaymentOption;
 };
@@ -580,7 +570,7 @@ export async function addEventTypes(eventTypes: InputEventType[], usersStore: In
    };
  });
  log.silly("TestData: Creating EventType", JSON.stringify(eventTypesWithUsers));
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Pretty complex type here
+
  return await addEventTypesToDb(eventTypesWithUsers as unknown as any);
 }

@@ -592,7 +582,6 @@ function addBookingReferencesToDB(bookingReferences: Prisma.BookingReferenceCrea

 async function addBookingsToDb(
  bookings: (Prisma.BookingCreateInput & {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
    references: any[];
    user?: { id: number };
  })[]
@@ -700,7 +689,6 @@ export async function addBookings(bookings: InputBooking[]) {
  );
 }

-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function addWebhooksToDb(webhooks: any[]) {
  await prismock.webhook.createMany({
    data: webhooks,
@@ -993,7 +981,6 @@ export async function addUsers(users: InputUser[]) {
  return await addUsersToDb(prismaUsersCreate);
 }

-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function addAppsToDb(apps: any[]) {
  log.silly("TestData: Creating Apps", JSON.stringify({ apps }));
  await prismock.app.createMany({
@@ -1060,7 +1047,6 @@ export async function createOrganization(orgData: {
  slug: string;
  metadata?: z.infer<typeof teamMetadataSchema>;
  withTeam?: boolean;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 }): Promise<TeamCreateReturnType & { slug: NonNullable<TeamCreateReturnType["slug"]>; children: any }> {
  const org = await prismock.team.create({
    data: {
@@ -1099,7 +1085,7 @@ export async function createOrganization(orgData: {
 export async function createCredentials(
  credentialData: {
    type: string;
-    key: Prisma.JsonValue;
+    key: Prisma.InputJsonValue;
    id?: number;
    userId?: number | null;
    teamId?: number | null;
@@ -2061,11 +2047,11 @@ export function mockVideoApp({
    url: `http://mock-${metadataLookupKey}.example.com`,
  };
  log.silly("mockVideoApp", JSON.stringify({ metadataLookupKey, appStoreLookupKey }));
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
  const createMeetingCalls: any[] = [];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
  const updateMeetingCalls: any[] = [];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
  const deleteMeetingCalls: any[] = [];

  const mockVideoAdapter = (credential: unknown) => {
@@ -2314,7 +2300,7 @@ export function getExpectedCalEventForBookingRequest({
  eventType,
 }: {
  bookingRequest: ReturnType<typeof getMockRequestDataForBooking>;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
  eventType: any;
 }) {
  return {
@@ -2541,7 +2527,7 @@ export const createDelegationCredential = async (orgId: number, type: "google" |
            id: orgId,
          },
        },
-        serviceAccountKey: workspace.defaultServiceAccountKey,
+        serviceAccountKey: workspace.defaultServiceAccountKey as unknown as Prisma.InputJsonValue,
      },
    });

@@ -2583,7 +2569,7 @@ export const createDelegationCredential = async (orgId: number, type: "google" |
            id: orgId,
          },
        },
-        serviceAccountKey: workspace.defaultServiceAccountKey,
+        serviceAccountKey: workspace.defaultServiceAccountKey as unknown as Prisma.InputJsonValue,
      },
    });

@@ -2592,7 +2578,6 @@ export const createDelegationCredential = async (orgId: number, type: "google" |
  throw new Error(`Unsupported type: ${type}`);
 };

-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const buildDelegationCredential = ({ serviceAccountKey }: { serviceAccountKey: any }) => {
  return {
    id: -1,
@@ -89,6 +89,7 @@
    "@faker-js/faker": "9.2.0",
    "@jetstreamapp/soql-parser-js": "^6.1.0",
    "@playwright/test": "^1.45.3",
+    "@prisma/internals": "^6.16.2",
    "@snaplet/copycat": "^4.1.0",
    "@testing-library/jest-dom": "^5.16.5",
    "@testing-library/react": "^16.0.1",
@@ -1,8 +1,8 @@
 import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
-import { getAppFromSlug } from "@calcom/app-store/utils";
 import { getAllDelegationCredentialsForUser } from "@calcom/app-store/delegationCredential";
-import getInstallCountPerApp from "@calcom/lib/apps/getInstallCountPerApp";
+import { getAppFromSlug } from "@calcom/app-store/utils";
 import type { UserAdminTeams } from "@calcom/features/users/repositories/UserRepository";
+import getInstallCountPerApp from "@calcom/lib/apps/getInstallCountPerApp";
 import prisma, { safeAppSelect, safeCredentialSelect } from "@calcom/prisma";
 import { userMetadata } from "@calcom/prisma/zod-utils";
 import type { AppFrontendPayload as App } from "@calcom/types/App";
@@ -1,5 +1,5 @@
-import { HttpError } from "@calcom/lib/http-error";
 import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import { HttpError } from "@calcom/lib/http-error";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { UserProfile } from "@calcom/types/UserProfile";
@@ -1,6 +1,6 @@
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { isInMemoryDelegationCredential } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
-import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import type { CredentialForCalendarService } from "@calcom/types/Credential";

 import { getTokenObjectFromCredential } from "./getTokenObjectFromCredential";
@@ -1,9 +1,9 @@
 import { oauth2_v2 } from "@googleapis/oauth2";
 import type { OAuth2Client } from "googleapis-common";

+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import logger from "@calcom/lib/logger";
 import { uploadAvatar } from "@calcom/lib/server/avatar";
-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { resizeBase64Image } from "@calcom/lib/server/resizeBase64Image";
 import prisma from "@calcom/prisma";

@@ -1,7 +1,7 @@
 import type z from "zod";

-import logger from "@calcom/lib/logger";
 import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import logger from "@calcom/lib/logger";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";

@@ -1,12 +1,12 @@
 import type { BaseWidget } from "react-awesome-query-builder";
 import { describe, it, expect, vi, beforeEach } from "vitest";

-import { RouteActionType } from "@calcom/app-store/routing-forms/zod";
-import { RaqbLogicResult } from "@calcom/lib/raqb/evaluateRaqbLogic";
 import {
  findTeamMembersMatchingAttributeLogic,
  TroubleshooterCase,
 } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
+import { RouteActionType } from "@calcom/app-store/routing-forms/zod";
+import { RaqbLogicResult } from "@calcom/lib/raqb/evaluateRaqbLogic";
 import * as getAttributesModule from "@calcom/lib/service/attribute/server/getAttributes";
 import type { AttributeType } from "@calcom/prisma/enums";
 import { RoutingFormFieldType } from "@calcom/routing-forms/lib/FieldTypes";
@@ -64,13 +64,13 @@ function mockAttributesScenario({
            Object.entries(member.attributes).map(([attributeId, value]) => {
              return [
                attributeId,
-                 
+
                {
                  attributeOption:
                    value instanceof Array
                      ? value.map((value) => ({ value, isGroup: false, contains: [] }))
                      : { value, isGroup: false, contains: [] },
-                   
+
                  type: attributes.find((attribute) => attribute.id === attributeId)!.type,
                },
              ];
@@ -159,7 +159,7 @@ async function getLogicResultForAllMembers(
        attributesQueryValue,
      });
      attributesDataPerUser.set(member.userId, attributesData);
-      const result = !!jsonLogic.apply(attributeJsonLogic as any, attributesData)
+      const result = jsonLogic.apply(attributeJsonLogic as any, attributesData)
        ? RaqbLogicResult.MATCH
        : RaqbLogicResult.NO_MATCH;

@@ -93,7 +93,7 @@ const createComplexQueryValue = ({
  }>;
 }): AttributesQueryValue => {
  const children1: Record<string, RaqbChild> = {};
-  
+
  rules.forEach((rule) => {
    children1[rule.ruleId] = createQueryValueRule({
      type: "rule",
@@ -1,5 +1,5 @@
-import { HttpError } from "@calcom/lib/http-error";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { HttpError } from "@calcom/lib/http-error";
 import prisma from "@calcom/prisma";

 export const throwIfNotHaveAdminAccessToTeam = async ({
@@ -172,7 +172,7 @@ export const updateMeetingTokenIfExpired = async ({

  try {
    await fetcher(`/meeting-tokens/${meetingToken}`).then(ZGetMeetingTokenResponseSchema.parse);
-  } catch (err) {
+  } catch {
    const organizerMeetingToken = await postToDailyAPI("/meeting-tokens", {
      properties: {
        room_name: roomName,
@@ -426,7 +426,7 @@ const DailyVideoApiAdapter = (): VideoApiAdapter => {
          getRecordingsResponseSchema.parse
        );
        return Promise.resolve(res);
-      } catch (err) {
+      } catch {
        throw new Error("Something went wrong! Unable to get recording");
      }
    },
@@ -3,6 +3,10 @@ import { metadata as googleCalendarMetadata } from "@calcom/app-store/googlecale
 import { metadata as googleMeetMetadata } from "@calcom/app-store/googlevideo/_metadata";
 import { metadata as office365CalendarMetaData } from "@calcom/app-store/office365calendar/_metadata";
 import { metadata as office365VideoMetaData } from "@calcom/app-store/office365video/_metadata";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import {
  buildNonDelegationCredential,
  buildNonDelegationCredentials,
@@ -10,10 +14,6 @@ import {
 } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
-import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
-import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { SelectedCalendar } from "@calcom/prisma/client";
 import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
@@ -1,7 +1,7 @@
 import { Dub } from "dub-package";

-import logger from "@calcom/lib/logger";
 import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import logger from "@calcom/lib/logger";
 import type { AnalyticsService, SendEventProps } from "@calcom/types/AnalyticsService";
 import type { CredentialPayload } from "@calcom/types/Credential";

@@ -3,6 +3,7 @@ import { OAuth2Client } from "googleapis-common";
 import type { NextApiRequest, NextApiResponse } from "next";

 import GoogleCalendarService from "@calcom/app-store/googlecalendar/lib/CalendarService";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { renewSelectedCalendarCredentialId } from "@calcom/lib/connectedCalendar";
 import {
  GOOGLE_CALENDAR_SCOPES,
@@ -14,7 +15,6 @@ import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultHandler } from "@calcom/lib/server/defaultHandler";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { Prisma } from "@calcom/prisma/client";

 import getInstalledAppPath from "../../_utils/getInstalledAppPath";
@@ -1,3 +1,4 @@
+import { calendar_v3 } from "@googleapis/calendar";
 import type { Page } from "@playwright/test";
 import { expect } from "@playwright/test";

@@ -29,7 +30,7 @@ export const createBookingAndFetchGCalEvent = async (
  await page.locator("[data-testid=success-page]");

  const bookingUrl = await page.url();
-  const bookingUid = bookingUrl.match(/booking\/([^\/?]+)/);
+  const bookingUid = bookingUrl.match(/booking\/([^/?]+)/);
  assertValueExists(bookingUid, "bookingUid");

  const [gCalReference, booking] = await Promise.all([
@@ -40,6 +41,7 @@ export const createBookingAndFetchGCalEvent = async (
        },
        type: metadata.type,
        credentialId: qaGCalCredential?.id,
+        deleted: null,
      },
      select: {
        uid: true,
@@ -107,7 +109,7 @@ export const createBookingAndFetchGCalEvent = async (
 };

 export const deleteBookingAndEvent = async (
-  authedCalendar: any,
+  authedCalendar: calendar_v3.Calendar,
  bookingUid: string,
  gCalReferenceUid?: string
 ) => {
@@ -1,4 +1,5 @@
 import dayjs from "@calcom/dayjs";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import type { Tasker } from "@calcom/features/tasker/tasker";
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload";
@@ -6,7 +7,6 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { withReporting } from "@calcom/lib/sentryWrapper";
-import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { App_RoutingForms_Form, User } from "@calcom/prisma/client";
@@ -1,9 +1,9 @@
 import { z } from "zod";

+import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
 import { emailSchema } from "@calcom/lib/emailSchema";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
-import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import { withReporting } from "@calcom/lib/sentryWrapper";
 import { RoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse";
@@ -741,6 +741,7 @@ export default class SalesforceCRMService implements CRM {
        booking: {
          uid: bookingUid,
        },
+        deleted: null,
      },
    });

@@ -2,9 +2,9 @@ import type { NextApiRequest } from "next";
 import type { Session } from "next-auth";
 import { describe, it, expect, vi, beforeEach } from "vitest";

+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { MembershipRole } from "@calcom/prisma/enums";

 import {
@@ -54,7 +54,7 @@ describe("Portal API - Service-Based Architecture", () => {
          user: { id: 123 },
          hasValidLicense: true,
          upId: "test-upid",
-          expires: "2024-12-31T23:59:59.999Z"
+          expires: "2024-12-31T23:59:59.999Z",
        } as Session,
      } as RequestWithSession;

@@ -77,7 +77,7 @@ describe("Portal API - Service-Based Architecture", () => {
          user: {} as any,
          hasValidLicense: true,
          upId: "test-upid",
-          expires: "2024-12-31T23:59:59.999Z"
+          expires: "2024-12-31T23:59:59.999Z",
        } as Session,
      } as RequestWithSession;

@@ -3,12 +3,12 @@ import { v4 as uuidv4 } from "uuid";
 import z from "zod";

 import { sendAwaitingPaymentEmailAndSMS } from "@calcom/emails";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { getErrorFromUnknown } from "@calcom/lib/errors";
 import { ErrorWithCode } from "@calcom/lib/errors";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import prisma from "@calcom/prisma";
 import type { Booking, Payment, PaymentOption, Prisma } from "@calcom/prisma/client";
 import type { EventTypeMetadata } from "@calcom/prisma/zod-utils";
@@ -1,10 +1,10 @@
 import type { NextApiResponse } from "next";

+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import logger from "@calcom/lib/logger";
-import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma from "@calcom/prisma";

 import stripe from "../../server";
--- a/Show More
+++ b/Show More