diff --git a/apps/api/v1/lib/helpers/rateLimitApiKey.test.ts b/apps/api/v1/lib/helpers/rateLimitApiKey.test.ts index 3b57cfeb4f..86dfc51d05 100644 --- a/apps/api/v1/lib/helpers/rateLimitApiKey.test.ts +++ b/apps/api/v1/lib/helpers/rateLimitApiKey.test.ts @@ -30,7 +30,7 @@ describe("rateLimitApiKey middleware", () => { query: {}, userId: testUserId, }); - + // eslint-disable-next-line @typescript-eslint/no-explicit-any await rateLimitApiKey(req, res, vi.fn() as any); expect(res._getStatusCode()).toBe(401); @@ -43,7 +43,7 @@ describe("rateLimitApiKey middleware", () => { query: { apiKey: "test-key" }, userId: testUserId, }); - + // eslint-disable-next-line @typescript-eslint/no-explicit-any (checkRateLimitAndThrowError as any).mockResolvedValueOnce({ limit: 100, remaining: 99, @@ -51,6 +51,7 @@ describe("rateLimitApiKey middleware", () => { }); // @ts-expect-error weird typing between middleware and createMocks + // eslint-disable-next-line @typescript-eslint/no-explicit-any await rateLimitApiKey(req, res, vi.fn() as any); expect(checkRateLimitAndThrowError).toHaveBeenCalledWith({ @@ -74,15 +75,14 @@ describe("rateLimitApiKey middleware", () => { success: true, }; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // eslint-disable-next-line @typescript-eslint/no-explicit-any (checkRateLimitAndThrowError as any).mockImplementationOnce( ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => { onRateLimiterResponse(rateLimiterResponse); } ); - // @ts-expect-error weird typing between middleware and createMocks + // eslint-disable-next-line @typescript-eslint/no-explicit-any await rateLimitApiKey(req, res, vi.fn() as any); expect(res.getHeader("X-RateLimit-Limit")).toBe(rateLimiterResponse.limit); @@ -96,10 +96,11 @@ describe("rateLimitApiKey middleware", () => { query: { apiKey: "test-key" }, userId: testUserId, }); - + // eslint-disable-next-line @typescript-eslint/no-explicit-any (checkRateLimitAndThrowError as any).mockRejectedValue(new Error("Rate limit exceeded")); // @ts-expect-error weird typing between middleware and createMocks + // eslint-disable-next-line @typescript-eslint/no-explicit-any await rateLimitApiKey(req, res, vi.fn() as any); expect(res._getStatusCode()).toBe(429); @@ -121,6 +122,7 @@ describe("rateLimitApiKey middleware", () => { }; // Mock rate limiter to trigger the onRateLimiterResponse callback + // eslint-disable-next-line @typescript-eslint/no-explicit-any (checkRateLimitAndThrowError as any).mockImplementationOnce( ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => { onRateLimiterResponse(rateLimiterResponse); @@ -131,6 +133,7 @@ describe("rateLimitApiKey middleware", () => { vi.mocked(handleAutoLock).mockResolvedValueOnce(true); // @ts-expect-error weird typing between middleware and createMocks + // eslint-disable-next-line @typescript-eslint/no-explicit-any await rateLimitApiKey(req, res, vi.fn() as any); expect(handleAutoLock).toHaveBeenCalledWith({ @@ -158,6 +161,7 @@ describe("rateLimitApiKey middleware", () => { }; // Mock rate limiter to trigger the onRateLimiterResponse callback + // eslint-disable-next-line @typescript-eslint/no-explicit-any (checkRateLimitAndThrowError as any).mockImplementationOnce( ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => { onRateLimiterResponse(rateLimiterResponse); @@ -168,6 +172,7 @@ describe("rateLimitApiKey middleware", () => { vi.mocked(handleAutoLock).mockRejectedValueOnce(new Error("No user found for this API key.")); // @ts-expect-error weird typing between middleware and createMocks + // eslint-disable-next-line @typescript-eslint/no-explicit-any await rateLimitApiKey(req, res, vi.fn() as any); expect(handleAutoLock).toHaveBeenCalledWith({ @@ -195,6 +200,7 @@ describe("rateLimitApiKey middleware", () => { }; // Mock rate limiter to trigger the onRateLimiterResponse callback + // eslint-disable-next-line @typescript-eslint/no-explicit-any (checkRateLimitAndThrowError as any).mockImplementationOnce( ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => { onRateLimiterResponse(rateLimiterResponse); @@ -235,6 +241,7 @@ describe("rateLimitApiKey middleware", () => { ); // @ts-expect-error weird typing between middleware and createMocks + // eslint-disable-next-line @typescript-eslint/no-explicit-any await rateLimitApiKey(req, res, vi.fn() as any); expect(res._getStatusCode()).toBe(429); diff --git a/apps/api/v1/pages/api/bookings/[id]/_get.ts b/apps/api/v1/pages/api/bookings/[id]/_get.ts index 8d514fcbe0..a5105c01e7 100644 --- a/apps/api/v1/pages/api/bookings/[id]/_get.ts +++ b/apps/api/v1/pages/api/bookings/[id]/_get.ts @@ -102,8 +102,11 @@ export async function getHandler(req: NextApiRequest) { const booking = await prisma.booking.findUnique({ where: { id }, include: { + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true attendees: true, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true user: true, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true payment: true, eventType: expand.includes("team") ? { include: { team: true } } : false, }, diff --git a/apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts b/apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts index 7aee663c87..1061db265b 100644 --- a/apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts +++ b/apps/api/v1/pages/api/bookings/[id]/recordings/_get.ts @@ -63,6 +63,7 @@ export async function getHandler(req: NextApiRequest) { const booking = await prisma.booking.findUnique({ where: { id }, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true include: { references: true }, }); diff --git a/apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts b/apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts index 9cf5c2e30b..ca89c239bc 100644 --- a/apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts +++ b/apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts @@ -61,6 +61,7 @@ export async function getHandler(req: NextApiRequest) { const checkIfRecordingBelongsToBooking = async (bookingId: number, recordingId: string) => { const booking = await prisma.booking.findUnique({ where: { id: bookingId }, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true include: { references: true }, }); diff --git a/apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts b/apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts index 821f2ec2f2..a3cb57b14e 100644 --- a/apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts +++ b/apps/api/v1/pages/api/bookings/[id]/transcripts/_get.ts @@ -44,6 +44,7 @@ export async function getHandler(req: NextApiRequest) { const booking = await prisma.booking.findUnique({ where: { id }, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true include: { references: true }, }); diff --git a/apps/api/v1/pages/api/destination-calendars/[id]/_patch.ts b/apps/api/v1/pages/api/destination-calendars/[id]/_patch.ts index bc213880f5..ff2c74718a 100644 --- a/apps/api/v1/pages/api/destination-calendars/[id]/_patch.ts +++ b/apps/api/v1/pages/api/destination-calendars/[id]/_patch.ts @@ -1,7 +1,10 @@ import type { NextApiRequest } from "next"; import type { z } from "zod"; -import { getCalendarCredentialsWithoutDelegation, getConnectedCalendars } from "@calcom/lib/CalendarManager"; +import { + getCalendarCredentialsWithoutDelegation, + getConnectedCalendars, +} from "@calcom/features/calendars/lib/CalendarManager"; import { HttpError } from "@calcom/lib/http-error"; import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; diff --git a/apps/api/v1/pages/api/destination-calendars/_post.ts b/apps/api/v1/pages/api/destination-calendars/_post.ts index 2962224a7f..74a9a1f71b 100644 --- a/apps/api/v1/pages/api/destination-calendars/_post.ts +++ b/apps/api/v1/pages/api/destination-calendars/_post.ts @@ -1,6 +1,9 @@ import type { NextApiRequest } from "next"; -import { getCalendarCredentialsWithoutDelegation, getConnectedCalendars } from "@calcom/lib/CalendarManager"; +import { + getCalendarCredentialsWithoutDelegation, + getConnectedCalendars, +} from "@calcom/features/calendars/lib/CalendarManager"; import { HttpError } from "@calcom/lib/http-error"; import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; diff --git a/apps/api/v1/pages/api/event-types/_get.ts b/apps/api/v1/pages/api/event-types/_get.ts index e8a80b399b..d5f65af548 100644 --- a/apps/api/v1/pages/api/event-types/_get.ts +++ b/apps/api/v1/pages/api/event-types/_get.ts @@ -55,6 +55,7 @@ async function getHandler(req: NextApiRequest) { slug: slug, // slug will be undefined if not provided in query }, include: { + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true customInputs: true, hashedLink: { select: { link: true } }, team: { select: { slug: true } }, diff --git a/apps/api/v1/pages/api/payments/[id].ts b/apps/api/v1/pages/api/payments/[id].ts index 0b621cb86d..35ab674c07 100644 --- a/apps/api/v1/pages/api/payments/[id].ts +++ b/apps/api/v1/pages/api/payments/[id].ts @@ -46,6 +46,7 @@ export async function paymentById( if (safeQuery.success && method === "GET") { const userWithBookings = await prisma.user.findUnique({ where: { id: userId }, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true include: { bookings: true }, }); await prisma.payment diff --git a/apps/api/v1/pages/api/schedules/[id]/_get.ts b/apps/api/v1/pages/api/schedules/[id]/_get.ts index 0600b5eaa3..ffded6bae1 100644 --- a/apps/api/v1/pages/api/schedules/[id]/_get.ts +++ b/apps/api/v1/pages/api/schedules/[id]/_get.ts @@ -75,7 +75,11 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform export async function getHandler(req: NextApiRequest) { const { query } = req; const { id } = schemaQueryIdParseInt.parse(query); - const data = await prisma.schedule.findUniqueOrThrow({ where: { id }, include: { availability: true } }); + const data = await prisma.schedule.findUniqueOrThrow({ + where: { id }, + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true + include: { availability: true }, + }); return { schedule: schemaSchedulePublic.parse(data) }; } diff --git a/apps/api/v1/pages/api/teams/[teamId]/_patch.ts b/apps/api/v1/pages/api/teams/[teamId]/_patch.ts index 4af941904e..a79a4ce09c 100644 --- a/apps/api/v1/pages/api/teams/[teamId]/_patch.ts +++ b/apps/api/v1/pages/api/teams/[teamId]/_patch.ts @@ -62,6 +62,7 @@ export async function patchHandler(req: NextApiRequest) { /** Only OWNERS and ADMINS can edit teams */ const _team = await prisma.team.findFirst({ + // eslint-disable-next-line @calcom/eslint/no-prisma-include-true include: { members: true }, where: { id: teamId, members: { some: { userId, role: { in: ["OWNER", "ADMIN"] } } } }, }); diff --git a/apps/api/v1/test/lib/bookings/_post.test.ts b/apps/api/v1/test/lib/bookings/_post.test.ts index 77978723b8..dcebba79f6 100644 --- a/apps/api/v1/test/lib/bookings/_post.test.ts +++ b/apps/api/v1/test/lib/bookings/_post.test.ts @@ -86,7 +86,7 @@ vi.mock("@calcom/lib/di/containers/QualifiedHosts", () => ({ }), })); -vi.mock("@calcom/lib/EventManager", () => ({ +vi.mock("@calcom/features/bookings/lib/EventManager", () => ({ default: vi.fn().mockImplementation(() => ({ reschedule: vi.fn().mockResolvedValue({ results: [], diff --git a/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts b/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts index 8b6f09836f..759b76de20 100644 --- a/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts +++ b/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts @@ -134,7 +134,7 @@ export async function getCRMData( if (!teamMemberEmail || !crmOwnerRecordType || !crmAppSlug) { const { getTeamMemberEmailForResponseOrContactUsingUrlQuery } = await import( - "@calcom/lib/server/getTeamMemberEmailFromCrm" + "@calcom/features/ee/teams/lib/getTeamMemberEmailFromCrm" ); const { email, diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/roles/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/roles/page.tsx index c89b0e2a62..626148aeae 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/roles/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/roles/page.tsx @@ -11,7 +11,7 @@ import { Resource, CrudAction, Scope } from "@calcom/features/pbac/domain/types/ import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service"; import { RoleService } from "@calcom/features/pbac/services/role.service"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; -import { getTeamWithMembers } from "@calcom/lib/server/queries/teams"; +import { getTeamWithMembers } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; diff --git a/apps/web/app/api/availability/calendar/route.ts b/apps/web/app/api/availability/calendar/route.ts index b84dab2446..e0a6bdca53 100644 --- a/apps/web/app/api/availability/calendar/route.ts +++ b/apps/web/app/api/availability/calendar/route.ts @@ -6,7 +6,7 @@ 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 { getCalendarCredentials, getConnectedCalendars } from "@calcom/features/calendars/lib/CalendarManager"; import { HttpError } from "@calcom/lib/http-error"; import notEmpty from "@calcom/lib/notEmpty"; import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar"; diff --git a/apps/web/components/apps/installation/ConfigureStepCard.tsx b/apps/web/components/apps/installation/ConfigureStepCard.tsx index 95e7780324..b98c9431af 100644 --- a/apps/web/components/apps/installation/ConfigureStepCard.tsx +++ b/apps/web/components/apps/installation/ConfigureStepCard.tsx @@ -10,7 +10,7 @@ import { z } from "zod"; import NoSSR from "@calcom/lib/components/NoSSR"; import { locationsResolver } from "@calcom/lib/event-types/utils/locationsResolver"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import type { LocationObject } from "@calcom/lib/location"; +import type { LocationObject } from "@calcom/app-store/locations"; import type { AppCategories } from "@calcom/prisma/enums"; import type { EventTypeMetaDataSchema, eventTypeBookingFields } from "@calcom/prisma/zod-utils"; import { Avatar } from "@calcom/ui/components/avatar"; diff --git a/apps/web/components/team/screens/Team.tsx b/apps/web/components/team/screens/Team.tsx index 78b00ffc72..d15e943d29 100644 --- a/apps/web/components/team/screens/Team.tsx +++ b/apps/web/components/team/screens/Team.tsx @@ -3,7 +3,7 @@ import Link from "next/link"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery"; import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; -import type { TeamWithMembers } from "@calcom/lib/server/queries/teams"; +import type { TeamWithMembers } from "@calcom/features/ee/teams/lib/queries"; import type { UserProfile } from "@calcom/types/UserProfile"; import { UserAvatar } from "@calcom/ui/components/avatar"; diff --git a/apps/web/lib/__tests__/getTeamMemberEmailFromCrm.test.ts b/apps/web/lib/__tests__/getTeamMemberEmailFromCrm.test.ts index 09b39906b4..303f7928a2 100644 --- a/apps/web/lib/__tests__/getTeamMemberEmailFromCrm.test.ts +++ b/apps/web/lib/__tests__/getTeamMemberEmailFromCrm.test.ts @@ -10,7 +10,7 @@ import { ROUTING_FORM_QUEUED_RESPONSE_ID_QUERY_STRING, } from "@calcom/app-store/routing-forms/lib/constants"; import { RouteActionType } from "@calcom/app-store/routing-forms/zod"; -import { getTeamMemberEmailForResponseOrContactUsingUrlQuery } from "@calcom/lib/server/getTeamMemberEmailFromCrm"; +import { getTeamMemberEmailForResponseOrContactUsingUrlQuery } from "@calcom/features/ee/teams/lib/getTeamMemberEmailFromCrm"; import { SchedulingType } from "@calcom/prisma/enums"; vi.mock("@calcom/app-store/routing-forms/appBookingFormHandler", () => ({ diff --git a/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts b/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts index 1862e0a348..bedebb0697 100644 --- a/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts +++ b/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts @@ -8,7 +8,7 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps"; import { CAL_URL } from "@calcom/lib/constants"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; -import type { LocationObject } from "@calcom/lib/location"; +import type { LocationObject } from "@calcom/app-store/locations"; import { UserRepository } from "@calcom/lib/server/repository/user"; import prisma from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; diff --git a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx index 75a956968c..4923562ece 100644 --- a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx +++ b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx @@ -108,7 +108,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => if (!teamMemberEmail || !crmOwnerRecordType || !crmAppSlug) { const { getTeamMemberEmailForResponseOrContactUsingUrlQuery } = await import( - "@calcom/lib/server/getTeamMemberEmailFromCrm" + "@calcom/features/ee/teams/lib/getTeamMemberEmailFromCrm" ); const { email, diff --git a/apps/web/lib/team/[slug]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/getServerSideProps.tsx index 02552a0ddf..3aa548b170 100644 --- a/apps/web/lib/team/[slug]/getServerSideProps.tsx +++ b/apps/web/lib/team/[slug]/getServerSideProps.tsx @@ -11,7 +11,7 @@ import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl"; import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client"; import logger from "@calcom/lib/logger"; import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; -import { getTeamWithMembers } from "@calcom/lib/server/queries/teams"; +import { getTeamWithMembers } from "@calcom/features/ee/teams/lib/queries"; import slugify from "@calcom/lib/slugify"; import { stripMarkdown } from "@calcom/lib/stripMarkdown"; import prisma from "@calcom/prisma"; diff --git a/apps/web/modules/apps/installation/[[...step]]/step-view.tsx b/apps/web/modules/apps/installation/[[...step]]/step-view.tsx index 9646d5f356..249be73406 100644 --- a/apps/web/modules/apps/installation/[[...step]]/step-view.tsx +++ b/apps/web/modules/apps/installation/[[...step]]/step-view.tsx @@ -15,7 +15,7 @@ import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps"; import { getAppOnboardingUrl } from "@calcom/lib/apps/getAppOnboardingUrl"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import type { LocationObject } from "@calcom/lib/location"; +import type { LocationObject } from "@calcom/app-store/locations"; import type { Team } from "@calcom/prisma/client"; import type { eventTypeBookingFields } from "@calcom/prisma/zod-utils"; import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils"; diff --git a/packages/app-store/_utils/payments/handlePaymentSuccess.ts b/packages/app-store/_utils/payments/handlePaymentSuccess.ts index ef8ef72672..dda7a8c9af 100644 --- a/packages/app-store/_utils/payments/handlePaymentSuccess.ts +++ b/packages/app-store/_utils/payments/handlePaymentSuccess.ts @@ -7,7 +7,7 @@ import { handleConfirmation } from "@calcom/features/bookings/lib/handleConfirma import { getBooking } from "@calcom/features/bookings/lib/payment/getBooking"; import { getPlatformParams } from "@calcom/features/platform-oauth-client/get-platform-params"; import { PlatformOAuthClientRepository } from "@calcom/features/platform-oauth-client/platform-oauth-client.repository"; -import EventManager, { placeholderCreatedEvent } from "@calcom/lib/EventManager"; +import EventManager, { placeholderCreatedEvent } from "@calcom/features/bookings/lib/EventManager"; import { HttpError as HttpCode } from "@calcom/lib/http-error"; import logger from "@calcom/lib/logger"; import prisma from "@calcom/prisma"; diff --git a/packages/features/auth/signup/utils/createOrUpdateMemberships.ts b/packages/features/auth/signup/utils/createOrUpdateMemberships.ts index e6c34e37dd..0df016f7e7 100644 --- a/packages/features/auth/signup/utils/createOrUpdateMemberships.ts +++ b/packages/features/auth/signup/utils/createOrUpdateMemberships.ts @@ -1,4 +1,4 @@ -import { updateNewTeamMemberEventTypes } from "@calcom/lib/server/queries/teams"; +import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries"; import { ProfileRepository } from "@calcom/lib/server/repository/profile"; import { prisma } from "@calcom/prisma"; import type { Team, User, OrganizationSettings } from "@calcom/prisma/client"; diff --git a/packages/features/auth/signup/utils/organization.ts b/packages/features/auth/signup/utils/organization.ts index 44008dddcc..5b5e27c926 100644 --- a/packages/features/auth/signup/utils/organization.ts +++ b/packages/features/auth/signup/utils/organization.ts @@ -1,4 +1,4 @@ -import { updateNewTeamMemberEventTypes } from "@calcom/lib/server/queries/teams"; +import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries"; import { ProfileRepository } from "@calcom/lib/server/repository/profile"; import { prisma } from "@calcom/prisma"; import type { Team, OrganizationSettings } from "@calcom/prisma/client"; diff --git a/packages/lib/EventManager.test.ts b/packages/features/bookings/lib/EventManager.test.ts similarity index 100% rename from packages/lib/EventManager.test.ts rename to packages/features/bookings/lib/EventManager.test.ts diff --git a/packages/lib/EventManager.ts b/packages/features/bookings/lib/EventManager.ts similarity index 99% rename from packages/lib/EventManager.ts rename to packages/features/bookings/lib/EventManager.ts index e2a77d3979..08b8e24cd5 100644 --- a/packages/lib/EventManager.ts +++ b/packages/features/bookings/lib/EventManager.ts @@ -34,10 +34,10 @@ import type { PartialReference, } from "@calcom/types/EventManager"; -import { createEvent, updateEvent, deleteEvent } from "./CalendarManager"; -import CrmManager from "./crmManager/crmManager"; -import { isDelegationCredential } from "./delegationCredential/clientAndServer"; -import { createMeeting, updateMeeting, deleteMeeting } from "./videoClient"; +import { createEvent, updateEvent, deleteEvent } from "@calcom/features/calendars/lib/CalendarManager"; +import CrmManager from "@calcom/lib/crmManager/crmManager"; +import { isDelegationCredential } from "@calcom/lib/delegationCredential/clientAndServer"; +import { createMeeting, updateMeeting, deleteMeeting } from "@calcom/lib/videoClient"; const log = logger.getSubLogger({ prefix: ["EventManager"] }); const CALENDSO_ENCRYPTION_KEY = process.env.CALENDSO_ENCRYPTION_KEY || ""; diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts index 79e76e31ac..24e86413ba 100644 --- a/packages/features/bookings/lib/handleCancelBooking.ts +++ b/packages/features/bookings/lib/handleCancelBooking.ts @@ -17,7 +17,7 @@ import { } from "@calcom/features/webhooks/lib/scheduleTrigger"; import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload"; import type { EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload"; -import EventManager from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId"; import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType"; diff --git a/packages/features/bookings/lib/handleConfirmation.ts b/packages/features/bookings/lib/handleConfirmation.ts index f53f0598c8..b85fde8951 100644 --- a/packages/features/bookings/lib/handleConfirmation.ts +++ b/packages/features/bookings/lib/handleConfirmation.ts @@ -11,8 +11,8 @@ import { scheduleTrigger } from "@calcom/features/webhooks/lib/scheduleTrigger"; import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload"; import type { EventPayloadType, EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; -import type { EventManagerUser } from "@calcom/lib/EventManager"; -import EventManager, { placeholderCreatedEvent } from "@calcom/lib/EventManager"; +import type { EventManagerUser } from "@calcom/features/bookings/lib/EventManager"; +import EventManager, { placeholderCreatedEvent } from "@calcom/features/bookings/lib/EventManager"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId"; import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType"; diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts index dab2adbc6d..c95e768143 100644 --- a/packages/features/bookings/lib/handleNewBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking.ts @@ -36,7 +36,7 @@ import { scheduleTrigger, } from "@calcom/features/webhooks/lib/scheduleTrigger"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; -import EventManager, { placeholderCreatedEvent } from "@calcom/lib/EventManager"; +import EventManager, { placeholderCreatedEvent } from "@calcom/features/bookings/lib/EventManager"; import { handleAnalyticsEvents } from "@calcom/lib/analyticsManager/handleAnalyticsEvents"; import { groupHostsByGroupId } from "@calcom/lib/bookings/hostGroupUtils"; import { shouldIgnoreContactOwner } from "@calcom/lib/bookings/routing/utils"; diff --git a/packages/features/bookings/lib/handleNewBooking/test/team-bookings/round-robin.test.ts b/packages/features/bookings/lib/handleNewBooking/test/team-bookings/round-robin.test.ts index 6625287dc7..727243fce4 100644 --- a/packages/features/bookings/lib/handleNewBooking/test/team-bookings/round-robin.test.ts +++ b/packages/features/bookings/lib/handleNewBooking/test/team-bookings/round-robin.test.ts @@ -783,7 +783,7 @@ describe("Round Robin handleNewBooking", () => { describe("Seated Round Robin Event", () => { test("For second seat booking, organizer remains the same with no team members included", async () => { const handleNewBooking = getNewBookingHandler(); - const EventManager = (await import("@calcom/lib/EventManager")).default; + const EventManager = (await import("@calcom/features/bookings/lib/EventManager")).default; const eventManagerSpy = vi.spyOn(EventManager.prototype, "updateCalendarAttendees"); diff --git a/packages/features/bookings/lib/handleSeats/create/createNewSeat.ts b/packages/features/bookings/lib/handleSeats/create/createNewSeat.ts index 94f3a0de92..640533b919 100644 --- a/packages/features/bookings/lib/handleSeats/create/createNewSeat.ts +++ b/packages/features/bookings/lib/handleSeats/create/createNewSeat.ts @@ -10,7 +10,7 @@ import { allowDisablingAttendeeConfirmationEmails, allowDisablingHostConfirmationEmails, } from "@calcom/features/ee/workflows/lib/allowDisablingStandardEmails"; -import EventManager from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; import { ErrorCode } from "@calcom/lib/errorCodes"; import { HttpError } from "@calcom/lib/http-error"; import prisma from "@calcom/prisma"; diff --git a/packages/features/bookings/lib/handleSeats/reschedule/attendee/attendeeRescheduleSeatedBooking.ts b/packages/features/bookings/lib/handleSeats/reschedule/attendee/attendeeRescheduleSeatedBooking.ts index 97e50055a9..bcad39ff09 100644 --- a/packages/features/bookings/lib/handleSeats/reschedule/attendee/attendeeRescheduleSeatedBooking.ts +++ b/packages/features/bookings/lib/handleSeats/reschedule/attendee/attendeeRescheduleSeatedBooking.ts @@ -2,7 +2,7 @@ import { cloneDeep } from "lodash"; import { sendRescheduledSeatEmailAndSMS } from "@calcom/emails"; -import type EventManager from "@calcom/lib/EventManager"; +import type EventManager from "@calcom/features/bookings/lib/EventManager"; import { getTranslation } from "@calcom/lib/server/i18n"; import prisma from "@calcom/prisma"; import type { Person, CalendarEvent } from "@calcom/types/Calendar"; diff --git a/packages/features/bookings/lib/handleSeats/reschedule/owner/combineTwoSeatedBookings.ts b/packages/features/bookings/lib/handleSeats/reschedule/owner/combineTwoSeatedBookings.ts index 1776208303..d615446118 100644 --- a/packages/features/bookings/lib/handleSeats/reschedule/owner/combineTwoSeatedBookings.ts +++ b/packages/features/bookings/lib/handleSeats/reschedule/owner/combineTwoSeatedBookings.ts @@ -3,7 +3,7 @@ import { cloneDeep } from "lodash"; import { uuid } from "short-uuid"; import { sendRescheduledEmailsAndSMS } from "@calcom/emails"; -import type EventManager from "@calcom/lib/EventManager"; +import type EventManager from "@calcom/features/bookings/lib/EventManager"; import { ErrorCode } from "@calcom/lib/errorCodes"; import { HttpError } from "@calcom/lib/http-error"; import prisma from "@calcom/prisma"; diff --git a/packages/features/bookings/lib/handleSeats/reschedule/owner/moveSeatedBookingToNewTimeSlot.ts b/packages/features/bookings/lib/handleSeats/reschedule/owner/moveSeatedBookingToNewTimeSlot.ts index 80cdf9d66f..5fd6fb8585 100644 --- a/packages/features/bookings/lib/handleSeats/reschedule/owner/moveSeatedBookingToNewTimeSlot.ts +++ b/packages/features/bookings/lib/handleSeats/reschedule/owner/moveSeatedBookingToNewTimeSlot.ts @@ -2,7 +2,7 @@ import { cloneDeep } from "lodash"; import { sendRescheduledEmailsAndSMS } from "@calcom/emails"; -import type EventManager from "@calcom/lib/EventManager"; +import type EventManager from "@calcom/features/bookings/lib/EventManager"; import prisma from "@calcom/prisma"; import type { AdditionalInformation, AppsStatus } from "@calcom/types/Calendar"; diff --git a/packages/features/bookings/lib/handleSeats/reschedule/owner/ownerRescheduleSeatedBooking.ts b/packages/features/bookings/lib/handleSeats/reschedule/owner/ownerRescheduleSeatedBooking.ts index 28b3b731c0..193f582f2c 100644 --- a/packages/features/bookings/lib/handleSeats/reschedule/owner/ownerRescheduleSeatedBooking.ts +++ b/packages/features/bookings/lib/handleSeats/reschedule/owner/ownerRescheduleSeatedBooking.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line no-restricted-imports -import type EventManager from "@calcom/lib/EventManager"; +import type EventManager from "@calcom/features/bookings/lib/EventManager"; import type { createLoggerWithEventDetails } from "../../../handleNewBooking/logger"; import type { diff --git a/packages/features/bookings/lib/handleSeats/reschedule/rescheduleSeatedBooking.ts b/packages/features/bookings/lib/handleSeats/reschedule/rescheduleSeatedBooking.ts index 5b573adaf7..a7c962a5aa 100644 --- a/packages/features/bookings/lib/handleSeats/reschedule/rescheduleSeatedBooking.ts +++ b/packages/features/bookings/lib/handleSeats/reschedule/rescheduleSeatedBooking.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line no-restricted-imports import dayjs from "@calcom/dayjs"; import { refreshCredentials } from "@calcom/features/bookings/lib/getAllCredentialsForUsersOnEvent/refreshCredentials"; -import EventManager from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; import { HttpError } from "@calcom/lib/http-error"; import prisma from "@calcom/prisma"; import { BookingStatus } from "@calcom/prisma/enums"; diff --git a/packages/lib/CalendarManager.test.ts b/packages/features/calendars/lib/CalendarManager.test.ts similarity index 100% rename from packages/lib/CalendarManager.test.ts rename to packages/features/calendars/lib/CalendarManager.test.ts diff --git a/packages/lib/CalendarManager.ts b/packages/features/calendars/lib/CalendarManager.ts similarity index 99% rename from packages/lib/CalendarManager.ts rename to packages/features/calendars/lib/CalendarManager.ts index a6c2a84189..c1a8f01ed8 100644 --- a/packages/lib/CalendarManager.ts +++ b/packages/features/calendars/lib/CalendarManager.ts @@ -11,6 +11,8 @@ import { CalendarAppDelegationCredentialError } from "@calcom/lib/CalendarAppErr import { ORGANIZER_EMAIL_EXEMPT_DOMAINS } from "@calcom/lib/constants"; import { buildNonDelegationCredentials } from "@calcom/lib/delegationCredential/clientAndServer"; import { formatCalEvent } from "@calcom/lib/formatCalendarEvent"; +import getCalendarsEvents from "@calcom/lib/getCalendarsEvents"; +import { getCalendarsEventsWithTimezones } from "@calcom/lib/getCalendarsEvents"; import logger from "@calcom/lib/logger"; import { getPiiFreeCalendarEvent, getPiiFreeCredential } from "@calcom/lib/piiFreeData"; import { safeStringify } from "@calcom/lib/safeStringify"; @@ -25,9 +27,6 @@ import type { import type { CredentialForCalendarService, CredentialPayload } from "@calcom/types/Credential"; import type { EventResult } from "@calcom/types/EventManager"; -import getCalendarsEvents from "./getCalendarsEvents"; -import { getCalendarsEventsWithTimezones } from "./getCalendarsEvents"; - const log = logger.getSubLogger({ prefix: ["CalendarManager"] }); export const getCalendarCredentials = (credentials: Array) => { diff --git a/packages/features/credentials/handleDeleteCredential.ts b/packages/features/credentials/handleDeleteCredential.ts index 66963ba245..c7f32af94f 100644 --- a/packages/features/credentials/handleDeleteCredential.ts +++ b/packages/features/credentials/handleDeleteCredential.ts @@ -14,7 +14,7 @@ import { deleteWebhookScheduledTriggers } from "@calcom/features/webhooks/lib/sc import { buildNonDelegationCredential } from "@calcom/lib/delegationCredential/server"; import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; -import { DailyLocationType } from "@calcom/lib/location"; +import { DailyLocationType } from "@calcom/app-store/locations"; import { getTranslation } from "@calcom/lib/server/i18n"; import { bookingMinimalSelect, prisma } from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; diff --git a/packages/features/ee/dsync/lib/handleGroupEvents.ts b/packages/features/ee/dsync/lib/handleGroupEvents.ts index fecc8c0715..f067d7e206 100644 --- a/packages/features/ee/dsync/lib/handleGroupEvents.ts +++ b/packages/features/ee/dsync/lib/handleGroupEvents.ts @@ -3,7 +3,7 @@ import type { DirectorySyncEvent, Group } from "@boxyhq/saml-jackson"; import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; import { getTranslation } from "@calcom/lib/server/i18n"; -import { addNewMembersToEventTypes } from "@calcom/lib/server/queries/teams"; +import { addNewMembersToEventTypes } from "@calcom/features/ee/teams/lib/queries"; import { ProfileRepository } from "@calcom/lib/server/repository/profile"; import prisma from "@calcom/prisma"; import { IdentityProvider, MembershipRole } from "@calcom/prisma/enums"; diff --git a/packages/features/ee/payments/api/webhook.ts b/packages/features/ee/payments/api/webhook.ts index 65aec9de05..dbf145bbbc 100644 --- a/packages/features/ee/payments/api/webhook.ts +++ b/packages/features/ee/payments/api/webhook.ts @@ -12,7 +12,7 @@ import { getBooking } from "@calcom/features/bookings/lib/payment/getBooking"; import stripe from "@calcom/features/ee/payments/server/stripe"; import { getPlatformParams } from "@calcom/features/platform-oauth-client/get-platform-params"; import { PlatformOAuthClientRepository } from "@calcom/features/platform-oauth-client/platform-oauth-client.repository"; -import EventManager, { placeholderCreatedEvent } from "@calcom/lib/EventManager"; +import EventManager, { placeholderCreatedEvent } from "@calcom/features/bookings/lib/EventManager"; import { IS_PRODUCTION } from "@calcom/lib/constants"; import { getErrorFromUnknown } from "@calcom/lib/errors"; import { HttpError as HttpCode } from "@calcom/lib/http-error"; diff --git a/packages/features/ee/round-robin/handleRescheduleEventManager.ts b/packages/features/ee/round-robin/handleRescheduleEventManager.ts index 90201ced9c..166b1b05ac 100644 --- a/packages/features/ee/round-robin/handleRescheduleEventManager.ts +++ b/packages/features/ee/round-robin/handleRescheduleEventManager.ts @@ -4,8 +4,8 @@ import { getAllCredentialsIncludeServiceAccountKey } from "@calcom/features/book import type { EventType } from "@calcom/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials"; import { getVideoCallDetails } from "@calcom/features/bookings/lib/handleNewBooking/getVideoCallDetails"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; -import EventManager from "@calcom/lib/EventManager"; -import type { EventManagerInitParams } from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; +import type { EventManagerInitParams } from "@calcom/features/bookings/lib/EventManager"; import logger from "@calcom/lib/logger"; import { getTranslation } from "@calcom/lib/server/i18n"; import { BookingReferenceRepository } from "@calcom/lib/server/repository/bookingReference"; diff --git a/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts b/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts index d48ab97bc1..1a9a50efda 100644 --- a/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts +++ b/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts @@ -22,7 +22,7 @@ import { BookingRepository } from "@calcom/lib/server/repository/booking"; import { SchedulingType, BookingStatus, WorkflowMethods } from "@calcom/prisma/enums"; import { test } from "@calcom/web/test/fixtures/fixtures"; -vi.mock("@calcom/lib/EventManager"); +vi.mock("@calcom/features/bookings/lib/EventManager"); vi.mock("@calcom/app-store/utils", () => ({ getAppFromSlug: vi.fn(), })); @@ -177,7 +177,7 @@ type ConferenceResult = { }; const mockEventManagerReschedule = async (config?: MockEventManagerConfig) => { - const EventManager = (await import("@calcom/lib/EventManager")).default; + const EventManager = (await import("@calcom/features/bookings/lib/EventManager")).default; // eslint-disable-next-line @typescript-eslint/no-explicit-any const spy = vi.spyOn(EventManager.prototype as any, "reschedule"); diff --git a/packages/features/ee/round-robin/roundRobinManualReassignment.ts b/packages/features/ee/round-robin/roundRobinManualReassignment.ts index 7cef29f663..c3cded43d0 100644 --- a/packages/features/ee/round-robin/roundRobinManualReassignment.ts +++ b/packages/features/ee/round-robin/roundRobinManualReassignment.ts @@ -23,7 +23,7 @@ import { import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler"; import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; -import EventManager from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; import { SENDER_NAME } from "@calcom/lib/constants"; import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/lib/delegationCredential/server"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; diff --git a/packages/features/ee/round-robin/roundRobinReassignment.test.ts b/packages/features/ee/round-robin/roundRobinReassignment.test.ts index 3c1f91b7cc..375c1384e5 100644 --- a/packages/features/ee/round-robin/roundRobinReassignment.test.ts +++ b/packages/features/ee/round-robin/roundRobinReassignment.test.ts @@ -21,7 +21,7 @@ import { BookingRepository } from "@calcom/lib/server/repository/booking"; import { SchedulingType, BookingStatus, WorkflowMethods } from "@calcom/prisma/enums"; import { test } from "@calcom/web/test/fixtures/fixtures"; -vi.mock("@calcom/lib/EventManager"); +vi.mock("@calcom/features/bookings/lib/EventManager"); const testDestinationCalendar = { integration: "test-calendar", @@ -61,7 +61,7 @@ describe("roundRobinReassignment test", () => { test("reassign new round robin organizer", async ({ emails }) => { const roundRobinReassignment = (await import("./roundRobinReassignment")).default; - const EventManager = (await import("@calcom/lib/EventManager")).default; + const EventManager = (await import("@calcom/features/bookings/lib/EventManager")).default; const eventManagerSpy = vi.spyOn(EventManager.prototype as any, "reschedule"); eventManagerSpy.mockResolvedValue({ referencesToCreate: [] }); @@ -194,7 +194,7 @@ describe("roundRobinReassignment test", () => { // TODO: add fixed hosts test test("Reassign round robin host with fixed host as organizer", async () => { const roundRobinReassignment = (await import("./roundRobinReassignment")).default; - const EventManager = (await import("@calcom/lib/EventManager")).default; + const EventManager = (await import("@calcom/features/bookings/lib/EventManager")).default; const eventManagerSpy = vi.spyOn(EventManager.prototype as any, "reschedule"); diff --git a/packages/features/ee/round-robin/roundRobinReassignment.ts b/packages/features/ee/round-robin/roundRobinReassignment.ts index f0793d1207..f3fe5fb6d6 100644 --- a/packages/features/ee/round-robin/roundRobinReassignment.ts +++ b/packages/features/ee/round-robin/roundRobinReassignment.ts @@ -19,7 +19,7 @@ import AssignmentReasonRecorder, { RRReassignmentType, } from "@calcom/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder"; import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming"; -import EventManager from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; import { enrichHostsWithDelegationCredentials, enrichUserWithDelegationCredentialsIncludeServiceAccountKey, diff --git a/packages/features/ee/sso/lib/saml.ts b/packages/features/ee/sso/lib/saml.ts index 877a8a9c03..a409338e7f 100644 --- a/packages/features/ee/sso/lib/saml.ts +++ b/packages/features/ee/sso/lib/saml.ts @@ -1,7 +1,7 @@ import type { SAMLSSORecord, OIDCSSORecord } from "@boxyhq/saml-jackson"; import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants"; -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; export const samlDatabaseUrl = process.env.SAML_DATABASE_URL || ""; export const isSAMLLoginEnabled = samlDatabaseUrl.length > 0; diff --git a/packages/lib/server/getTeamMemberEmailFromCrm.ts b/packages/features/ee/teams/lib/getTeamMemberEmailFromCrm.ts similarity index 100% rename from packages/lib/server/getTeamMemberEmailFromCrm.ts rename to packages/features/ee/teams/lib/getTeamMemberEmailFromCrm.ts diff --git a/packages/lib/server/queries/teams/index.ts b/packages/features/ee/teams/lib/queries.ts similarity index 98% rename from packages/lib/server/queries/teams/index.ts rename to packages/features/ee/teams/lib/queries.ts index d263d78816..0ccb517c95 100644 --- a/packages/lib/server/queries/teams/index.ts +++ b/packages/features/ee/teams/lib/queries.ts @@ -2,25 +2,24 @@ import { z } from "zod"; import { getAppFromSlug } from "@calcom/app-store/utils"; import { DATABASE_CHUNK_SIZE } from "@calcom/lib/constants"; +import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client"; import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits"; import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; +import { getTeam, getOrg } from "@calcom/lib/server/repository/team"; +import { UserRepository } from "@calcom/lib/server/repository/user"; import prisma from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; import type { Team } from "@calcom/prisma/client"; import { SchedulingType } from "@calcom/prisma/enums"; import { baseEventTypeSelect } from "@calcom/prisma/selects"; -import { EventTypeSchema } from "@calcom/prisma/zod/modelSchema/EventTypeSchema"; import { EventTypeMetaDataSchema, allManagedEventTypeProps, unlockedManagedEventTypeProps, eventTypeLocations, } from "@calcom/prisma/zod-utils"; - -import { getBookerBaseUrlSync } from "../../../getBookerUrl/client"; -import { getTeam, getOrg } from "../../repository/team"; -import { UserRepository } from "../../repository/user"; +import { EventTypeSchema } from "@calcom/prisma/zod/modelSchema/EventTypeSchema"; export type TeamWithMembers = Awaited>; diff --git a/packages/lib/event-types/getEventTypeById.test.ts b/packages/features/eventtypes/lib/getEventTypeById.test.ts similarity index 99% rename from packages/lib/event-types/getEventTypeById.test.ts rename to packages/features/eventtypes/lib/getEventTypeById.test.ts index 2ceebe28cb..3b9f77ce2a 100644 --- a/packages/lib/event-types/getEventTypeById.test.ts +++ b/packages/features/eventtypes/lib/getEventTypeById.test.ts @@ -1,4 +1,4 @@ -import prismock from "../../../tests/libs/__mocks__/prisma"; +import prismock from "../../../../tests/libs/__mocks__/prisma"; import { mockNoTranslations } from "@calcom/web/test/utils/bookingScenario/bookingScenario"; diff --git a/packages/lib/event-types/getEventTypeById.ts b/packages/features/eventtypes/lib/getEventTypeById.ts similarity index 97% rename from packages/lib/event-types/getEventTypeById.ts rename to packages/features/eventtypes/lib/getEventTypeById.ts index 3cbd419eec..c9b3fae9b6 100644 --- a/packages/lib/event-types/getEventTypeById.ts +++ b/packages/features/eventtypes/lib/getEventTypeById.ts @@ -3,12 +3,14 @@ import { getLocationGroupedOptions } from "@calcom/app-store/server"; import { getEventTypeAppData } from "@calcom/app-store/utils"; import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-utils"; import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields"; +import { WEBSITE_URL } from "@calcom/lib/constants"; import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl"; +import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits"; import { parseDurationLimit } from "@calcom/lib/intervalLimits/isDurationLimits"; import { parseEventTypeColor } from "@calcom/lib/isEventTypeColor"; import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; -import type { LocationObject } from "@calcom/lib/location"; +import type { LocationObject } from "@calcom/app-store/locations"; import { getTranslation } from "@calcom/lib/server/i18n"; import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository"; import { UserRepository } from "@calcom/lib/server/repository/user"; @@ -19,9 +21,6 @@ import { customInputSchema } from "@calcom/prisma/zod-utils"; import { TRPCError } from "@trpc/server"; -import { WEBSITE_URL } from "../constants"; -import { getBookerBaseUrl } from "../getBookerUrl/server"; - interface getEventTypeByIdProps { eventTypeId: number; userId: number; diff --git a/packages/features/eventtypes/lib/types.ts b/packages/features/eventtypes/lib/types.ts index 90070c80b9..41b81989ce 100644 --- a/packages/features/eventtypes/lib/types.ts +++ b/packages/features/eventtypes/lib/types.ts @@ -3,7 +3,7 @@ import { z } from "zod"; import type { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-utils"; import type { ChildrenEventType } from "@calcom/features/eventtypes/components/ChildrenEventTypeSelect"; import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema"; -import type { EventLocationType } from "@calcom/lib/location"; +import type { EventLocationType } from "@calcom/app-store/locations"; import type { AttributesQueryValue } from "@calcom/lib/raqb/types"; import type { EventTypeTranslation } from "@calcom/prisma/client"; import { type PeriodType, SchedulingType } from "@calcom/prisma/enums"; diff --git a/packages/features/pbac/services/role-management.factory.ts b/packages/features/pbac/services/role-management.factory.ts index 66a88f18c9..fb5928b3c3 100644 --- a/packages/features/pbac/services/role-management.factory.ts +++ b/packages/features/pbac/services/role-management.factory.ts @@ -1,6 +1,6 @@ import { FeaturesRepository } from "@calcom/features/flags/features.repository"; import { isOrganisationAdmin } from "@calcom/lib/server/queries/organisations"; -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import { MembershipRole } from "@calcom/prisma/enums"; diff --git a/packages/features/webhooks/lib/scheduleTrigger.ts b/packages/features/webhooks/lib/scheduleTrigger.ts index f17c5d9f69..02485d3f81 100644 --- a/packages/features/webhooks/lib/scheduleTrigger.ts +++ b/packages/features/webhooks/lib/scheduleTrigger.ts @@ -4,7 +4,7 @@ import { selectOOOEntries } from "@calcom/app-store/zapier/api/subscriptions/lis import dayjs from "@calcom/dayjs"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import tasker from "@calcom/features/tasker"; -import { DailyLocationType, getHumanReadableLocationValue } from "@calcom/lib/location"; +import { DailyLocationType, getHumanReadableLocationValue } from "@calcom/app-store/locations"; import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; import { withReporting } from "@calcom/lib/sentryWrapper"; diff --git a/packages/lib/getBusyTimes.ts b/packages/lib/getBusyTimes.ts index c9aeb86f8d..4932cc36c4 100644 --- a/packages/lib/getBusyTimes.ts +++ b/packages/lib/getBusyTimes.ts @@ -1,5 +1,5 @@ import dayjs from "@calcom/dayjs"; -import { getBusyCalendarTimes } from "@calcom/lib/CalendarManager"; +import { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager"; import { subtract } from "@calcom/lib/date-ranges"; import { stringToDayjs } from "@calcom/lib/dayjs"; import { intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit"; diff --git a/packages/lib/getConnectedDestinationCalendars.ts b/packages/lib/getConnectedDestinationCalendars.ts index 5e60d69995..1ab9366851 100644 --- a/packages/lib/getConnectedDestinationCalendars.ts +++ b/packages/lib/getConnectedDestinationCalendars.ts @@ -1,4 +1,4 @@ -import { getCalendarCredentials, getConnectedCalendars } from "@calcom/lib/CalendarManager"; +import { getCalendarCredentials, getConnectedCalendars } from "@calcom/features/calendars/lib/CalendarManager"; import { isDelegationCredential } from "@calcom/lib/delegationCredential/clientAndServer"; import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/lib/delegationCredential/server"; import logger from "@calcom/lib/logger"; diff --git a/packages/lib/location.ts b/packages/lib/location.ts deleted file mode 100644 index 3c5493f967..0000000000 --- a/packages/lib/location.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "@calcom/app-store/locations"; diff --git a/packages/lib/server/getLuckyUser.ts b/packages/lib/server/getLuckyUser.ts index b55a85251e..e1ec8cda11 100644 --- a/packages/lib/server/getLuckyUser.ts +++ b/packages/lib/server/getLuckyUser.ts @@ -1,7 +1,7 @@ import type { FormResponse, Fields } from "@calcom/app-store/routing-forms/types/types"; import { zodRoutes } from "@calcom/app-store/routing-forms/zod"; import dayjs from "@calcom/dayjs"; -import { getBusyCalendarTimes } from "@calcom/lib/CalendarManager"; +import { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager"; import logger from "@calcom/lib/logger"; import { acrossQueryValueCompatiblity } from "@calcom/lib/raqb/raqbUtils"; import { raqbQueryValueSchema } from "@calcom/lib/raqb/zod"; diff --git a/packages/platform/libraries/event-types.ts b/packages/platform/libraries/event-types.ts index 2e71adcd9a..3a222c7edd 100644 --- a/packages/platform/libraries/event-types.ts +++ b/packages/platform/libraries/event-types.ts @@ -1,4 +1,4 @@ -import EventManager from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; export { getPublicEvent, type PublicEventType } from "@calcom/features/eventtypes/lib/getPublicEvent"; @@ -20,12 +20,12 @@ export { export { validateCustomEventName } from "@calcom/features/eventtypes/lib/eventNaming"; export { EventManager }; -export { getEventTypeById } from "@calcom/lib/event-types/getEventTypeById"; +export { getEventTypeById } from "@calcom/features/eventtypes/lib/getEventTypeById"; export { getEventTypesByViewer } from "@calcom/lib/event-types/getEventTypesByViewer"; -export type { EventType } from "@calcom/lib/event-types/getEventTypeById"; +export type { EventType } from "@calcom/features/eventtypes/lib/getEventTypeById"; export type { EventTypesByViewer } from "@calcom/lib/event-types/getEventTypesByViewer"; export type { UpdateEventTypeReturn } from "@calcom/trpc/server/routers/viewer/eventTypes/heavy/update.handler"; -export { updateNewTeamMemberEventTypes } from "@calcom/lib/server/queries/teams"; +export { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries"; export { bulkUpdateEventsToDefaultLocation } from "@calcom/app-store/_utils/bulkUpdateEventsToDefaultLocation"; export { bulkUpdateTeamEventsToDefaultLocation } from "@calcom/app-store/_utils/bulkUpdateTeamEventsToDefaultLocation"; diff --git a/packages/platform/libraries/index.ts b/packages/platform/libraries/index.ts index 32c04f57eb..7cd253390b 100644 --- a/packages/platform/libraries/index.ts +++ b/packages/platform/libraries/index.ts @@ -4,6 +4,7 @@ import getBookingInfo from "@calcom/features/bookings/lib/getBookingInfo"; import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking"; import * as newBookingMethods from "@calcom/features/bookings/lib/handleNewBooking"; import { getClientSecretFromPayment } from "@calcom/features/ee/payments/pages/getClientSecretFromPayment"; +import { getTeamMemberEmailForResponseOrContactUsingUrlQuery } from "@calcom/features/ee/teams/lib/getTeamMemberEmailFromCrm"; import { verifyPhoneNumber, sendVerificationCode, @@ -14,7 +15,6 @@ import * as instantMeetingMethods from "@calcom/features/instant-meeting/handleI import { getRoutedUrl } from "@calcom/features/routing-forms/lib/getRoutedUrl"; import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings"; import { symmetricEncrypt, symmetricDecrypt } from "@calcom/lib/crypto"; -import { getTeamMemberEmailForResponseOrContactUsingUrlQuery } from "@calcom/lib/server/getTeamMemberEmailFromCrm"; import { getTranslation } from "@calcom/lib/server/i18n"; import type { Prisma } from "@calcom/prisma/client"; import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential"; @@ -53,7 +53,7 @@ export { handleNewRecurringBooking } from "@calcom/features/bookings/lib/handleN export { getConnectedDestinationCalendarsAndEnsureDefaultsInDb } from "@calcom/lib/getConnectedDestinationCalendars"; -export { getBusyCalendarTimes } from "@calcom/lib/CalendarManager"; +export { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager"; export type { BookingCreateBody, BookingResponse } from "@calcom/features/bookings/types"; export { HttpError } from "@calcom/lib/http-error"; diff --git a/packages/trpc/server/routers/viewer/availability/calendarOverlay.handler.ts b/packages/trpc/server/routers/viewer/availability/calendarOverlay.handler.ts index 253c390e55..b43960dfe6 100644 --- a/packages/trpc/server/routers/viewer/availability/calendarOverlay.handler.ts +++ b/packages/trpc/server/routers/viewer/availability/calendarOverlay.handler.ts @@ -1,5 +1,5 @@ import dayjs from "@calcom/dayjs"; -import { getBusyCalendarTimes } from "@calcom/lib/CalendarManager"; +import { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager"; import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/lib/delegationCredential/server"; import { prisma } from "@calcom/prisma"; import type { EventBusyDate } from "@calcom/types/Calendar"; diff --git a/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts b/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts index a2ce6f27a0..3262b70d4c 100644 --- a/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts @@ -1,10 +1,10 @@ import dayjs from "@calcom/dayjs"; import { sendAddGuestsEmails } from "@calcom/emails"; -import EventManager from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { getUsersCredentialsIncludeServiceAccountKey } from "@calcom/lib/server/getUsersCredentials"; import { getTranslation } from "@calcom/lib/server/i18n"; -import { isTeamAdmin, isTeamOwner } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin, isTeamOwner } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { BookingResponses } from "@calcom/prisma/zod-utils"; import type { CalendarEvent } from "@calcom/types/Calendar"; diff --git a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts index 217e2435b5..7838b91c56 100644 --- a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts @@ -4,7 +4,7 @@ import { getEventLocationType, OrganizerDefaultConferencingAppType } from "@calc import { getAppFromSlug } from "@calcom/app-store/utils"; import { sendLocationChangeEmailsAndSMS } from "@calcom/emails"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; -import EventManager from "@calcom/lib/EventManager"; +import EventManager from "@calcom/features/bookings/lib/EventManager"; import { buildCalEventFromBooking } from "@calcom/lib/buildCalEventFromBooking"; import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; diff --git a/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.handler.test.ts b/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.handler.test.ts index 3ee56c837d..96905b8d32 100644 --- a/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.handler.test.ts +++ b/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.handler.test.ts @@ -12,7 +12,7 @@ import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAn import { describe, it, vi, expect } from "vitest"; -import { getConnectedCalendars } from "@calcom/lib/CalendarManager"; +import { getConnectedCalendars } from "@calcom/features/calendars/lib/CalendarManager"; import { SchedulingType, MembershipRole } from "@calcom/prisma/enums"; import { TRPCError } from "@trpc/server"; @@ -20,7 +20,7 @@ import { TRPCError } from "@trpc/server"; import type { TrpcSessionUser } from "../../../types"; import { setDestinationCalendarHandler } from "./setDestinationCalendar.handler"; -vi.mock("@calcom/lib/CalendarManager", () => ({ +vi.mock("@calcom/features/calendars/lib/CalendarManager", () => ({ getConnectedCalendars: vi.fn(), getCalendarCredentials: vi.fn().mockImplementation((creds) => creds), })); diff --git a/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.handler.ts b/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.handler.ts index a1190f61c6..d7cbe3a7a1 100644 --- a/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.handler.ts +++ b/packages/trpc/server/routers/viewer/calendars/setDestinationCalendar.handler.ts @@ -1,4 +1,4 @@ -import { getCalendarCredentials, getConnectedCalendars } from "@calcom/lib/CalendarManager"; +import { getCalendarCredentials, getConnectedCalendars } from "@calcom/features/calendars/lib/CalendarManager"; import { getUsersCredentialsIncludeServiceAccountKey } from "@calcom/lib/server/getUsersCredentials"; import { DestinationCalendarRepository } from "@calcom/lib/server/repository/destinationCalendar"; import { prisma } from "@calcom/prisma"; diff --git a/packages/trpc/server/routers/viewer/eventTypes/get.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/get.handler.ts index 638bd93ed9..8597879363 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/get.handler.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/get.handler.ts @@ -1,4 +1,4 @@ -import getEventTypeById from "@calcom/lib/event-types/getEventTypeById"; +import getEventTypeById from "@calcom/features/eventtypes/lib/getEventTypeById"; import type { PrismaClient } from "@calcom/prisma"; import type { TrpcSessionUser } from "../../../types"; diff --git a/packages/trpc/server/routers/viewer/me/getUserTopBanners.handler.ts b/packages/trpc/server/routers/viewer/me/getUserTopBanners.handler.ts index c301a6a2c8..16510e3790 100644 --- a/packages/trpc/server/routers/viewer/me/getUserTopBanners.handler.ts +++ b/packages/trpc/server/routers/viewer/me/getUserTopBanners.handler.ts @@ -1,4 +1,4 @@ -import { getCalendarCredentials, getConnectedCalendars } from "@calcom/lib/CalendarManager"; +import { getCalendarCredentials, getConnectedCalendars } from "@calcom/features/calendars/lib/CalendarManager"; import { buildNonDelegationCredentials } from "@calcom/lib/delegationCredential/server"; import { prisma } from "@calcom/prisma"; import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential"; diff --git a/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts b/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts index 14688c6e93..b6ba852f8f 100644 --- a/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts +++ b/packages/trpc/server/routers/viewer/me/updateProfile.handler.ts @@ -12,7 +12,7 @@ import logger from "@calcom/lib/logger"; import { uploadAvatar } from "@calcom/lib/server/avatar"; import { checkUsername } from "@calcom/lib/server/checkUsername"; import { getTranslation } from "@calcom/lib/server/i18n"; -import { updateNewTeamMemberEventTypes } from "@calcom/lib/server/queries/teams"; +import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries"; import { resizeBase64Image } from "@calcom/lib/server/resizeBase64Image"; import slugify from "@calcom/lib/slugify"; import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts"; diff --git a/packages/trpc/server/routers/viewer/organizations/utils.ts b/packages/trpc/server/routers/viewer/organizations/utils.ts index 313c305ac3..260bcbc7fd 100644 --- a/packages/trpc/server/routers/viewer/organizations/utils.ts +++ b/packages/trpc/server/routers/viewer/organizations/utils.ts @@ -1,5 +1,5 @@ import { isOrganisationAdmin } from "@calcom/lib/server/queries/organisations"; -import { updateNewTeamMemberEventTypes } from "@calcom/lib/server/queries/teams"; +import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; import { MembershipRole } from "@calcom/prisma/enums"; diff --git a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts index 966c8e94e0..2145d2e219 100644 --- a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts +++ b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts @@ -70,7 +70,7 @@ export const findTeamMembersMatchingAttributeLogicOfRouteHandler = async ({ }: FindTeamMembersMatchingAttributeLogicOfRouteHandlerOptions) => { const { prisma, user } = ctx; const { getTeamMemberEmailForResponseOrContactUsingUrlQuery } = await import( - "@calcom/lib/server/getTeamMemberEmailFromCrm" + "@calcom/features/ee/teams/lib/getTeamMemberEmailFromCrm" ); const { formId, response, route, isPreview, _enablePerf, _concurrency } = input; diff --git a/packages/trpc/server/routers/viewer/teams/acceptOrLeave.handler.ts b/packages/trpc/server/routers/viewer/teams/acceptOrLeave.handler.ts index 0e4a6b67b5..9bcd76b1ac 100644 --- a/packages/trpc/server/routers/viewer/teams/acceptOrLeave.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/acceptOrLeave.handler.ts @@ -1,5 +1,5 @@ import { createAProfileForAnExistingUser } from "@calcom/lib/createAProfileForAnExistingUser"; -import { updateNewTeamMemberEventTypes } from "@calcom/lib/server/queries/teams"; +import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { TrpcSessionUser } from "@calcom/trpc/server/types"; diff --git a/packages/trpc/server/routers/viewer/teams/addMembersToEventTypes.handler.ts b/packages/trpc/server/routers/viewer/teams/addMembersToEventTypes.handler.ts index b308a16f6e..501fd0d7ba 100644 --- a/packages/trpc/server/routers/viewer/teams/addMembersToEventTypes.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/addMembersToEventTypes.handler.ts @@ -1,4 +1,4 @@ -import { isTeamAdmin, isTeamOwner } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin, isTeamOwner } from "@calcom/features/ee/teams/lib/queries"; import prisma from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; diff --git a/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts b/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts index 5fdc873aa9..47a7351e4a 100644 --- a/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts @@ -1,5 +1,5 @@ import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory"; -import { isTeamOwner } from "@calcom/lib/server/queries/teams"; +import { isTeamOwner } from "@calcom/features/ee/teams/lib/queries"; import { TeamRepository } from "@calcom/lib/server/repository/team"; import { prisma } from "@calcom/prisma"; import { MembershipRole } from "@calcom/prisma/enums"; diff --git a/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts b/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts index c17e356dda..d066f867af 100644 --- a/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts @@ -1,7 +1,7 @@ import { randomBytes } from "crypto"; import { WEBAPP_URL } from "@calcom/lib/constants"; -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { TrpcSessionUser } from "@calcom/trpc/server/types"; diff --git a/packages/trpc/server/routers/viewer/teams/delete.handler.ts b/packages/trpc/server/routers/viewer/teams/delete.handler.ts index ad050fd77c..b5f278686a 100644 --- a/packages/trpc/server/routers/viewer/teams/delete.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/delete.handler.ts @@ -1,4 +1,4 @@ -import { isTeamOwner } from "@calcom/lib/server/queries/teams"; +import { isTeamOwner } from "@calcom/features/ee/teams/lib/queries"; import { TeamService } from "@calcom/lib/server/service/teamService"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/teams/deleteInvite.handler.ts b/packages/trpc/server/routers/viewer/teams/deleteInvite.handler.ts index a68dec79a9..670ed1ddd6 100644 --- a/packages/trpc/server/routers/viewer/teams/deleteInvite.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/deleteInvite.handler.ts @@ -1,4 +1,4 @@ -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { TrpcSessionUser } from "@calcom/trpc/server/types"; diff --git a/packages/trpc/server/routers/viewer/teams/get.handler.test.ts b/packages/trpc/server/routers/viewer/teams/get.handler.test.ts index 492bff6ac6..76ff6b87a5 100644 --- a/packages/trpc/server/routers/viewer/teams/get.handler.test.ts +++ b/packages/trpc/server/routers/viewer/teams/get.handler.test.ts @@ -1,6 +1,6 @@ import { describe, it, beforeEach, vi, expect } from "vitest"; -import { getTeamWithoutMembers } from "@calcom/lib/server/queries/teams"; +import { getTeamWithoutMembers } from "@calcom/features/ee/teams/lib/queries"; import { MembershipRepository } from "@calcom/lib/server/repository/membership"; import type { TrpcSessionUser } from "../../../types"; @@ -12,7 +12,7 @@ vi.mock("@calcom/lib/server/repository/membership", () => ({ }, })); -vi.mock("@calcom/lib/server/queries/teams", () => ({ +vi.mock("@calcom/features/ee/teams/lib/queries", () => ({ getTeamWithoutMembers: vi.fn(), })); diff --git a/packages/trpc/server/routers/viewer/teams/get.handler.ts b/packages/trpc/server/routers/viewer/teams/get.handler.ts index aa78a89850..9590d107ef 100644 --- a/packages/trpc/server/routers/viewer/teams/get.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/get.handler.ts @@ -1,4 +1,4 @@ -import { getTeamWithoutMembers } from "@calcom/lib/server/queries/teams"; +import { getTeamWithoutMembers } from "@calcom/features/ee/teams/lib/queries"; import { MembershipRepository } from "@calcom/lib/server/repository/membership"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/teams/getInternalNotesPresets.handler.ts b/packages/trpc/server/routers/viewer/teams/getInternalNotesPresets.handler.ts index a994ae2385..389697de15 100644 --- a/packages/trpc/server/routers/viewer/teams/getInternalNotesPresets.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/getInternalNotesPresets.handler.ts @@ -1,4 +1,4 @@ -import { isTeamMember } from "@calcom/lib/server/queries/teams"; +import { isTeamMember } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { TrpcSessionUser } from "@calcom/trpc/server/types"; diff --git a/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts b/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts index 45472dbe2e..4c42c41b89 100644 --- a/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts @@ -1,6 +1,6 @@ import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/lib/delegationCredential/server"; import { getUserAvailabilityService } from "@calcom/lib/di/containers/GetUserAvailability"; -import { isTeamMember } from "@calcom/lib/server/queries/teams"; +import { isTeamMember } from "@calcom/features/ee/teams/lib/queries"; import { MembershipRepository } from "@calcom/lib/server/repository/membership"; import type { TrpcSessionUser } from "@calcom/trpc/server/types"; diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts index adb6674499..386325a91d 100644 --- a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts +++ b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMemberUtils.test.ts @@ -1,7 +1,7 @@ import { describe, it, vi, expect } from "vitest"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { isOrganisationAdmin } from "@calcom/lib/server/queries/organisations"; -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; import { MembershipRole } from "@calcom/prisma/enums"; import { TRPCError } from "@trpc/server"; @@ -25,7 +25,7 @@ vi.mock("@calcom/prisma", () => { }; }); -vi.mock("@calcom/lib/server/queries/teams", () => { +vi.mock("@calcom/features/ee/teams/lib/queries", () => { return { isTeamAdmin: vi.fn(), }; diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts index 9eef0f33e8..b27dbe9496 100644 --- a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts +++ b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts @@ -11,8 +11,8 @@ import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; import { getTranslation } from "@calcom/lib/server/i18n"; import { isOrganisationAdmin } from "@calcom/lib/server/queries/organisations"; -import { updateNewTeamMemberEventTypes } from "@calcom/lib/server/queries/teams"; -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { ProfileRepository } from "@calcom/lib/server/repository/profile"; import { getParsedTeam } from "@calcom/lib/server/repository/teamUtils"; import { UserRepository } from "@calcom/lib/server/repository/user"; diff --git a/packages/trpc/server/routers/viewer/teams/publish.handler.ts b/packages/trpc/server/routers/viewer/teams/publish.handler.ts index 6e8d762f21..4706fe0ebb 100644 --- a/packages/trpc/server/routers/viewer/teams/publish.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/publish.handler.ts @@ -2,7 +2,7 @@ import { purchaseTeamOrOrgSubscription } from "@calcom/features/ee/teams/lib/pay import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants"; import { Redirect } from "@calcom/lib/redirect"; import { isOrganisationAdmin } from "@calcom/lib/server/queries/organisations"; -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { TeamService } from "@calcom/lib/server/service/teamService"; import { teamMetadataSchema } from "@calcom/prisma/zod-utils"; diff --git a/packages/trpc/server/routers/viewer/teams/removeHostsFromEventTypes.handler.ts b/packages/trpc/server/routers/viewer/teams/removeHostsFromEventTypes.handler.ts index 97a21711ab..d0b3efb4af 100644 --- a/packages/trpc/server/routers/viewer/teams/removeHostsFromEventTypes.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/removeHostsFromEventTypes.handler.ts @@ -1,4 +1,4 @@ -import { isTeamAdmin, isTeamOwner } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin, isTeamOwner } from "@calcom/features/ee/teams/lib/queries"; import prisma from "@calcom/prisma"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/teams/removeMember.handler.ts b/packages/trpc/server/routers/viewer/teams/removeMember.handler.ts index 82323bfa91..730fb90cc4 100644 --- a/packages/trpc/server/routers/viewer/teams/removeMember.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/removeMember.handler.ts @@ -2,7 +2,7 @@ import { FeaturesRepository } from "@calcom/features/flags/features.repository"; import { Resource, CustomAction } from "@calcom/features/pbac/domain/types/permission-registry"; import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permissions"; import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError"; -import { isTeamOwner } from "@calcom/lib/server/queries/teams"; +import { isTeamOwner } from "@calcom/features/ee/teams/lib/queries"; import { TeamService } from "@calcom/lib/server/service/teamService"; import { prisma } from "@calcom/prisma"; import { MembershipRole } from "@calcom/prisma/enums"; diff --git a/packages/trpc/server/routers/viewer/teams/setInviteExpiration.handler.ts b/packages/trpc/server/routers/viewer/teams/setInviteExpiration.handler.ts index 9f81cd2c55..810d85e904 100644 --- a/packages/trpc/server/routers/viewer/teams/setInviteExpiration.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/setInviteExpiration.handler.ts @@ -1,4 +1,4 @@ -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { TrpcSessionUser } from "@calcom/trpc/server/types"; diff --git a/packages/trpc/server/routers/viewer/teams/update.handler.ts b/packages/trpc/server/routers/viewer/teams/update.handler.ts index 8abfa2746f..c2cbc642b8 100644 --- a/packages/trpc/server/routers/viewer/teams/update.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/update.handler.ts @@ -3,7 +3,7 @@ import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants"; import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema"; import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateIntervalLimitOrder"; import { uploadLogo } from "@calcom/lib/server/avatar"; -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; import { RedirectType, RRTimestampBasis } from "@calcom/prisma/enums"; diff --git a/packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.handler.ts b/packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.handler.ts index 53a8742ae5..48216327c3 100644 --- a/packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.handler.ts @@ -1,4 +1,4 @@ -import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; +import { isTeamAdmin } from "@calcom/features/ee/teams/lib/queries"; import { prisma } from "@calcom/prisma"; import type { TrpcSessionUser } from "@calcom/trpc/server/types"; diff --git a/tests/libs/__mocks__/CalendarManager.ts b/tests/libs/__mocks__/CalendarManager.ts index 4554b060e2..ecfdc6d4a2 100644 --- a/tests/libs/__mocks__/CalendarManager.ts +++ b/tests/libs/__mocks__/CalendarManager.ts @@ -1,9 +1,9 @@ import { beforeEach, vi } from "vitest"; import { mockReset, mockDeep } from "vitest-mock-extended"; -import type * as CalendarManager from "@calcom/lib/CalendarManager"; +import type * as CalendarManager from "@calcom/features/calendars/lib/CalendarManager"; -vi.mock("@calcom/lib/CalendarManager", () => CalendarManagerMock); +vi.mock("@calcom/features/calendars/lib/CalendarManager", () => CalendarManagerMock); beforeEach(() => { mockReset(CalendarManagerMock);