feat: implement FeatureOptInService (#25805)

* feat: implement FeatureOptInService WIP

* clean up

* feat: consolidate feature repositories and add updateFeatureForUser

- Implement updateFeatureForUser in FeaturesRepository (similar to updateFeatureForTeam)
- Move getUserFeatureState and getTeamFeatureState from PrismaFeatureOptInRepository to FeaturesRepository
- Update FeatureOptInService to use only FeaturesRepository
- Add setUserFeatureState and setTeamFeatureState methods to FeatureOptInService
- Update _router.ts to remove PrismaFeatureOptInRepository usage
- Remove PrismaFeatureOptInRepository.ts and FeatureOptInRepositoryInterface.ts
- Update features.repository.interface.ts and features.repository.mock.ts
- Add integration tests for updateFeatureForUser, getUserFeatureState, getTeamFeatureState
- Update service.integration-test.ts to use FeaturesRepository

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

* refactor: rename updateFeatureForUser to setUserFeatureState

Rename to match the convention used for setTeamFeatureState

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

* refactor: return FeatureState type from getUserFeatureState and getTeamFeatureState

* fix integration tests

* clean up logics

* update services and router

* refactor: change getUserFeatureState and getTeamFeatureState to accept featureIds array

- Renamed getUserFeatureState to getUserFeatureStates
- Renamed getTeamFeatureState to getTeamFeatureStates
- Changed parameter from featureId: string to featureIds: string[]
- Changed return type from FeatureState to Record<string, FeatureState>
- Updated FeatureOptInService to use the new batch methods
- Added tests for querying multiple features in a single call
- Optimized listFeaturesForTeam to fetch all feature states in one query

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

* feat: add getFeatureStateForTeams for batch querying multiple teams

- Added getFeatureStateForTeams method to query a single feature across multiple teams in one call
- Updated FeatureOptInService.resolveFeatureStateAcrossTeams to use the new batch method
- Replaces N+1 queries with a single database query for team states
- Added comprehensive integration tests for the new method

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

* refactor: combine org and team state queries into single call

- Include orgId in the teamIds array passed to getFeatureStateForTeams
- Extract org state and team states from the combined result
- Reduces database queries from 3 to 2 in resolveFeatureStateAcrossTeams

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

* refactor: use team.isOrganization and clarify computeEffectiveState comment

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

* refactor: use MembershipRepository.findAllByUserId with isOrganization

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

* feat: add featureId validation using isOptInFeature type guard

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

* less queries

* add fallback value

* fix type error

* move files

* add autoOptInFeatures column

* use autoOptInFeatures flag within FeatureOptInService

* add setUserAutoOptIn and setTeamAutoOptIn

* fix computeEffectiveState logic

* rewrite computeEffectiveState

* clean up integration tests

* clean up in afterEach

* fix type error

* refactor: use FeaturesRepository methods instead of direct Prisma calls

Replace all manual userFeatures and teamFeatures Prisma operations with
the new setUserFeatureState and setTeamFeatureState repository methods.

Changes include:
- Admin handlers (assignFeatureToTeam, unassignFeatureFromTeam)
- Test fixtures and integration tests
- Playwright fixtures
- Development scripts

This ensures consistent feature flag management through the repository
pattern and supports the new tri-state semantics (enabled/disabled/inherit).

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

* clean up

* fix the logic

* extract some logic into applyAutoOptIn()

* remove wrong code

* refactor: convert setUserFeatureState and setTeamFeatureState to object params with discriminated union

- Convert multiple positional parameters to single object parameter
- Use discriminated union types: assignedBy required for enabled/disabled, omitted for inherit
- Update all callers across repository, service, handlers, fixtures, and tests

* fix type error

* use Promise.all

* fix

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
Eunjae Lee
2026-01-06 16:55:53 +01:00
committed by GitHub
co-authored by Devin AI
parent 750408ec21
commit f4248bf20d
35 changed files with 3564 additions and 450 deletions
@@ -7,6 +7,9 @@ const { PrismaClient } = require("@prisma/client");
const prisma = new PrismaClient();
async function main() {
// Dynamic import for ES module
const { FeaturesRepository } = await import("@calcom/features/flags/features.repository");
const featuresRepository = new FeaturesRepository(prisma);
// Parse newEmail from args
const newEmail = process.argv[2] || "hariom@cal.com";
console.log(`Using newEmail: ${newEmail}`);
@@ -59,14 +62,11 @@ async function main() {
},
});
if (!delegationFeature) {
await prisma.teamFeatures.create({
data: {
teamId: org.id,
featureId: "delegation-credential",
assignedAt: new Date(),
assignedBy: "prepare-local-script",
enabled: true,
},
await featuresRepository.setTeamFeatureState({
teamId: org.id,
featureId: "delegation-credential",
state: "enabled",
assignedBy: "prepare-local-script",
});
console.log("Created TeamFeatures: delegation-credential");
} else {
@@ -84,14 +84,11 @@ async function main() {
},
});
if (!calendarCacheFeature) {
await prisma.teamFeatures.create({
data: {
teamId: org.id,
featureId: "calendar-cache",
assignedAt: new Date(),
assignedBy: "prepare-local-script",
enabled: true,
},
await featuresRepository.setTeamFeatureState({
teamId: org.id,
featureId: "calendar-cache",
state: "enabled",
assignedBy: "prepare-local-script",
});
console.log("Created TeamFeatures: calendar-cache");
} else {
+8 -8
View File
@@ -1,5 +1,7 @@
import { uuid } from "short-uuid";
import type { FeatureId } from "@calcom/features/flags/config";
import { FeaturesRepository } from "@calcom/features/flags/features.repository";
import { hashPassword } from "@calcom/lib/auth/hashPassword";
import { DEFAULT_SCHEDULE, getAvailabilityFromSchedule } from "@calcom/lib/availability";
import prisma from "@calcom/prisma";
@@ -51,14 +53,12 @@ export async function createPBACOrganization() {
});
// Add the feature flag
await prisma.teamFeatures.create({
data: {
featureId: "pbac",
teamId: organization.id,
assignedBy: "system (Seed script)",
assignedAt: new Date(),
enabled: true,
},
const featuresRepository = new FeaturesRepository(prisma);
await featuresRepository.setTeamFeatureState({
teamId: organization.id,
featureId: "pbac" as FeatureId,
state: "enabled",
assignedBy: "system (Seed script)",
});
console.log(`✅ Created organization: ${organization.name} (ID: ${organization.id})`);