refactor: Unify OrganizationRepository and remove duplicate PrismaOrganizationRepository

[hariombalhara]

What does this PR do?

This PR refactors the OrganizationRepository to use a dependency injection (DI) container pattern and simplifies the Prisma client architecture by removing the read/write client separation.

Key Changes:

• Converted OrganizationRepository from static methods to instance-based DI pattern with getOrganizationRepository() container
• Simplified base OrganizationRepository constructor to accept only { prismaClient: PrismaClient } instead of { prismaClient, prismaWriteClient? }
• Replaced dual this.prismaRead/this.prismaWrite properties with single this.prismaClient property
• Updated API v2 OrganizationsRepository to pass only dbWrite.prisma as the single Prisma client (all operations now use write client)
• Fixed test mock setup in verify-email.test.ts to return mocked repository instance instead of scenario helper
• Added mockReset to organizationMock.ts for proper mock cleanup between tests
• Optimized repeated getOrganizationRepository() calls by storing in local variables

Link to Devin run: https://app.devin.ai/sessions/81e6321b59504d80a099dea7ae58fc8b
Requested by: @hariombalhara (hariom@cal.com)

Mandatory Tasks (DO NOT REMOVE)

• I have self-reviewed the code
• I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - internal refactoring only, no API changes
• I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Prerequisites:

• Ensure database is set up with test data including organizations

Test Scenarios:

1. Apps/Web Organization Operations:

   • Create a new organization via /settings/organizations/new
   • Edit an existing organization via /settings/admin/organizations/[id]/edit
   • Verify organization teams listing works at /settings/organizations/teams/other
   • Test email verification flow with auto-accept domains
   • Verify availability page renders correctly with organization context

2. API v2 Integration:

   • Test API v2 organization endpoints (GET, POST, PUT, DELETE)
   • Verify all operations work correctly using write client for both reads and writes
   • Check that no errors occur from missing read client

3. Automated Tests:

   TZ=UTC yarn test OrganizationRepository.test.ts
   TZ=UTC yarn test verify-email.test.ts

4. Type Checking:

   yarn type-check:ci --force

Human Review Checklist

Critical Items:

• Verify all static method calls were converted: Search the codebase for OrganizationRepository. to ensure no static method calls remain (should all be getOrganizationRepository().)
• API v2 write client usage: Confirm that using only the write client for all API v2 operations (including reads) is acceptable. Previously, reads used a read replica.
• DI container correctness: Verify that OrganizationRepository.module.ts correctly passes prismaClient to the repository constructor
• Mock setup: Review changes to organizationMock.ts and verify test isolation is maintained with mockReset
• Apps/web client usage: Confirm apps/web is using the correct Prisma client from the DI container (not hardcoded to write client)

Testing:

• Run full test suite: TZ=UTC yarn test
• Manually test organization creation flow end-to-end
• Manually test API v2 organization endpoints
• Verify CI passes completely (especially integration tests)

Known Risks:

• Large refactoring touching 31 files across apps/web, API v2, and shared packages - potential for missed call sites
• Architectural change from read/write separation to single client may impact database load patterns
• Mock infrastructure changes could cause subtle test issues
• Type-safe but significant API surface change from static to instance methods

Files Changed:

• Base repository: packages/features/ee/organizations/repositories/OrganizationRepository.ts
• DI container: packages/features/ee/organizations/di/OrganizationRepository.{container,module}.ts
• API v2: apps/api/v2/src/modules/organizations/index/organizations.repository.ts
• Apps/web: 6 page components updated to use DI container
• TRPC handlers: 4 handlers updated to use DI container
• Tests: 2 test files updated with corrected mock setup
• Platform libraries: Export updated to include both OrganizationRepository and getOrganizationRepository

[devin-ai-integration]

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

• Address comments on this PR that start with 'DevinAI' or '@devin'.
• Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

• Disable automatic comment and CI monitoring

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

2 Skipped Deployments

