diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx index 3db242a724..dc582367e0 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx @@ -4,7 +4,7 @@ import { unstable_cache } from "next/cache"; import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; -import { AttributeRepository } from "@calcom/lib/server/repository/attribute"; +import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository"; import { viewerTeamsRouter } from "@calcom/trpc/server/routers/viewer/teams/_router"; import { TeamMembersView } from "~/teams/team-members-view"; @@ -37,7 +37,7 @@ const getCachedTeamAttributes = unstable_cache( async (organizationId?: number) => { if (!organizationId) return []; try { - return await AttributeRepository.findAllByOrgIdWithOptions({ orgId: organizationId }); + return await PrismaAttributeRepository.findAllByOrgIdWithOptions({ orgId: organizationId }); } catch (error) { return []; } diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/page.tsx index 4fbd587558..eeb9b26b1b 100644 --- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/page.tsx @@ -3,7 +3,7 @@ import { _generateMetadata } from "app/_utils"; import { unstable_cache } from "next/cache"; import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory"; -import { AttributeRepository } from "@calcom/lib/server/repository/attribute"; +import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository"; import { viewerOrganizationsRouter } from "@calcom/trpc/server/routers/viewer/organizations/_router"; import { MembersView } from "~/members/members-view"; @@ -19,7 +19,7 @@ export const generateMetadata = async () => const getCachedAttributes = unstable_cache( async (orgId: number) => { - return await AttributeRepository.findAllByOrgIdWithOptions({ orgId }); + return await PrismaAttributeRepository.findAllByOrgIdWithOptions({ orgId }); }, undefined, { revalidate: 3600, tags: ["viewer.attributes.list"] } // Cache for 1 hour diff --git a/packages/lib/server/repository/attributeOption.ts b/packages/lib/server/repository/PrismaAttributeOptionRepository.ts similarity index 93% rename from packages/lib/server/repository/attributeOption.ts rename to packages/lib/server/repository/PrismaAttributeOptionRepository.ts index 00b5879e9b..a44b95abb9 100644 --- a/packages/lib/server/repository/attributeOption.ts +++ b/packages/lib/server/repository/PrismaAttributeOptionRepository.ts @@ -2,7 +2,7 @@ import type { Prisma } from "@prisma/client"; import prisma from "@calcom/prisma"; -export class AttributeOptionRepository { +export class PrismaAttributeOptionRepository { static async findMany({ orgId }: { orgId: number }) { return prisma.attributeOption.findMany({ where: { diff --git a/packages/lib/server/repository/attribute.ts b/packages/lib/server/repository/PrismaAttributeRepository.ts similarity index 96% rename from packages/lib/server/repository/attribute.ts rename to packages/lib/server/repository/PrismaAttributeRepository.ts index 5c0ab24ee6..e4f9d8746e 100644 --- a/packages/lib/server/repository/attribute.ts +++ b/packages/lib/server/repository/PrismaAttributeRepository.ts @@ -1,6 +1,6 @@ import prisma from "@calcom/prisma"; -export class AttributeRepository { +export class PrismaAttributeRepository { static async findManyByNamesAndOrgIdIncludeOptions({ attributeNames, orgId, diff --git a/packages/lib/server/repository/attributeToUser.ts b/packages/lib/server/repository/PrismaAttributeToUserRepository.ts similarity index 96% rename from packages/lib/server/repository/attributeToUser.ts rename to packages/lib/server/repository/PrismaAttributeToUserRepository.ts index 098956bc69..a7712a97df 100644 --- a/packages/lib/server/repository/attributeToUser.ts +++ b/packages/lib/server/repository/PrismaAttributeToUserRepository.ts @@ -2,7 +2,7 @@ import type { Prisma } from "@prisma/client"; import prisma from "@calcom/prisma"; -export class AttributeToUserRepository { +export class PrismaAttributeToUserRepository { static async createManySkipDuplicates(data: Prisma.AttributeToUserCreateManyInput[]) { return await prisma.attributeToUser.createMany({ data, skipDuplicates: true }); } diff --git a/packages/lib/service/attribute/server/assignValueToUser.ts b/packages/lib/service/attribute/server/assignValueToUser.ts index aed25d4fe0..fddd150ab8 100644 --- a/packages/lib/service/attribute/server/assignValueToUser.ts +++ b/packages/lib/service/attribute/server/assignValueToUser.ts @@ -2,8 +2,8 @@ import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; import prisma from "@calcom/prisma"; -import { AttributeRepository } from "../../../server/repository/attribute"; -import { AttributeOptionRepository } from "../../../server/repository/attributeOption"; +import { PrismaAttributeOptionRepository } from "../../../server/repository/PrismaAttributeOptionRepository"; +import { PrismaAttributeRepository } from "../../../server/repository/PrismaAttributeRepository"; import { MembershipRepository } from "../../../server/repository/membership"; import type { AttributeId, AttributeName, BulkAttributeAssigner, AttributeOptionAssignment } from "../types"; import { @@ -37,7 +37,7 @@ const findAttributesByName = async ({ orgId: number; attributeNames: AttributeName[]; }) => { - const attributesFromDb = await AttributeRepository.findManyByNamesAndOrgIdIncludeOptions({ + const attributesFromDb = await PrismaAttributeRepository.findManyByNamesAndOrgIdIncludeOptions({ attributeNames, orgId, }); @@ -325,13 +325,13 @@ const createMissingOptionsAndReturnAlongWithExisting = async < ), }); - await AttributeOptionRepository.createMany({ + await PrismaAttributeOptionRepository.createMany({ createManyInput: attributeOptionCreateManyInput, }); // We need fetch all the attribute options to ensure that we have the newly created options as well. const allAttributeOptions = ( - await AttributeOptionRepository.findMany({ + await PrismaAttributeOptionRepository.findMany({ orgId, }) ).map((attributeOption) => ({ diff --git a/packages/lib/service/attribute/server/getAttributes.ts b/packages/lib/service/attribute/server/getAttributes.ts index 678dc0e17c..d5ed1f6c4e 100644 --- a/packages/lib/service/attribute/server/getAttributes.ts +++ b/packages/lib/service/attribute/server/getAttributes.ts @@ -5,8 +5,8 @@ import prisma from "@calcom/prisma"; import type { AttributeToUser } from "@calcom/prisma/client"; import type { AttributeType } from "@calcom/prisma/enums"; -import { AttributeRepository } from "../../../server/repository/attribute"; -import { AttributeToUserRepository } from "../../../server/repository/attributeToUser"; +import { PrismaAttributeRepository } from "../../../server/repository/PrismaAttributeRepository"; +import { PrismaAttributeToUserRepository } from "../../../server/repository/PrismaAttributeToUserRepository"; import { MembershipRepository } from "../../../server/repository/membership"; import type { AttributeId } from "../types"; @@ -218,13 +218,13 @@ async function _getOrgMembershipToUserIdForTeam({ orgId, teamId }: { orgId: numb async function _queryAllData({ orgId, teamId }: { orgId: number; teamId: number }) { const [orgMembershipToUserIdForTeamMembers, attributesOfTheOrg] = await Promise.all([ _getOrgMembershipToUserIdForTeam({ orgId, teamId }), - AttributeRepository.findManyByOrgId({ orgId }), + PrismaAttributeRepository.findManyByOrgId({ orgId }), ]); const orgMembershipIds = Array.from(orgMembershipToUserIdForTeamMembers.keys()); // Get all the attributes assigned to the members of the team - const attributesToUsersForTeam = await AttributeToUserRepository.findManyByOrgMembershipIds({ + const attributesToUsersForTeam = await PrismaAttributeToUserRepository.findManyByOrgMembershipIds({ orgMembershipIds, }); diff --git a/packages/lib/service/attribute/server/utils.ts b/packages/lib/service/attribute/server/utils.ts index 4b6b5fd890..36cb0baf2e 100644 --- a/packages/lib/service/attribute/server/utils.ts +++ b/packages/lib/service/attribute/server/utils.ts @@ -1,4 +1,4 @@ -import { AttributeToUserRepository } from "../../../server/repository/attributeToUser"; +import { PrismaAttributeToUserRepository } from "../../../server/repository/PrismaAttributeToUserRepository"; export const getWhereClauseForAttributeOptionsManagedByCalcom = () => { // Neither created nor updated by DSync @@ -10,7 +10,7 @@ export const getWhereClauseForAttributeOptionsManagedByCalcom = () => { }; export const findAssignmentsForMember = async ({ memberId }: { memberId: number }) => { - const assignments = await AttributeToUserRepository.findManyIncludeAttribute({ memberId }); + const assignments = await PrismaAttributeToUserRepository.findManyIncludeAttribute({ memberId }); return assignments.map((assignment) => ({ ...assignment, attributeOption: { diff --git a/packages/trpc/server/routers/viewer/attributes/list.handler.ts b/packages/trpc/server/routers/viewer/attributes/list.handler.ts index 4bcb590b35..de02016a1d 100644 --- a/packages/trpc/server/routers/viewer/attributes/list.handler.ts +++ b/packages/trpc/server/routers/viewer/attributes/list.handler.ts @@ -1,4 +1,4 @@ -import { AttributeRepository } from "@calcom/lib/server/repository/attribute"; +import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository"; import { TRPCError } from "@trpc/server"; @@ -20,7 +20,7 @@ const listHandler = async (opts: GetOptions) => { }); } - return await AttributeRepository.findAllByOrgIdWithOptions({ orgId: org.id }); + return await PrismaAttributeRepository.findAllByOrgIdWithOptions({ orgId: org.id }); }; export default listHandler;