Skip to content

Commit e4c4764

Browse files
devin-ai-integration[bot]ThyMinimalDev
devin-ai-integration[bot]
and
ThyMinimalDev
authored
refactor: convert UserRepository to use dependency injection pattern (#22360)
* refactor: convert UserRepository to use dependency injection pattern - Convert all static methods to public instance methods - Add constructor that takes PrismaClient parameter - Update all usage sites to use new instantiation pattern: new UserRepository(prisma).method() - Follow same pattern as PrismaOOORepository for consistency - Maintain all existing method logic and signatures unchanged - Update 125+ files across the codebase to adapt to new pattern Co-Authored-By: morgan@cal.com <morgan@cal.com> * optimize: reuse UserRepository instances within same function scope - Create single UserRepository instance per function scope - Reuse instance for multiple method calls within same function - Reduces object instantiation overhead and improves performance - Apply optimization pattern consistently across codebase Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: repository * fixup! fix: repository * fixup! fixup! fix: repository * fixup! fixup! fixup! fix: repository * fix: update test mocking strategies for UserRepository dependency injection - Convert static method mocks to instance method mocks in userCreationService.test.ts - Update vi.spyOn calls to work with constructor injection pattern in getAllCredentials.test.ts - Fix UserRepository mocking in getRoutedUrl.test.ts to use constructor injection - Ensure consistent mocking approach across all test files - Fix 'UserRepository is not a constructor' errors in tests Co-Authored-By: morgan@cal.com <morgan@cal.com> * feat: optimize UserRepository instance reuse and add SessionUser type - Reuse UserRepository instance in OrganizationRepository.createWithNonExistentOwner - Add comprehensive SessionUser type definition for type safety - Improve type constraints in enrichUserWithTheProfile and enrichUserWithItsProfile - Ensure proper return types with profile information Co-Authored-By: morgan@cal.com <morgan@cal.com> * fix: make UserRepository mocking strategy more robust for CI environments - Add defensive checks for vi.mocked() to handle CI environment differences - Ensure mockImplementation is available before calling it - Maintain consistent mocking pattern across all test files - Fix 'Cannot read properties of undefined' error in CI Co-Authored-By: morgan@cal.com <morgan@cal.com> * fixup! fix: make UserRepository mocking strategy more robust for CI environments * refactor: convert direct UserRepository instantiations to two-step pattern - Change await new UserRepository(prisma).method(...) to const userRepo = new UserRepository(prisma); await userRepo.method(...) - Optimize instance reuse within same function scopes - Apply pattern consistently across all modified files in PR - Fix type errors in organization.ts and sessionMiddleware.ts Co-Authored-By: morgan@cal.com <morgan@cal.com> * refactor: complete two-step UserRepository pattern for remaining files - Apply two-step instantiation pattern to all remaining modified files in PR - Ensure consistent UserRepository usage across entire codebase - Maintain instance reuse optimization within function scopes Co-Authored-By: morgan@cal.com <morgan@cal.com> * chore: bump platform libs --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: morgan@cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
1 parent 89e7fca commit e4c4764

62 files changed

Lines changed: 425 additions & 209 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/api/v1/pages/api/connected-calendars/_get.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ async function getHandler(req: NextApiRequest) {
105105

106106
const userIds = req.query.userId ? extractUserIdsFromQuery(req) : [userId];
107107

108-
const usersWithCalendars = await UserRepository.findManyByIdsIncludeDestinationAndSelectedCalendars({
108+
const usersWithCalendars = await new UserRepository(
109+
prisma
110+
).findManyByIdsIncludeDestinationAndSelectedCalendars({
109111
ids: userIds,
110112
});
111113

‎apps/api/v2/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@axiomhq/winston": "^1.2.0",
3939
"@calcom/platform-constants": "*",
4040
"@calcom/platform-enums": "*",
41-
"@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.249",
41+
"@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.252",
4242
"@calcom/platform-types": "*",
4343
"@calcom/platform-utils": "*",
4444
"@calcom/prisma": "*",

‎apps/web/app/(use-page-wrapper)/apps/(homepage)/page.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { cookies, headers } from "next/headers";
44
import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";
55
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
66
import { UserRepository } from "@calcom/lib/server/repository/user";
7+
import prisma from "@calcom/prisma";
78
import type { AppCategories } from "@calcom/prisma/enums";
89

910
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
@@ -25,7 +26,8 @@ const ServerPage = async () => {
2526
const session = await getServerSession({ req });
2627
let appStore, userAdminTeamsIds: number[];
2728
if (session?.user?.id) {
28-
const userAdminTeams = await UserRepository.getUserAdminTeams(session.user.id);
29+
const userRepo = new UserRepository(prisma);
30+
const userAdminTeams = await userRepo.getUserAdminTeams({ userId: session.user.id });
2931
userAdminTeamsIds = userAdminTeams?.teams?.map(({ team }) => team.id) ?? [];
3032
appStore = await getAppRegistryWithCredentials(session.user.id, userAdminTeamsIds);
3133
} else {

‎apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequir
66
import { UsersEditView } from "@calcom/features/ee/users/pages/users-edit-view";
77
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
88
import { UserRepository } from "@calcom/lib/server/repository/user";
9+
import prisma from "@calcom/prisma";
910

1011
const userIdSchema = z.object({ id: z.coerce.number() });
1112

@@ -21,7 +22,8 @@ export const generateMetadata = async ({ params }: { params: Params }) => {
2122
);
2223
}
2324

24-
const user = await UserRepository.adminFindById(input.data.id);
25+
const userRepo = new UserRepository(prisma);
26+
const user = await userRepo.adminFindById(input.data.id);
2527

2628
return await _generateMetadata(
2729
(t) => `${t("editing_user")}: ${user.username}`,
@@ -37,7 +39,8 @@ const Page = async ({ params }: { params: Params }) => {
3739

3840
if (!input.success) throw new Error("Invalid access");
3941

40-
const user = await UserRepository.adminFindById(input.data.id);
42+
const userRepo = new UserRepository(prisma);
43+
const user = await userRepo.adminFindById(input.data.id);
4144
const t = await getTranslate();
4245

4346
return (

‎apps/web/app/api/availability/calendar/route.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { HttpError } from "@calcom/lib/http-error";
1111
import notEmpty from "@calcom/lib/notEmpty";
1212
import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
1313
import { UserRepository } from "@calcom/lib/server/repository/user";
14+
import prisma from "@calcom/prisma";
1415

1516
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
1617

@@ -29,7 +30,10 @@ async function authMiddleware() {
2930
throw new HttpError({ statusCode: 401, message: "Not authenticated" });
3031
}
3132

32-
const userWithCredentials = await UserRepository.findUserWithCredentials({ id: session.user.id });
33+
const userRepo = new UserRepository(prisma);
34+
const userWithCredentials = await userRepo.findUserWithCredentials({
35+
id: session.user.id,
36+
});
3337

3438
if (!userWithCredentials) {
3539
throw new HttpError({ statusCode: 401, message: "Not authenticated" });

‎apps/web/app/api/customer-card/route.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { z } from "zod";
88
import dayjs from "@calcom/dayjs";
99
import { timeZoneSchema } from "@calcom/lib/dayjs/timeZone.schema";
1010
import { UserRepository } from "@calcom/lib/server/repository/user";
11+
import prisma from "@calcom/prisma";
1112
import { userMetadata } from "@calcom/prisma/zod-utils";
1213

1314
import { CardComponent } from "@lib/plain/card-components";
@@ -474,7 +475,8 @@ async function handler(request: NextRequest) {
474475
// Validate request body
475476
const { cardKeys, customer } = inputSchema.parse(requestBody);
476477

477-
const user = await UserRepository.findByEmail({ email: customer.email });
478+
const userRepo = new UserRepository(prisma);
479+
const user = await userRepo.findByEmail({ email: customer.email });
478480

479481
if (!user) {
480482
return NextResponse.json({
@@ -502,7 +504,7 @@ async function handler(request: NextRequest) {
502504
}
503505

504506
// Fetch team details including userId and team name
505-
const teamMemberships = await UserRepository.findTeamsByUserId({ userId: user.id });
507+
const teamMemberships = await userRepo.findTeamsByUserId({ userId: user.id });
506508
const firstTeam = teamMemberships.teams[0] ?? null;
507509

508510
// Parse user metadata

‎apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import { STEPS } from "~/apps/installation/[[...step]]/constants";
1818
import type { OnboardingPageProps, TEventTypeGroup } from "~/apps/installation/[[...step]]/step-view";
1919

2020
const getUser = async (userId: number) => {
21-
const userAdminTeams = await UserRepository.getUserAdminTeams(userId);
21+
const userRepo = new UserRepository(prisma);
22+
const userAdminTeams = await userRepo.getUserAdminTeams({ userId });
2223

2324
if (!userAdminTeams?.id) {
2425
return null;

‎apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ async function getUserPageProps(context: GetServerSidePropsContext) {
101101

102102
name = profileUsername || username;
103103

104-
const [user] = await UserRepository.findUsersByUsername({
104+
const userRepo = new UserRepository(prisma);
105+
const [user] = await userRepo.findUsersByUsername({
105106
usernameList: [name],
106107
orgSlug: org,
107108
});

‎apps/web/lib/getting-started/[[...step]]/getServerSideProps.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type { GetServerSidePropsContext } from "next";
22

33
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
44
import { UserRepository } from "@calcom/lib/server/repository/user";
5+
import prisma from "@calcom/prisma";
56

67
export const getServerSideProps = async (context: GetServerSidePropsContext) => {
78
const { req } = context;
@@ -12,7 +13,8 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
1213
return { redirect: { permanent: false, destination: "/auth/login" } };
1314
}
1415

15-
const user = await UserRepository.findUserTeams({
16+
const userRepo = new UserRepository(prisma);
17+
const user = await userRepo.findUserTeams({
1618
id: session.user.id,
1719
});
1820

‎apps/web/lib/reschedule/[uid]/getServerSideProps.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
101101

102102
const eventType = booking.eventType ? booking.eventType : getDefaultEvent(dynamicEventSlugRef);
103103

104+
const userRepo = new UserRepository(prisma);
104105
const enrichedBookingUser = booking.user
105-
? await UserRepository.enrichUserWithItsProfile({ user: booking.user })
106+
? await userRepo.enrichUserWithItsProfile({ user: booking.user })
106107
: null;
107108

108109
const eventUrl = await buildEventUrlFromBooking({

0 commit comments

Comments
 (0)