mirror of
https://github.com/hanzoai/calendar.git
synced 2026-09-24 22:42:24 +00:00
f4248bf20d
* 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: [email protected] <[email protected]> * refactor: rename updateFeatureForUser to setUserFeatureState Rename to match the convention used for setTeamFeatureState Co-Authored-By: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * refactor: use team.isOrganization and clarify computeEffectiveState comment Co-Authored-By: [email protected] <[email protected]> * refactor: use MembershipRepository.findAllByUserId with isOrganization Co-Authored-By: [email protected] <[email protected]> * feat: add featureId validation using isOptInFeature type guard Co-Authored-By: [email protected] <[email protected]> * 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: [email protected] <[email protected]> * 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>
72 lines
2.4 KiB
TypeScript
72 lines
2.4 KiB
TypeScript
import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
|
|
import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
|
|
import { TestingModule } from "@nestjs/testing";
|
|
|
|
import type { FeatureId } from "@calcom/features/flags/config";
|
|
import { FeaturesRepository } from "@calcom/features/flags/features.repository";
|
|
import type { Prisma } from "@calcom/prisma/client";
|
|
|
|
export class FeaturesRepositoryFixture {
|
|
private prismaReadClient: PrismaReadService["prisma"];
|
|
private prismaWriteClient: PrismaWriteService["prisma"];
|
|
private featuresRepository: FeaturesRepository;
|
|
|
|
constructor(module: TestingModule) {
|
|
this.prismaReadClient = module.get(PrismaReadService).prisma;
|
|
this.prismaWriteClient = module.get(PrismaWriteService).prisma;
|
|
this.featuresRepository = new FeaturesRepository(this.prismaWriteClient);
|
|
}
|
|
async create(data: Prisma.FeatureCreateInput) {
|
|
// note(Lauris): upserting because this create function is called in multiple tests in parallel and otherwise would lead to unique
|
|
// key constraint violation.
|
|
return await this.prismaWriteClient.feature.upsert({
|
|
where: { slug: data.slug },
|
|
create: data,
|
|
update: {},
|
|
});
|
|
}
|
|
|
|
async setTeamFeatureState(
|
|
input:
|
|
| { teamId: number; featureId: string; state: "enabled" | "disabled"; assignedBy?: string }
|
|
| { teamId: number; featureId: string; state: "inherit" }
|
|
) {
|
|
if (input.state === "inherit") {
|
|
await this.featuresRepository.setTeamFeatureState({
|
|
teamId: input.teamId,
|
|
featureId: input.featureId as FeatureId,
|
|
state: input.state,
|
|
});
|
|
} else {
|
|
await this.featuresRepository.setTeamFeatureState({
|
|
teamId: input.teamId,
|
|
featureId: input.featureId as FeatureId,
|
|
state: input.state,
|
|
assignedBy: input.assignedBy ?? "test",
|
|
});
|
|
}
|
|
}
|
|
|
|
async disableFeatureForTeam(teamId: number, featureSlug: string) {
|
|
await this.featuresRepository.setTeamFeatureState({
|
|
teamId,
|
|
featureId: featureSlug as FeatureId,
|
|
state: "inherit",
|
|
});
|
|
}
|
|
|
|
async deleteBySlug(slug: string) {
|
|
return await this.prismaWriteClient.feature.delete({
|
|
where: { slug },
|
|
});
|
|
}
|
|
|
|
async deleteTeamFeature(teamId: number, featureSlug: string) {
|
|
await this.featuresRepository.setTeamFeatureState({
|
|
teamId,
|
|
featureId: featureSlug as FeatureId,
|
|
state: "inherit",
|
|
});
|
|
}
|
|
}
|