refactor: split flag repositories into Prisma and Cached layers #27186

eunjae-lee · 2026-01-23T10:46:43Z

What does this PR do?

Splits the three flag repositories into raw Prisma repositories and cached repositories that wrap them:

FeatureRepository → PrismaFeatureRepository + CachedFeatureRepository
TeamFeatureRepository → PrismaTeamFeatureRepository + CachedTeamFeatureRepository
UserFeatureRepository → PrismaUserFeatureRepository + CachedUserFeatureRepository

The Prisma repositories contain only raw database access logic. The Cached repositories wrap the Prisma ones and add @Memoize/@Unmemoize decorators for caching behavior.

Architecture:

Container → CachedRepository (with @Memoize/@Unmemoize) → PrismaRepository → Prisma

New repository methods added:

CachedFeatureRepository: findBySlug(), update(), checkIfFeatureIsEnabledGlobally()
CachedTeamFeatureRepository: checkIfTeamHasFeature(), getEnabledFeatures()
CachedUserFeatureRepository: checkIfUserHasFeature(), checkIfUserHasFeatureNonHierarchical()

Updates since last revision

Added explicit select clauses to PrismaFeatureRepository queries (findAll, findBySlug, update) to only fetch fields needed for FeatureDto
Optimized PrismaUserFeatureRepository.findByUserIdAndFeatureIds to use single findMany query instead of multiple findUnique calls
Removed integration tests for methods intentionally removed from FeaturesRepository: getUserFeatureStates, getTeamsFeatureStates, getUserAutoOptIn, getTeamsAutoOptIn, setUserAutoOptIn, setTeamAutoOptIn
Added comprehensive unit tests for CachedUserFeatureRepository
Fixed cache invalidation: update() now invalidates both KEY.bySlug and KEY.all() caches
Fixed cache invalidation: upsert() and delete() now invalidate KEY.enabledFeatures cache
Fixed flaky InsightsBookingService.integration-test.ts by adding orderBy: { id: "asc" } to TeamRepository.findAllByParentId

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - internal refactor only.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Run the existing unit tests: TZ=UTC yarn vitest run packages/features/flags/repositories/__tests__/
Verify type checking passes: yarn type-check:ci --force
The DI containers still return the same interface types, so existing functionality should work unchanged

Human Review Checklist

Verify select clauses in PrismaFeatureRepository include all fields needed for FeatureDto (slug, enabled, description, type, stale, lastUsedAt, createdAt, updatedAt, updatedBy)
Verify @Memoize decorator accepts direct function references (e.g., KEY.all vs () => KEY.all())
Verify cache keys in Cached repositories match the original keys exactly
Verify DI wiring: containers load CachedRepository modules which load PrismaRepository modules
Verify update() invalidates both KEY.bySlug and KEY.all() to prevent stale findAll() results
Verify upsert() and delete() invalidate KEY.enabledFeatures to prevent stale getEnabledFeatures() results
Verify removed integration tests correspond to methods actually removed from FeaturesRepository

Checklist

I have read the contributing guide
My code follows the style guidelines of this project
I have checked if my changes generate no new warnings
My PR is appropriately sized

Link to Devin run: https://app.devin.ai/sessions/e0bf0feaf39846299dd43299f34da7b6
Requested by: @eunjae-lee

@memoize

- Rename FeatureRepository to PrismaFeatureRepository (raw DB access) - Rename TeamFeatureRepository to PrismaTeamFeatureRepository (raw DB access) - Rename UserFeatureRepository to PrismaUserFeatureRepository (raw DB access) - Create CachedFeatureRepository with @memoize wrapping PrismaFeatureRepository - Create CachedTeamFeatureRepository with @Memoize/@Unmemoize wrapping PrismaTeamFeatureRepository - Create CachedUserFeatureRepository with @Memoize/@Unmemoize wrapping PrismaUserFeatureRepository - Update DI tokens, modules, and containers for all 6 repositories - Update imports in FeatureOptInService and related modules - Update tests to use new repository structure Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

