* 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>
116 lines
4.0 KiB
TypeScript
116 lines
4.0 KiB
TypeScript
import { defaultResponderForAppDir } from "app/api/defaultResponderForAppDir";
|
|
import { cookies, headers } from "next/headers";
|
|
import type { NextRequest } from "next/server";
|
|
import { NextResponse } from "next/server";
|
|
import { z } from "zod";
|
|
|
|
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
|
|
import { CalendarCache } from "@calcom/features/calendar-cache/calendar-cache";
|
|
import { getCalendarCredentials, getConnectedCalendars } from "@calcom/lib/CalendarManager";
|
|
import { HttpError } from "@calcom/lib/http-error";
|
|
import notEmpty from "@calcom/lib/notEmpty";
|
|
import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
|
|
import { UserRepository } from "@calcom/lib/server/repository/user";
|
|
import prisma from "@calcom/prisma";
|
|
|
|
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
|
|
|
|
const selectedCalendarSelectSchema = z.object({
|
|
integration: z.string(),
|
|
externalId: z.string(),
|
|
credentialId: z.coerce.number(),
|
|
delegationCredentialId: z.string().nullish().default(null),
|
|
eventTypeId: z.coerce.number().nullish(),
|
|
});
|
|
|
|
async function authMiddleware() {
|
|
const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
|
|
|
|
if (!session?.user?.id) {
|
|
throw new HttpError({ statusCode: 401, message: "Not authenticated" });
|
|
}
|
|
|
|
const userRepo = new UserRepository(prisma);
|
|
const userWithCredentials = await userRepo.findUserWithCredentials({
|
|
id: session.user.id,
|
|
});
|
|
|
|
if (!userWithCredentials) {
|
|
throw new HttpError({ statusCode: 401, message: "Not authenticated" });
|
|
}
|
|
|
|
return userWithCredentials;
|
|
}
|
|
|
|
// TODO: It doesn't seem to be used from within the app. It is possible that someone outside Cal.com is using this GET endpoint
|
|
async function getHandler() {
|
|
const user = await authMiddleware();
|
|
|
|
const selectedCalendarIds = await SelectedCalendarRepository.findMany({
|
|
where: { userId: user.id },
|
|
select: { externalId: true },
|
|
});
|
|
// get user's credentials + their connected integrations
|
|
const calendarCredentials = getCalendarCredentials(user.credentials);
|
|
// get all the connected integrations' calendars (from third party)
|
|
const { connectedCalendars } = await getConnectedCalendars(
|
|
calendarCredentials,
|
|
user.userLevelSelectedCalendars
|
|
);
|
|
|
|
const calendars = connectedCalendars.flatMap((c) => c.calendars).filter(notEmpty);
|
|
const selectableCalendars = calendars.map((cal) => {
|
|
return { selected: selectedCalendarIds.findIndex((s) => s.externalId === cal.externalId) > -1, ...cal };
|
|
});
|
|
|
|
return NextResponse.json(selectableCalendars);
|
|
}
|
|
|
|
async function postHandler(req: NextRequest) {
|
|
const user = await authMiddleware();
|
|
|
|
const body = await req.json();
|
|
const { integration, externalId, credentialId, eventTypeId, delegationCredentialId } =
|
|
selectedCalendarSelectSchema.parse(body);
|
|
|
|
await SelectedCalendarRepository.upsert({
|
|
userId: user.id,
|
|
integration,
|
|
externalId,
|
|
credentialId,
|
|
delegationCredentialId,
|
|
eventTypeId: eventTypeId ?? null,
|
|
});
|
|
|
|
return NextResponse.json({ message: "Calendar Selection Saved" });
|
|
}
|
|
|
|
async function deleteHandler(req: NextRequest) {
|
|
const user = await authMiddleware();
|
|
const searchParams = Object.fromEntries(req.nextUrl.searchParams.entries());
|
|
|
|
const { integration, externalId, credentialId, eventTypeId } =
|
|
selectedCalendarSelectSchema.parse(searchParams);
|
|
|
|
const calendarCacheRepository = await CalendarCache.initFromCredentialId(credentialId);
|
|
await calendarCacheRepository.unwatchCalendar({
|
|
calendarId: externalId,
|
|
eventTypeIds: [eventTypeId ?? null],
|
|
});
|
|
|
|
await SelectedCalendarRepository.delete({
|
|
where: {
|
|
userId: user.id,
|
|
externalId,
|
|
integration,
|
|
eventTypeId: eventTypeId ?? null,
|
|
},
|
|
});
|
|
|
|
return NextResponse.json({ message: "Calendar Selection Saved" });
|
|
}
|
|
|
|
export const POST = defaultResponderForAppDir(postHandler);
|
|
export const DELETE = defaultResponderForAppDir(deleteHandler);
|
|
export const GET = defaultResponderForAppDir(getHandler);
|