* 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>
494 lines
16 KiB
TypeScript
494 lines
16 KiB
TypeScript
import prismock from "../../../../tests/libs/__mocks__/prisma";
|
|
|
|
import { describe, expect, it, beforeEach } from "vitest";
|
|
|
|
import type { FeatureId } from "@calcom/features/flags/config";
|
|
import { FeaturesRepository } from "@calcom/features/flags/features.repository";
|
|
import prisma from "@calcom/prisma";
|
|
import { MembershipRole } from "@calcom/prisma/enums";
|
|
|
|
import { SelectedCalendarRepository } from "./selectedCalendar";
|
|
|
|
describe("SelectedCalendarRepository", () => {
|
|
beforeEach(() => {
|
|
prismock.selectedCalendar.deleteMany();
|
|
});
|
|
|
|
describe("getNextBatchToWatch", () => {
|
|
it("excludes calendars when calendar-cache feature is disabled on a team", async () => {
|
|
const user = await prisma.user.create({
|
|
data: {
|
|
email: "calendar-cache-disabled@example.com",
|
|
username: "calendar-cache-disabled",
|
|
},
|
|
});
|
|
|
|
const team = await prisma.team.create({
|
|
data: {
|
|
name: "Calendar Cache Disabled Team",
|
|
slug: "calendar-cache-disabled-team",
|
|
},
|
|
});
|
|
|
|
await prisma.membership.create({
|
|
data: {
|
|
userId: user.id,
|
|
teamId: team.id,
|
|
role: MembershipRole.ADMIN,
|
|
accepted: true,
|
|
},
|
|
});
|
|
|
|
const featuresRepository = new FeaturesRepository(prismock);
|
|
await featuresRepository.setTeamFeatureState({
|
|
teamId: team.id,
|
|
featureId: "calendar-cache" as FeatureId,
|
|
state: "disabled",
|
|
assignedBy: "test",
|
|
});
|
|
|
|
await prisma.selectedCalendar.create({
|
|
data: {
|
|
userId: user.id,
|
|
integration: "google_calendar",
|
|
externalId: "disabled@example.com",
|
|
credentialId: 1,
|
|
},
|
|
});
|
|
|
|
const nextBatch = await SelectedCalendarRepository.getNextBatchToWatch();
|
|
|
|
expect(nextBatch).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe("create", () => {
|
|
it("should create a selected calendar", async () => {
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.create(data);
|
|
|
|
expect(result).toEqual(expect.objectContaining(data));
|
|
});
|
|
|
|
it("should throw error if we try to create a user-level calendar with same userId_integration_externalId as an existing user-level calendar", async () => {
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null,
|
|
};
|
|
|
|
await SelectedCalendarRepository.create(data);
|
|
|
|
await expect(
|
|
SelectedCalendarRepository.create({
|
|
...data,
|
|
credentialId: 2,
|
|
})
|
|
).rejects.toThrow("Selected calendar already exists");
|
|
});
|
|
|
|
it("should allow creating a user-level calendar with same userId_integration_externalId as an existing event-type level calendar", async () => {
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: 1,
|
|
};
|
|
|
|
await SelectedCalendarRepository.create(data);
|
|
|
|
const userLevelCalendarData = {
|
|
...data,
|
|
eventTypeId: null,
|
|
};
|
|
const created = await SelectedCalendarRepository.create(userLevelCalendarData);
|
|
|
|
expect(created).toEqual(expect.objectContaining(userLevelCalendarData));
|
|
});
|
|
});
|
|
|
|
describe("update", () => {
|
|
it("should update a selected calendar and return it", async () => {
|
|
const calendarToUpdate = await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
});
|
|
|
|
const updatedCalendar = await SelectedCalendarRepository.update({
|
|
where: { userId: 1, externalId: "test@gmail.com" },
|
|
data: { integration: "office365_calendar" },
|
|
});
|
|
|
|
expect(updatedCalendar.id).toBe(calendarToUpdate.id);
|
|
expect(updatedCalendar.integration).toBe("office365_calendar");
|
|
});
|
|
|
|
it("should throw error when trying to update multiple calendars", async () => {
|
|
await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test1@gmail.com",
|
|
credentialId: 1,
|
|
});
|
|
|
|
await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar2",
|
|
externalId: "test1@gmail.com",
|
|
credentialId: 2,
|
|
});
|
|
|
|
await expect(
|
|
SelectedCalendarRepository.update({
|
|
where: { userId: 1, externalId: "test1@gmail.com" },
|
|
data: { integration: "office365_calendar" },
|
|
})
|
|
).rejects.toThrow(
|
|
"Multiple SelectedCalendar records found to update. updateMany should be used instead"
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("delete", () => {
|
|
it("should delete a selected calendar and return it", async () => {
|
|
const calendar = await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
});
|
|
|
|
const deleted = await SelectedCalendarRepository.delete({
|
|
where: {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
},
|
|
});
|
|
|
|
expect(deleted).toEqual(calendar);
|
|
const result = await SelectedCalendarRepository.findFirst({
|
|
where: { id: calendar.id },
|
|
});
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
it("should throw error when trying to delete non-existent calendar", async () => {
|
|
await expect(
|
|
SelectedCalendarRepository.delete({
|
|
where: {
|
|
userId: 999,
|
|
integration: "google_calendar",
|
|
externalId: "nonexistent@gmail.com",
|
|
credentialId: 999,
|
|
},
|
|
})
|
|
).rejects.toThrow("SelectedCalendar not found");
|
|
});
|
|
});
|
|
|
|
describe("findUserLevelUniqueOrThrow", () => {
|
|
it("should find user level calendar", async () => {
|
|
const calendar = await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null, // User level calendar
|
|
});
|
|
|
|
const result = await SelectedCalendarRepository.findUserLevelUniqueOrThrow({
|
|
where: { userId: 1, externalId: "test@gmail.com" },
|
|
});
|
|
|
|
expect(result).toEqual(
|
|
expect.objectContaining({
|
|
userId: calendar.userId,
|
|
externalId: calendar.externalId,
|
|
})
|
|
);
|
|
});
|
|
|
|
it("should not find event type level calendar", async () => {
|
|
await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: 1, // Event type level calendar
|
|
});
|
|
|
|
await expect(
|
|
SelectedCalendarRepository.findUserLevelUniqueOrThrow({
|
|
where: { userId: 1, externalId: "test@gmail.com" },
|
|
})
|
|
).rejects.toThrow("SelectedCalendar not found");
|
|
});
|
|
});
|
|
|
|
describe("upsert", () => {
|
|
describe("User Level Calendar", () => {
|
|
const eventTypeId = null;
|
|
it("should update existing calendar as long as a record with same userId_integration_externalId is present for eventTypeId=null", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const updatedData = {
|
|
...initialData,
|
|
credentialId: 2,
|
|
eventTypeId,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(updatedData);
|
|
|
|
expect(result.credentialId).toBe(2);
|
|
expect(existingCalendar.id).toBe(result.id);
|
|
});
|
|
|
|
it("should create new calendar if no record with same userId_integration_externalId is present when eventTypeId=null", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const updatedData = {
|
|
...initialData,
|
|
externalId: "test2@gmail.com",
|
|
credentialId: 2,
|
|
eventTypeId,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(updatedData);
|
|
expect(await prisma.selectedCalendar.count()).toBe(2);
|
|
expect(result).toEqual(expect.objectContaining(updatedData));
|
|
expect(existingCalendar.id).not.toBe(result.id);
|
|
});
|
|
});
|
|
|
|
describe("Event Type Level Calendar", () => {
|
|
const eventTypeId = 101;
|
|
it("should update existing calendar as long as record with same userId_integration_externalId_eventTypeId is present", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const updatedData = {
|
|
...initialData,
|
|
credentialId: 2,
|
|
eventTypeId,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(updatedData);
|
|
|
|
expect(result.credentialId).toBe(2);
|
|
expect(existingCalendar.id).toBe(result.id);
|
|
});
|
|
|
|
it("should create new calendar if no record with same userId_integration_externalId_eventTypeId is present", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const updatedData = {
|
|
...initialData,
|
|
credentialId: 2,
|
|
externalId: "test2@gmail.com",
|
|
eventTypeId,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(updatedData);
|
|
expect(await prisma.selectedCalendar.count()).toBe(2);
|
|
expect(result).toEqual(expect.objectContaining(updatedData));
|
|
expect(existingCalendar.id).not.toBe(result.id);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Delegation Credential", () => {
|
|
it("should create a selected calendar with delegationCredentialId", async () => {
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
delegationCredentialId: "delegationCredential-123",
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.create(data);
|
|
|
|
expect(result).toEqual(expect.objectContaining(data));
|
|
});
|
|
|
|
describe("upsert", () => {
|
|
describe("updation", () => {
|
|
it("should update existing record with delegationCredentialId if credentialId is -1", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: -1,
|
|
delegationCredentialId: "delegationCredential-123",
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).not.toBe(null);
|
|
expect(result.id).toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(null);
|
|
expect(result.delegationCredentialId).toBe(data.delegationCredentialId);
|
|
});
|
|
|
|
it("should update existing record with credentialId if credentialId is valid(>0) even if delegationCredentialId is set", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 2,
|
|
delegationCredentialId: "delegationCredential-123",
|
|
};
|
|
const beforeDelegationCredentialId = data.delegationCredentialId;
|
|
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).not.toBe(null);
|
|
expect(result.id).toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(data.credentialId);
|
|
expect(result.delegationCredentialId).toBe(beforeDelegationCredentialId);
|
|
});
|
|
});
|
|
|
|
describe("creation", () => {
|
|
it("should create a new record with delegationCredentialId if credentialId is -1", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "anotheremail@gmail.com",
|
|
credentialId: -1,
|
|
delegationCredentialId: "delegationCredential-123",
|
|
};
|
|
|
|
// It will create a new record because of unique constraint violation
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).not.toBe(null);
|
|
expect(result.id).not.toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(null);
|
|
expect(result.delegationCredentialId).toBe(data.delegationCredentialId);
|
|
});
|
|
});
|
|
|
|
it("shouldnt update existing delegationCredentialId if upsert data doesn't have it", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
eventTypeId: null,
|
|
delegationCredentialId: "delegationCredential-123",
|
|
credentialId: 1,
|
|
};
|
|
|
|
const beforeDelegationCredentialId = initialData.delegationCredentialId;
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(existingCalendar.credentialId);
|
|
expect(result.delegationCredentialId).toBe(beforeDelegationCredentialId);
|
|
});
|
|
|
|
it("shouldnt update delegationCredentialId if it is undefined", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
eventTypeId: null,
|
|
delegationCredentialId: "delegationCredential-123",
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(existingCalendar.credentialId);
|
|
expect(result.delegationCredentialId).toBe(existingCalendar.delegationCredentialId);
|
|
});
|
|
});
|
|
});
|
|
});
|