devin-ai-integration · 2026-01-23T10:46: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

@memoize

…o Prisma - Use direct function references for @memoize key (e.g., KEY.all instead of () => KEY.all()) - Simplify batch methods in Cached repositories to delegate to Prisma repository - Update tests to reflect the new delegation pattern Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

cubic-dev-ai

No issues found across 20 files

github-actions · 2026-01-23T13:52:10Z

E2E results are ready!

Workflow #101056.1 latest results

…c results Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

volnei

Left a comment

eunjae-lee · 2026-01-24T07:16:50Z

Left a comment

I can't... see any comment! Did you submit the review?

feedback is not showing here

cubic-dev-ai

No issues found across 22 files

…methods (#27195) * refactor: cleanup features repository and add findBySlug, update methods - Remove unused methods from FeaturesRepository (keep getTeamsWithFeatureEnabled) - Add findAll(), findBySlug(), update() to IFeatureRepository interface - Add findAll() with caching to CachedFeatureRepository - Add findBySlug() with caching to CachedFeatureRepository - Add update() with Unmemoize to CachedFeatureRepository - Add checkIfFeatureIsEnabledGlobally() to CachedFeatureRepository - Update toggleFeatureFlag.handler.ts to use repository instead of raw Prisma - Add comprehensive unit tests for all new methods Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: update updatedAt timestamp in feature update method Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: move feature check methods to specialized repositories - Replace getUserFeaturesStatus with two checkIfUserHasFeature calls in bookings page - Move checkIfTeamHasFeature to PrismaTeamFeatureRepository with pass-through in CachedTeamFeatureRepository - Move checkIfUserHasFeature and checkIfUserHasFeatureNonHierarchical to PrismaUserFeatureRepository with pass-throughs in CachedUserFeatureRepository - Add getEnabledFeatures to PrismaTeamFeatureRepository with caching in CachedTeamFeatureRepository - Keep FeaturesRepository methods as pass-throughs for backward compatibility - Update test to expect updatedAt in feature update Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * refactor: remove getUserFeaturesStatus and unused methods from FeaturesRepository Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * restore comment * fix: invalidate all-features cache on update and enabledFeatures cache on upsert/delete - CachedFeatureRepository: Add KEY.all() to @Unmemoize keys in update() to prevent stale findAll() results - CachedTeamFeatureRepository: Add KEY.enabledFeatures(teamId) to @Unmemoize keys in upsert() and delete() to prevent stale getEnabledFeatures() results Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Add comprehensive tests for CachedUserFeatureRepository covering: - findByUserIdAndFeatureId (cache hit, cache miss, not found) - findByUserIdAndFeatureIds (empty input, multiple features) - upsert (with cache invalidation) - delete (with cache invalidation) - findAutoOptInByUserId (cache hit, cache miss, not found) - setAutoOptIn (with cache invalidation) Co-Authored-By: unknown <>

…t-manager.devin.ai/proxy/github.com/calcom/cal.com into devin/1769164663-split-flag-repositories

eunjae-lee · 2026-01-26T14:22:23Z

@cubic-dev-ai review this PR

cubic-dev-ai · 2026-01-26T14:22:29Z

@cubic-dev-ai review this PR

@eunjae-lee I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

2 issues found across 29 files

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/features/flags/repositories/PrismaFeatureRepository.ts">

<violation number="1" location="packages/features/flags/repositories/PrismaFeatureRepository.ts:20">
P2: Limit Prisma reads to the fields you return by adding a `select` clause here to avoid fetching unused columns.</violation>

<violation number="2" location="packages/features/flags/repositories/PrismaFeatureRepository.ts:37">
P2: Add a `select` clause to fetch only the fields used in the returned DTO.</violation>
</file>

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

packages/features/flags/repositories/PrismaFeatureRepository.ts

github-actions · 2026-01-26T14:33:00Z

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

sean-brydon · 2026-01-26T14:31:51Z

packages/features/flags/repositories/PrismaUserFeatureRepository.ts

+  async findByUserIdAndFeatureIds(
+    userId: number,
+    featureIds: FeatureId[]
+  ): Promise<Partial<Record<FeatureId, UserFeaturesDto>>> {
+    const results = await Promise.all(
+      featureIds.map(async (featureId) => {
+        const userFeature = await this.findByUserIdAndFeatureId(userId, featureId);
+        return { featureId, userFeature };
+      })
+    );
+
+    const result: Partial<Record<FeatureId, UserFeaturesDto>> = {};
+    for (const { featureId, userFeature } of results) {
+      if (userFeature !== null) {
+        result[featureId] = userFeature;
+      }
+    }
+
+    return result;
+  }


We should 100% use a find Many here this is a N+1 query.

const userFeatures = await this.prisma.userFeatures.findMany({ where: { userId, featureId: { in: featureIds } } });

fixed: 2bec5d2

sean-brydon · 2026-01-26T14:32:29Z

packages/features/flags/repositories/CachedTeamFeatureRepository.ts

+  async findByTeamIdsAndFeatureIds(
+    teamIds: number[],
+    featureIds: FeatureId[]
+  ): Promise<Partial<Record<FeatureId, Record<number, TeamFeaturesDto>>>> {
+    return this.prismaTeamFeatureRepository.findByTeamIdsAndFeatureIds(teamIds, featureIds);
+  }


Is this meant to bypass cache?

it's a combination of teamId x featureId. So I think it's quite tricky to invalidate this. Unless we scan the existing keys, it's hard to know which keys to invalidate when something happens to a certain teamId or a certain featureId. And once it happens, we need to find all the keys of teamId x featureId. It seemed too complex. But I'm happy to iterate on this if you have a good idea.

packages/features/flags/repositories/CachedFeatureRepository.ts

Remove integration tests for methods that were intentionally removed: - getUserFeatureStates - getTeamsFeatureStates - getUserAutoOptIn - getTeamsAutoOptIn - setUserAutoOptIn - setTeamAutoOptIn Co-Authored-By: unknown <>

…:calcom/cal.com into devin/1769164663-split-flag-repositories

- Add explicit select clauses to findAll, findBySlug, and update methods - Only fetch fields needed for FeatureDto (slug, enabled, description, type, stale, lastUsedAt, createdAt, updatedAt, updatedBy) - Update tests to expect select clauses - Fix UserFeatureRepository test to use findMany mock Co-Authored-By: unknown <>

cubic-dev-ai

No issues found across 30 files

apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx

cubic-dev-ai

No issues found across 30 files

addressed

devin-ai-integration

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no potential bugs to report.

View in Devin Review to see 5 additional flags.

apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx

sean-brydon

Tested works very well - love this approach.

pull-request-size bot added the size/L label Jan 23, 2026

eunjae-lee marked this pull request as ready for review January 23, 2026 13:41

eunjae-lee added the ready-for-e2e label Jan 23, 2026

graphite-app bot added consumer core area: core, team members only labels Jan 23, 2026

graphite-app bot requested a review from a team January 23, 2026 13:41

cubic-dev-ai bot reviewed Jan 23, 2026

View reviewed changes

fix: add orderBy to TeamRepository.findAllByParentId for deterministi…

b286ed2

…c results Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

graphite-app bot requested a review from a team January 23, 2026 13:58

test: update TeamRepository test to expect orderBy in findAllByParentId

303fd40

Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

eunjae-lee mentioned this pull request Jan 23, 2026

refactor: cleanup features repository and add specialized repository methods #27195

Merged

7 tasks

volnei previously requested changes Jan 24, 2026

View reviewed changes

github-actions bot marked this pull request as draft January 24, 2026 00:16

eunjae-lee marked this pull request as ready for review January 26, 2026 13:51

eunjae-lee requested a review from volnei January 26, 2026 13:52

cubic-dev-ai bot reviewed Jan 26, 2026

View reviewed changes

pull-request-size bot added size/XXL and removed size/L labels Jan 26, 2026

devin-ai-integration bot added 2 commits January 26, 2026 14:15

Merge branch 'devin/1769164663-split-flag-repositories' of https://gi…

adbc122

…t-manager.devin.ai/proxy/github.com/calcom/cal.com into devin/1769164663-split-flag-repositories

cubic-dev-ai bot reviewed Jan 26, 2026

View reviewed changes

packages/features/flags/repositories/PrismaFeatureRepository.ts Show resolved Hide resolved

packages/features/flags/repositories/PrismaFeatureRepository.ts Show resolved Hide resolved

sean-brydon previously requested changes Jan 26, 2026

View reviewed changes

github-actions bot marked this pull request as draft January 26, 2026 14:34

devin-ai-integration bot and others added 3 commits January 26, 2026 14:43

test: remove tests for methods removed from FeaturesRepository

5ac123e

Remove integration tests for methods that were intentionally removed: - getUserFeatureStates - getTeamsFeatureStates - getUserAutoOptIn - getTeamsAutoOptIn - setUserAutoOptIn - setTeamAutoOptIn Co-Authored-By: unknown <>

avoid N+1 query

2bec5d2

Merge branch 'devin/1769164663-split-flag-repositories' of github.com…

31de913

…:calcom/cal.com into devin/1769164663-split-flag-repositories

eunjae-lee removed the ready-for-e2e label Jan 26, 2026

eunjae-lee added the ready-for-e2e label Jan 26, 2026

eunjae-lee marked this pull request as ready for review January 26, 2026 15:17

cubic-dev-ai bot reviewed Jan 26, 2026

View reviewed changes

hbjORbj previously requested changes Jan 28, 2026

View reviewed changes

apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx Outdated Show resolved Hide resolved

github-actions bot marked this pull request as draft January 28, 2026 12:16

eunjae-lee marked this pull request as ready for review January 29, 2026 14:17

Merge branch 'main' into devin/1769164663-split-flag-repositories

a9b9c96

cubic-dev-ai bot reviewed Jan 29, 2026

View reviewed changes

fix bad conflict resolved

7ddc5c4

devin-ai-integration bot reviewed Jan 30, 2026

View reviewed changes

sean-brydon reviewed Jan 30, 2026

View reviewed changes

apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx Outdated Show resolved Hide resolved

use userId

351abc1

sean-brydon approved these changes Feb 2, 2026

View reviewed changes

eunjae-lee merged commit 29ec2b9 into main Feb 2, 2026
53 checks passed

eunjae-lee deleted the devin/1769164663-split-flag-repositories branch February 2, 2026 13:26

devin-ai-integration bot mentioned this pull request Feb 2, 2026

refactor: replace the legacy feature repository usages #27200

Draft

3 tasks

refactor: split flag repositories into Prisma and Cached layers #27186

refactor: split flag repositories into Prisma and Cached layers #27186

Uh oh!

Conversation

eunjae-lee commented Jan 23, 2026 • edited by devin-ai-integration bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Updates since last revision

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Human Review Checklist

Checklist

Uh oh!

devin-ai-integration bot commented Jan 23, 2026

🤖 Devin AI Engineer

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

E2E results are ready!

Uh oh!

volnei left a comment

Choose a reason for hiding this comment

Uh oh!

eunjae-lee commented Jan 24, 2026

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

eunjae-lee commented Jan 26, 2026

Uh oh!

cubic-dev-ai bot commented Jan 26, 2026

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 26, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

sean-brydon Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

eunjae-lee Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

eunjae-lee Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

sean-brydon Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

eunjae-lee Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

devin-ai-integration bot left a comment

Choose a reason for hiding this comment

✅ Devin Review: No Issues Found

Uh oh!

Uh oh!

sean-brydon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

eunjae-lee commented Jan 23, 2026 •

edited by devin-ai-integration bot

Loading

github-actions bot commented Jan 23, 2026 •

edited

Loading