Project	Deployment	Preview	Comments	Updated (UTC)
cal	Ignored			Nov 3, 2025 1:29pm
cal-eu	Ignored			Nov 3, 2025 1:29pm

[cubic-dev-ai]

5 issues found across 29 files

Prompt for AI agents (all 5 issues)

Understand the root cause of the following 5 issues and fix them.


<file name="packages/platform/libraries/organizations.ts">

<violation number="1" location="packages/platform/libraries/organizations.ts:1">
This refactoring is incomplete. While many call sites have been updated, the duplicate `PrismaOrganizationRepository` was not deleted and is still referenced in the dependency injection container (`packages/features/ee/organizations/di/OrganizationRepository.module.ts`). This leaves unused, duplicate code and contradicts the primary goal of the PR.</violation>
</file>

<file name="packages/features/ee/organizations/__mocks__/organizationMock.ts">

<violation number="1" location="packages/features/ee/organizations/__mocks__/organizationMock.ts:17">
Replacing the deep mock reset with vi.clearAllMocks stops clearing mock implementations, so any scenario-configured behavior lingers into later tests and makes results dependent on execution order. Please restore a deep reset on the mocked singleton in beforeEach.</violation>
</file>

<file name="packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts">

<violation number="1" location="packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts:10">
This override wipes out the Prismock client that DelegationCredentialRepository relies on. Removing the manual vi.mock keeps the existing Prisma test double intact.</violation>

<violation number="2" location="packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts:94">
Spy on organizationRepository.findByMemberEmail before setting a mockResolvedValue; otherwise this call throws because the method isn’t a vi.fn.</violation>
</file>

<file name="packages/features/ee/organizations/repositories/OrganizationRepository.ts">

<violation number="1" location="packages/features/ee/organizations/repositories/OrganizationRepository.ts:235">
Rule violated: **Enforce Singular Naming for Single-Item Functions**

`findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail` returns a single organization (`getParsedTeam(org)`), but the name still uses the plural “Orgs”. Please rename it to a singular form to comply with the singular-naming rule for single-item return values.</violation>
</file>

_{React with 👍 or 👎 to teach cubic. Mention @cubic-dev-ai to give feedback, ask questions, or re-run the review.}

[cubic-dev-ai]

This refactoring is incomplete. While many call sites have been updated, the duplicate PrismaOrganizationRepository was not deleted and is still referenced in the dependency injection container (packages/features/ee/organizations/di/OrganizationRepository.module.ts). This leaves unused, duplicate code and contradicts the primary goal of the PR.

Prompt for AI agents

Address the following comment on packages/platform/libraries/organizations.ts at line 1:

<comment>This refactoring is incomplete. While many call sites have been updated, the duplicate `PrismaOrganizationRepository` was not deleted and is still referenced in the dependency injection container (`packages/features/ee/organizations/di/OrganizationRepository.module.ts`). This leaves unused, duplicate code and contradicts the primary goal of the PR.</comment>

<file context>
@@ -1,4 +1,3 @@
+export { OrganizationRepository, organizationRepository } from &quot;@calcom/features/ee/organizations/repositories&quot;;
 export { OrganizationMembershipService } from &quot;@calcom/features/ee/organizations/lib/service/OrganizationMembershipService&quot;;
 export type { IOrganizationRepository } from &quot;@calcom/features/ee/organizations/lib/repository/IOrganizationRepository&quot;;
</file context>

[cubic-dev-ai]

Replacing the deep mock reset with vi.clearAllMocks stops clearing mock implementations, so any scenario-configured behavior lingers into later tests and makes results dependent on execution order. Please restore a deep reset on the mocked singleton in beforeEach.

Prompt for AI agents

Address the following comment on packages/features/ee/organizations/__mocks__/organizationMock.ts at line 17:

<comment>Replacing the deep mock reset with vi.clearAllMocks stops clearing mock implementations, so any scenario-configured behavior lingers into later tests and makes results dependent on execution order. Please restore a deep reset on the mocked singleton in beforeEach.</comment>

