refactor: Move repositories from @calcom/lib to @calcom/features domain folders by hbjORbj · Pull Request #27570 · calcom/cal.com

hbjORbj · 2026-02-03T13:05:41Z

What does this PR do?

Reorganizes repository files following the vertical slice architecture pattern by moving repositories from packages/lib/server/repository/ to their respective domain folders in packages/features/.

Repositories moved:

SelectedCalendarRepository → features/selectedCalendar/repositories/
VerificationTokenRepository → features/auth/repositories/
WorkspacePlatformRepository → features/workspace-platform/repositories/
PrismaTrackingRepository → features/bookings/repositories/
RoutingFormResponseRepository → features/routing-forms/repositories/
PrismaBookingPaymentRepository → features/bookings/repositories/
DTO files → respective feature domains

Note: DestinationCalendarRepository and SelectedCalendarRepository support both static methods (for direct usage) and instance methods (for dependency injection).

- Move HolidayRepository to features/holidays/repositories - Move PrismaTrackingRepository to features/bookings/repositories - Move PrismaBookingPaymentRepository to features/bookings/repositories - Move PrismaRoutingFormResponseRepository to features/routing-forms/repositories - Move PrismaAssignmentReasonRepository to features/assignment-reason/repositories - Move VerificationTokenRepository to features/auth/repositories - Move WorkspacePlatformRepository to features/workspace-platform/repositories - Move DTO files to their respective feature domains - Merge lib DestinationCalendarRepository into features version - Merge lib SelectedCalendarRepository into features version - Update all import paths across the codebase This follows the vertical slice architecture pattern by organizing repositories by domain rather than by technical layer. Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

devin-ai-integration · 2026-02-03T13:05:46Z

🤖 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

Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

hbjORbj · 2026-02-06T06:56:17Z

packages/lib/server/repository/selectedCalendar.ts