<file context>
@@ -1,23 +1,28 @@
-const organizationMock = mockDeep&lt;OrganizationModule&gt;();
-const OrganizationRepository = organizationMock.OrganizationRepository;
+beforeEach(() =&gt; {
+  vi.clearAllMocks();
+});
 
</file context>

✅ Addressed in 4d02ff0

[cubic-dev-ai]

Spy on organizationRepository.findByMemberEmail before setting a mockResolvedValue; otherwise this call throws because the method isn’t a vi.fn.

Prompt for AI agents

Address the following comment on packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts at line 94:

<comment>Spy on organizationRepository.findByMemberEmail before setting a mockResolvedValue; otherwise this call throws because the method isn’t a vi.fn.</comment>

<file context>
@@ -92,8 +90,8 @@ const createTestDelegationCredential = async (overrides = {}) =&gt; {
-const setupOrganizationMock = (returnValue: any) =&gt; {
-  vi.mocked(OrganizationRepository.findByMemberEmail).mockResolvedValue(returnValue);
+const setupOrganizationMock = (returnValue: Awaited&lt;ReturnType&lt;typeof organizationRepository.findByMemberEmail&gt;&gt;) =&gt; {
+  vi.mocked(organizationRepository.findByMemberEmail).mockResolvedValue(returnValue);
 };
 
</file context>

Suggested change

	vi.mocked(organizationRepository.findByMemberEmail).mockResolvedValue(returnValue);
	vi.spyOn(organizationRepository, "findByMemberEmail").mockResolvedValue(returnValue);

✅ Addressed in 7c7c2fb

[cubic-dev-ai]

This override wipes out the Prismock client that DelegationCredentialRepository relies on. Removing the manual vi.mock keeps the existing Prisma test double intact.

Prompt for AI agents

Address the following comment on packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts at line 10:

<comment>This override wipes out the Prismock client that DelegationCredentialRepository relies on. Removing the manual vi.mock keeps the existing Prisma test double intact.</comment>

<file context>
@@ -2,22 +2,20 @@ import prismock from &quot;../../../../tests/libs/__mocks__/prisma&quot;;
-  OrganizationRepository: {
-    findByMemberEmail: vi.fn(),
-  },
+vi.mock(&quot;@calcom/prisma&quot;, () =&gt; ({
+  prisma: {},
 }));
</file context>

[cubic-dev-ai]

Reviewed changes from recent commits (found 3 issues).

3 issues found across 28 files

Prompt for AI agents (all 3 issues)

Understand the root cause of the following 3 issues and fix them.


<file name="apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx">

<violation number="1" location="apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx:9">
The API v2 `OrganizationsRepository` initializes the base repository with a read-only Prisma client (`dbRead.prisma`). The base `OrganizationRepository` now contains write methods due to the refactoring, which will cause runtime errors when called from API v2 as they will attempt to write to a read-replica database.</violation>
</file>

<file name="apps/web/lib/pages/auth/verify-email.test.ts">

<violation number="1" location="apps/web/lib/pages/auth/verify-email.test.ts:14">
getOrganizationRepository should return the mocked repository instance, not the scenario helper object; otherwise findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail is undefined and the test will throw.</violation>
</file>

<file name="apps/web/lib/pages/auth/verify-email.ts">

<violation number="1" location="apps/web/lib/pages/auth/verify-email.ts:24">
Rule violated: **Enforce Singular Naming for Single-Item Functions**

`findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail` returns a single organization (it throws when multiple are found and returns `orgs[0]`), yet the method name still uses the plural `Orgs`, violating the “Enforce Singular Naming for Single-Item Functions” rule. Please rename the method to a singular form or adjust it to return a collection to match the naming.</violation>
</file>

_{React with 👍 or 👎 to teach cubic. Mention @cubic-dev-ai to give feedback, ask questions, or re-run the review.}

[cubic-dev-ai]

No issues found across 4 files

[cubic-dev-ai]

No issues found across 3 files

[cubic-dev-ai]

Reviewed changes from recent commits (found 1 issue).

1 issue found across 2 files

Prompt for AI agents (all 1 issues)

Understand the root cause of the following 1 issues and fix them.


<file name="apps/api/v2/src/modules/organizations/index/organizations.repository.ts">

<violation number="1" location="apps/api/v2/src/modules/organizations/index/organizations.repository.ts:15">
This change directs all organization-related database operations, including reads, to the write database by instantiating the repository with the write client and switching local read calls to use dbWrite.</violation>
</file>

_{React with 👍 or 👎 to teach cubic. Mention @cubic-dev-ai to give feedback, ask questions, or re-run the review.}

[cubic-dev-ai]

This change directs all organization-related database operations, including reads, to the write database by instantiating the repository with the write client and switching local read calls to use dbWrite.

Prompt for AI agents

Address the following comment on apps/api/v2/src/modules/organizations/index/organizations.repository.ts at line 15:

<comment>This change directs all organization-related database operations, including reads, to the write database by instantiating the repository with the write client and switching local read calls to use dbWrite.</comment>

<file context>
@@ -10,15 +9,14 @@ import { Prisma } from &quot;@calcom/prisma/client&quot;;
     private readonly stripeService: StripeService
   ) {
-    super({ prismaClient: dbRead.prisma, prismaWriteClient: dbWrite.prisma });
+    super({ prismaClient: dbWrite.prisma });
   }
 
</file context>

[cubic-dev-ai]

5 issues found across 31 files

Prompt for AI agents (all 5 issues)

Understand the root cause of the following 5 issues and fix them.


<file name="apps/api/v2/src/modules/organizations/index/organizations.repository.ts">

<violation number="1" location="apps/api/v2/src/modules/organizations/index/organizations.repository.ts:19">
The query uses `include` which is against the project&#39;s data access guidelines. Please use `select` to specify the exact fields needed from the `team` and `platformBilling` tables to avoid over-fetching and improve performance and security.</violation>
</file>

<file name="packages/features/ee/organizations/repositories/OrganizationRepository.ts">

<violation number="1" location="packages/features/ee/organizations/repositories/OrganizationRepository.ts:204">
The query uses a top-level `include`, which fetches all columns from the `team` table and violates the project&#39;s data access guidelines. Please refactor the query to use `select` to specify only the required fields from the `team` table.</violation>

<violation number="2" location="packages/features/ee/organizations/repositories/OrganizationRepository.ts:235">
Rule violated: **Enforce Singular Naming for Single-Item Functions**

`findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail` returns a single organization (or null), but the plural `Orgs` in its name violates the “Enforce Singular Naming for Single-Item Functions” rule. Rename the method to a singular form so callers understand it only ever yields one organization.</violation>
</file>

<file name="packages/features/ee/impersonation/lib/ImpersonationProvider.test.ts">

<violation number="1" location="packages/features/ee/impersonation/lib/ImpersonationProvider.test.ts:28">
This mock now only stubs a named export, but ImpersonationProvider pulls the default from `@calcom/prisma`, so the default resolves to `undefined` and any test exercising `prisma.*` will crash. Keep mocking the default export (or provide both) so prisma stays defined.</violation>
</file>

<file name="packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts">

<violation number="1" location="packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts:17">
Mocking `@calcom/prisma` to `{}` strips the repository of its Prisma client. DelegationCredentialRepository expects `prisma.delegationCredential.*`, so this change makes every call in the test throw instead of using prismock.</violation>
</file>

_{React with 👍 or 👎 to teach cubic. Mention @cubic-dev-ai to give feedback, ask questions, or re-run the review.}

[cubic-dev-ai]

The query uses include which is against the project's data access guidelines. Please use select to specify the exact fields needed from the team and platformBilling tables to avoid over-fetching and improve performance and security.

Prompt for AI agents

Address the following comment on apps/api/v2/src/modules/organizations/index/organizations.repository.ts at line 19:

<comment>The query uses `include` which is against the project&#39;s data access guidelines. Please use `select` to specify the exact fields needed from the `team` and `platformBilling` tables to avoid over-fetching and improve performance and security.</comment>

<file context>
@@ -1,24 +1,22 @@
 
   async findById(organizationId: number) {
-    return this.dbRead.prisma.team.findUnique({
+    return this.dbWrite.prisma.team.findUnique({
       where: {
         id: organizationId,
</file context>

[cubic-dev-ai]

The query uses a top-level include, which fetches all columns from the team table and violates the project's data access guidelines. Please refactor the query to use select to specify only the required fields from the team table.

Prompt for AI agents

Address the following comment on packages/features/ee/organizations/repositories/OrganizationRepository.ts at line 204:

<comment>The query uses a top-level `include`, which fetches all columns from the `team` table and violates the project&#39;s data access guidelines. Please refactor the query to use `select` to specify only the required fields from the `team` table.</comment>

<file context>
@@ -176,27 +182,27 @@ export class OrganizationRepository {
 
-  static async findBySlugIncludeOnboarding({ slug }: { slug: string }) {
-    return prisma.team.findFirst({
+  async findBySlugIncludeOnboarding({ slug }: { slug: string }) {
+    return this.prismaClient.team.findFirst({
       where: { slug, isOrganization: true },
</file context>

[cubic-dev-ai]

This mock now only stubs a named export, but ImpersonationProvider pulls the default from @calcom/prisma, so the default resolves to undefined and any test exercising prisma.* will crash. Keep mocking the default export (or provide both) so prisma stays defined.

Prompt for AI agents

Address the following comment on packages/features/ee/impersonation/lib/ImpersonationProvider.test.ts at line 28:

<comment>This mock now only stubs a named export, but ImpersonationProvider pulls the default from `@calcom/prisma`, so the default resolves to `undefined` and any test exercising `prisma.*` will crash. Keep mocking the default export (or provide both) so prisma stays defined.</comment>

<file context>
@@ -25,7 +25,7 @@ const session: Session = {
 vi.mock(&quot;@calcom/prisma&quot;, () =&gt; {
   return {
-    default: vi.fn(),
+    prisma: vi.fn(),
   };
 });
</file context>

[cubic-dev-ai]

Mocking @calcom/prisma to {} strips the repository of its Prisma client. DelegationCredentialRepository expects prisma.delegationCredential.*, so this change makes every call in the test throw instead of using prismock.

Prompt for AI agents

Address the following comment on packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts at line 17:

<comment>Mocking `@calcom/prisma` to `{}` strips the repository of its Prisma client. DelegationCredentialRepository expects `prisma.delegationCredential.*`, so this change makes every call in the test throw instead of using prismock.</comment>

<file context>
@@ -2,22 +2,27 @@ import prismock from &quot;../../../../tests/libs/__mocks__/prisma&quot;;
+  getOrganizationRepository: () =&gt; mockOrganizationRepository,
+}));
+
+vi.mock(&quot;@calcom/prisma&quot;, () =&gt; ({
+  prisma: {},
 }));
</file context>

[cubic-dev-ai]

Rule violated: Enforce Singular Naming for Single-Item Functions

findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail returns a single organization (or null), but the plural Orgs in its name violates the “Enforce Singular Naming for Single-Item Functions” rule. Rename the method to a singular form so callers understand it only ever yields one organization.

Prompt for AI agents

Address the following comment on packages/features/ee/organizations/repositories/OrganizationRepository.ts at line 235:

<comment>`findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail` returns a single organization (or null), but the plural `Orgs` in its name violates the “Enforce Singular Naming for Single-Item Functions” rule. Rename the method to a singular form so callers understand it only ever yields one organization.</comment>

<file context>
@@ -226,9 +232,9 @@ export class OrganizationRepository {
   }
 
-  static async findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail({ email }: { email: string }) {
+  async findUniqueNonPlatformOrgsByMatchingAutoAcceptEmail({ email }: { email: string }) {
     const emailDomain = email.split(&quot;@&quot;).at(-1);
-    const orgs = await prisma.team.findMany({
</file context>