-import { prisma } from "@calcom/prisma";
-import type { Prisma } from "@calcom/prisma/client";
-import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
-import type { SelectedCalendarEventTypeIds } from "@calcom/types/Calendar";
-
-import { buildCredentialPayloadForPrisma } from "../buildCredentialPayloadForCalendar";
-
-export type UpdateArguments = {
-  where: FindManyArgs["where"];
-  data: Prisma.SelectedCalendarUpdateManyArgs["data"];
-};
-export type FindManyArgs = {
-  // https://github.com/microsoft/TypeScript/issues/55217 It crashes atoms build with this if we become too generic here. Seems like a TS bug with complex prisma types.


Merged into packages/features/selectedCalendar/repositories/SelectedCalendarRepository.ts

…-lib-repos-to-features

hbjORbj · 2026-02-06T07:15:03Z

packages/lib/server/repository/destinationCalendar.ts

-import type { PrismaClient } from "@calcom/prisma";
-
-export class DestinationCalendarRepository {
-  constructor(private prisma: PrismaClient) {}
-
-  async getCustomReminderByCredentialId(credentialId: number): Promise<number | null> {
-    const destinationCalendar = await this.prisma.destinationCalendar.findFirst({
-      where: { credentialId },
-      select: { customCalendarReminder: true },


Merged into packages/features/calendars/repositories/DestinationCalendarRepository.ts

hbjORbj · 2026-02-06T08:43:20Z

packages/features/selectedCalendar/repositories/SelectedCalendarRepository.ts

  }
+
+  // Static methods for direct usage (from lib version)
+  private static async findConflicting(data: {


In a follow-up PR, I will turn the static methods into instance methods

hbjORbj · 2026-02-06T08:43:40Z

packages/features/calendars/repositories/DestinationCalendarRepository.ts

+  private prismaClient: PrismaClient;
+
+  constructor(prismaClient?: PrismaClient) {
+    this.prismaClient = prismaClient ?? prisma;
+  }
+
+  async getCustomReminderByCredentialId(credentialId: number): Promise<number | null> {
+    const destinationCalendar = await this.prismaClient.destinationCalendar.findFirst({
+      where: { credentialId },
+      select: { customCalendarReminder: true },
+    });
+    return destinationCalendar?.customCalendarReminder ?? null;
+  }
+
+  async updateCustomReminder({


In a follow-up PR, I will turn the static methods (the existing ones in this repository) into instance methods for consistency

cubic-dev-ai

No issues found across 75 files

hbjORbj · 2026-02-06T08:53:20Z

packages/lib/server/repository/selectedCalendar.test.ts

@@ -1,493 +0,0 @@
-import prismock from "@calcom/testing/lib/__mocks__/prisma";


Merged into packages/features/selectedCalendar/repositories/SelectedCalendarRepository.test.ts

… file Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

cubic-dev-ai

1 issue found across 4 files (changes from recent commits).

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="packages/app-store/salesforce/lib/repositories/PrismaAssignmentReasonRepository.ts">

<violation number="1">
P2: Add a `select` to limit the Prisma query to the fields actually needed (e.g., `reasonString`) to avoid fetching the full AssignmentReason row.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

packages/app-store/salesforce/lib/repositories/PrismaAssignmentReasonRepository.ts

github-actions · 2026-02-06T09:10:10Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

github-actions · 2026-02-06T09:16:06Z

E2E results are ready!

Workflow #103324.1 latest results

keithwillcode

Can you please add a new rule to disallow this moving forward?

…-lib-repos-to-features

hbjORbj · 2026-02-06T12:18:01Z

@keithwillcode Done! useFilenamingConvention rule is perfect for this but it doesn't support exclusion patterns, so I did something a bit hacky, but it achieves what we want. I basically applied an impossible regex to repository files (*Repository*, *repository*, /repository/**, /repositories/**) so they fail validation immediately.

Below is an evidence that it works:

cubic-dev-ai

1 issue found across 1 file (changes from recent commits).

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="biome.json">

<violation number="1" location="biome.json:263">
P1: Circular dependency detected: `VerificationTokenService` in `packages/lib` now imports from `packages/features`, creating a dependency cycle (`lib` → `features` → `lib`).

The refactor moved `VerificationTokenRepository` to `features`, but `VerificationTokenService` remains in `lib` and now imports the repository from `features`. This violates the architectural rule that `lib` cannot depend on `features`.

**Action Required:**
1. Move `packages/lib/server/service/VerificationTokenService.ts` (and its tests) to `packages/features/auth`.
2. Update the `noRestrictedImports` rule for `packages/lib` (lines 224-250) to explicitly ban `@calcom/features` and `@calcom/features/**` to prevent future circular dependencies via alias imports.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

biome.json

github-actions · 2026-02-06T12:21:52Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

…-lib-repos-to-features

cubic-dev-ai

1 issue found across 2 files (changes from recent commits).

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="packages/app-store/stripepayment/lib/VerificationTokenService.test.ts">

<violation number="1" location="packages/app-store/stripepayment/lib/VerificationTokenService.test.ts:3">
P2: The import path was updated to "./repositories/..." but the test still mocks "../repositories/...", so the mock no longer matches the imported module. Update the mock path to match the new import so the repository is properly mocked.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

packages/app-store/stripepayment/lib/VerificationTokenService.test.ts

github-actions · 2026-02-06T13:29:42Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

…ts rule Addresses Cubic AI review feedback (confidence 9/10): the existing noRestrictedImports rule for packages/lib only banned relative imports (../features/**) but not alias imports (@calcom/features). This could allow circular dependencies via alias imports to bypass the lint rule. Co-Authored-By: unknown <>

devin-ai-integration · 2026-02-06T13:34:34Z

Cubic AI Review Feedback - Addressed

Reviewed all Cubic AI comments and their confidence scores:

Fixed (confidence 9/10):

biome.json (Comment 16): Added @calcom/features and @calcom/features/** alias patterns to the packages/lib noRestrictedImports rule. The existing rule only banned relative imports (../features/**) but not alias imports, which could allow circular dependencies to bypass the lint check. This completes the preventive measure identified by cubic.

Skipped (confidence below 9/10):

PrismaAssignmentReasonRepository.ts (confidence 8/10): Adding select to Prisma query — already resolved as out of scope by PR author.
VerificationTokenService.test.ts (confidence 8/10): Mock path mismatch — below confidence threshold.

cubic-dev-ai

3 issues found across 1 file (changes from recent commits).

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="biome.json">

<violation number="1">
P2: Dropping the @calcom/trpc alias patterns lets lib import from trpc via package aliases, bypassing the intended circular-dependency restriction. Restore the alias patterns.</violation>

<violation number="2">
P2: This removes @calcom/features alias restrictions, allowing lib to bypass the circular-dependency guard via package imports. Keep the alias patterns in the restricted group.</violation>

<violation number="3">
P2: This change allows lib to import from app-store via @calcom/app-store aliases, which defeats the circular-dependency restriction. Keep the alias patterns so both relative and package imports are blocked.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

biome.json

github-actions · 2026-02-06T14:02:43Z

Devin AI is addressing Cubic AI's review feedback

New feedback has been sent to the existing Devin session.

View Devin Session

✅ Pushed commit 0e04c2e

…-lib-repos-to-features

pull-request-size bot added the size/XXL label Feb 3, 2026

devin-ai-integration bot and others added 3 commits February 3, 2026 13:12

fix: update VerificationTokenService import path to new location

4778816

Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

fix: resolve merge conflict in googlecalendar CalendarService

5800cae

Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

fix: update test file imports to use new repository locations

1f53e93

Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

hbjORbj added the ready-for-e2e label Feb 6, 2026

mv

0db34a7

hbjORbj commented Feb 6, 2026

View reviewed changes

hbjORbj added 2 commits February 6, 2026 15:56

fix structure

6f3ea60

Merge remote-tracking branch 'origin/main' into devin/1770121796-move…

418be34

…-lib-repos-to-features

hbjORbj commented Feb 6, 2026

View reviewed changes

fix

1f399d8

devin-ai-integration bot changed the title ~~refactor: move repositories from lib to features domain folders~~ refactor: move repositories from lib to features and app-store Feb 6, 2026

devin-ai-integration bot force-pushed the devin/1770121796-move-lib-repos-to-features branch from 671dd9b to 1f399d8 Compare February 6, 2026 08:19

devin-ai-integration bot changed the title ~~refactor: move repositories from lib to features and app-store~~ refactor: move repositories from lib to features domain folders Feb 6, 2026

hbjORbj marked this pull request as ready for review February 6, 2026 08:32

hbjORbj requested review from a team as code owners February 6, 2026 08:32

hbjORbj changed the title ~~refactor: move repositories from lib to features domain folders~~ refactor: Move repositories from @calcom/lib to @calcom/features domain folders Feb 6, 2026

graphite-app bot added foundation core area: core, team members only labels Feb 6, 2026

hbjORbj commented Feb 6, 2026

View reviewed changes

cubic-dev-ai bot reviewed Feb 6, 2026

View reviewed changes

hbjORbj commented Feb 6, 2026

View reviewed changes

refactor: merge unit tests for SelectedCalendarRepository into single…

469e324

… file Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

hbjORbj enabled auto-merge (squash) February 6, 2026 09:09

cubic-dev-ai bot reviewed Feb 6, 2026

View reviewed changes

packages/app-store/salesforce/lib/repositories/PrismaAssignmentReasonRepository.ts Show resolved Hide resolved

keithwillcode previously approved these changes Feb 6, 2026

View reviewed changes

add rule to biome

e4e69ca

hbjORbj dismissed keithwillcode’s stale review via e4e69ca February 6, 2026 12:00

hbjORbj added 2 commits February 6, 2026 21:01

Merge remote-tracking branch 'origin/main' into devin/1770121796-move…

eb0d55f

…-lib-repos-to-features

hacky way

a0c5260

hbjORbj requested a review from keithwillcode February 6, 2026 12:21

cubic-dev-ai bot reviewed Feb 6, 2026

View reviewed changes

biome.json Show resolved Hide resolved

hbjORbj added 3 commits February 6, 2026 21:27

fix

bbd632e

Merge remote-tracking branch 'origin/main' into devin/1770121796-move…

ad91001

…-lib-repos-to-features

fix

dfdfe8b

cubic-dev-ai bot reviewed Feb 6, 2026

View reviewed changes

packages/app-store/stripepayment/lib/VerificationTokenService.test.ts Show resolved Hide resolved

hbjORbj added 2 commits February 6, 2026 22:37

update

d76e107

update

90ffee4

hbjORbj force-pushed the devin/1770121796-move-lib-repos-to-features branch from 05e4f95 to 90ffee4 Compare February 6, 2026 13:56

fix

f92e7b3

cubic-dev-ai bot reviewed Feb 6, 2026

View reviewed changes

biome.json Show resolved Hide resolved

biome.json Show resolved Hide resolved

biome.json Show resolved Hide resolved

hbjORbj force-pushed the devin/1770121796-move-lib-repos-to-features branch from 40750e8 to f92e7b3 Compare February 6, 2026 14:36

Merge remote-tracking branch 'origin/main' into devin/1770121796-move…

8613306

…-lib-repos-to-features

keithwillcode approved these changes Feb 9, 2026

View reviewed changes

hbjORbj merged commit 96bec9f into main Feb 9, 2026
53 of 54 checks passed

hbjORbj deleted the devin/1770121796-move-lib-repos-to-features branch February 9, 2026 11:41

		@@ -1,493 +0,0 @@
		import prismock from "@calcom/testing/lib/__mocks__/prisma";

Conversation

hbjORbj commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Uh oh!

devin-ai-integration bot commented Feb 3, 2026

🤖 Devin AI Engineer

Uh oh!

hbjORbj Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 6, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

github-actions bot commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

keithwillcode left a comment

Choose a reason for hiding this comment

Uh oh!

hbjORbj commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 6, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 6, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

devin-ai-integration bot commented Feb 6, 2026

Cubic AI Review Feedback - Addressed

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Feb 6, 2026 • edited by devin-ai-integration bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Devin AI is addressing Cubic AI's review feedback

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

hbjORbj commented Feb 3, 2026 •

edited

Loading

hbjORbj Feb 6, 2026 •

edited

Loading

hbjORbj Feb 6, 2026 •

edited

Loading

github-actions bot commented Feb 6, 2026 •

edited

Loading

hbjORbj commented Feb 6, 2026 •

edited

Loading

github-actions bot commented Feb 6, 2026 •

edited by devin-ai-integration bot

Loading