Scheduling infrastructure for absolutely everyone.
refactor: Remove circular deps between @calcom/lib and @calcom/features [2] (#24438)
Benny Jooe91bf53d8029
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERSindex 693c2f68454..525c155e227 100644--- a/.github/CODEOWNERS+++ b/.github/CODEOWNERS@@ -24,10 +24,10 @@/packages/embeds/**/* @calcom/Foundation/packages/features/auth/lib/next-auth-options.ts @calcom/Foundation/packages/features/bookings/lib/**/* @calcom/Foundation-/packages/lib/getAggregatedAvailability.ts @calcom/Foundation-/packages/lib/getUserAvailability.ts @calcom/Foundation-/packages/lib/server/getLuckyUser.ts @calcom/Foundation-/packages/lib/slots.ts @calcom/Foundation+/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts @calcom/Foundation+/packages/features/availability/lib/getUserAvailability.ts @calcom/Foundation+/packages/features/bookings/lib/getLuckyUser.ts @calcom/Foundation+/packages/features/schedules/lib/slots.ts @calcom/Foundation/packages/platform/atoms/**/*WebWrapper.tsx @calcom/Consumer/packages/platform/**/* @calcom/Platform @calcom/Foundation/packages/prisma/**/* @calcom/Foundationdiff --git a/apps/api/v1/pages/api/teams/[teamId]/_patch.ts b/apps/api/v1/pages/api/teams/[teamId]/_patch.tsindex d7fe9e33e22..b588c0147af 100644--- a/apps/api/v1/pages/api/teams/[teamId]/_patch.ts+++ b/apps/api/v1/pages/api/teams/[teamId]/_patch.ts@@ -1,10 +1,10 @@import type { NextApiRequest } from "next";import { purchaseTeamOrOrgSubscription } from "@calcom/features/ee/teams/lib/payments";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";import { HttpError } from "@calcom/lib/http-error";import { defaultResponder } from "@calcom/lib/server/defaultResponder";-import { TeamRepository } from "@calcom/lib/server/repository/team";import prisma from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";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.tsindex 7821e16c2ef..fb608f3867d 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@@ -13,7 +13,7 @@ import { getTeamEventType } from "@calcom/features/eventtypes/lib/getTeamEventTyimport { FeaturesRepository } from "@calcom/features/flags/features.repository";import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";import { prisma } from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsxindex 8a8ae334b91..bca38f4981d 100644--- a/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx@@ -4,7 +4,7 @@ import { unstable_cache } from "next/cache";import { TeamsListing } from "@calcom/features/ee/teams/components/TeamsListing";import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { TeamService } from "@calcom/features/ee/teams/services/teamService";import prisma from "@calcom/prisma";import { MembershipRole } from "@calcom/prisma/enums";diff --git a/apps/web/app/api/cron/credentials/route.ts b/apps/web/app/api/cron/credentials/route.tsindex c771e4ec815..1ce4dc1ef86 100644--- a/apps/web/app/api/cron/credentials/route.ts+++ b/apps/web/app/api/cron/credentials/route.ts@@ -6,11 +6,11 @@import type { NextRequest } from "next/server";import { NextResponse } from "next/server";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { HttpError } from "@calcom/lib/http-error";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";import { defaultResponderForAppDir } from "../../defaultResponderForAppDir";diff --git a/apps/web/app/api/cron/selected-calendars/route.ts b/apps/web/app/api/cron/selected-calendars/route.tsindex b311a63dbe0..22a91932c4f 100644--- a/apps/web/app/api/cron/selected-calendars/route.ts+++ b/apps/web/app/api/cron/selected-calendars/route.ts@@ -12,7 +12,7 @@ import { findUniqueDelegationCalendarCredential } from "@calcom/app-store/delegaimport { HttpError } from "@calcom/lib/http-error";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";import type { Ensure } from "@calcom/types/utils";diff --git a/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx b/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsxindex 1eef2d3c007..7ea04380bdd 100644--- a/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx+++ b/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx@@ -8,12 +8,12 @@ import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";import { FeaturesRepository } from "@calcom/features/flags/features.repository";+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";import {shouldHideBrandingForTeamEvent,shouldHideBrandingForUserEvent,} from "@calcom/features/profile/lib/hideBranding";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";import slugify from "@calcom/lib/slugify";import prisma from "@calcom/prisma";import { RedirectType } from "@calcom/prisma/enums";diff --git a/apps/web/lib/pages/auth/verify-email.test.ts b/apps/web/lib/pages/auth/verify-email.test.tsindex ddd21bd9a69..d11e370cdd4 100644--- a/apps/web/lib/pages/auth/verify-email.test.ts+++ b/apps/web/lib/pages/auth/verify-email.test.ts@@ -1,4 +1,4 @@-import { organizationScenarios } from "@calcom/lib/server/repository/__mocks__/organization";+import { organizationScenarios } from "@calcom/features/ee/organizations/__mocks__/organizationMock";import { describe, it, expect, beforeEach, vi } from "vitest";diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.tsindex 65d40b6233c..5c69b8a7c76 100644--- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts+++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts@@ -4,11 +4,11 @@ import { URLSearchParams } from "url";import { z } from "zod";import { getServerSession } from "@calcom/features/auth/lib/getServerSession";+import { buildEventUrlFromBooking } from "@calcom/features/bookings/lib/buildEventUrlFromBooking";import { determineReschedulePreventionRedirect } from "@calcom/features/bookings/lib/reschedule/determineReschedulePreventionRedirect";import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";-import { buildEventUrlFromBooking } from "@calcom/lib/bookings/buildEventUrlFromBooking";-import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";+import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";import prisma, { bookingMinimalSelect } from "@calcom/prisma";const querySchema = z.object({diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsxindex 3317f24999a..6eb21c2e239 100644--- a/apps/web/modules/bookings/views/bookings-single-view.tsx+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx@@ -24,9 +24,13 @@ import {import { Price } from "@calcom/features/bookings/components/event-meta/Price";import { getCalendarLinks, CalendarLinkType } from "@calcom/features/bookings/lib/getCalendarLinks";import { RATING_OPTIONS, validateRating } from "@calcom/features/bookings/lib/rating";+import {+ SMS_REMINDER_NUMBER_FIELD,+ SystemField,+ TITLE_FIELD,+} from "@calcom/lib/bookings/SystemField";import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";-import { SMS_REMINDER_NUMBER_FIELD, SystemField, TITLE_FIELD } from "@calcom/lib/SystemField";import { APP_NAME } from "@calcom/lib/constants";import { formatToLocalizedDate, formatToLocalizedTime, formatToLocalizedTimezone } from "@calcom/lib/dayjs";import useGetBrandingColours from "@calcom/lib/getBrandColours";@@ -767,7 +771,7 @@ export default function Success(props: PageProps) {<Fragment key={field.name}><divclassName="text-emphasis mt-4 font-medium"- // eslint-disable-next-line react/no-danger+dangerouslySetInnerHTML={{__html: markdownToSafeHTML(label),}}@@ -1080,7 +1084,7 @@ export default function Success(props: PageProps) {<span className="underline"><atarget="_blank"- href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations">+ href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations" rel="noreferrer">{t("resolve")}</a></span>diff --git a/apps/web/modules/settings/teams/[id]/event-types-view.tsx b/apps/web/modules/settings/teams/[id]/event-types-view.tsxindex f0301842309..c06a3afbcce 100644--- a/apps/web/modules/settings/teams/[id]/event-types-view.tsx+++ b/apps/web/modules/settings/teams/[id]/event-types-view.tsx@@ -4,8 +4,8 @@ import { useRouter } from "next/navigation";import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";+import { useCreateEventType } from "@calcom/features/eventtypes/hooks/useCreateEventType";import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";-import { useCreateEventType } from "@calcom/lib/hooks/useCreateEventType";import { useLocale } from "@calcom/lib/hooks/useLocale";import { trpc } from "@calcom/trpc/react";import { Button } from "@calcom/ui/components/button";diff --git a/apps/web/modules/test-setup.ts b/apps/web/modules/test-setup.tsindex 76546ef66b9..8b057660576 100644--- a/apps/web/modules/test-setup.ts+++ b/apps/web/modules/test-setup.ts@@ -60,7 +60,7 @@ vi.mock("@calcom/features/bookings/components/event-meta/Price", () => {return {};});-vi.mock("@calcom/lib/SystemField", () => {+vi.mock("@calcom/lib/bookings/SystemField", () => {return {};});diff --git a/packages/app-store/_utils/installation.ts b/packages/app-store/_utils/installation.tsindex 4d77769d774..611155c637b 100644--- a/packages/app-store/_utils/installation.ts+++ b/packages/app-store/_utils/installation.ts@@ -1,5 +1,5 @@import { HttpError } from "@calcom/lib/http-error";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import prisma from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";import type { UserProfile } from "@calcom/types/UserProfile";diff --git a/packages/app-store/_utils/oauth/getCurrentTokenObject.ts b/packages/app-store/_utils/oauth/getCurrentTokenObject.tsindex 1e6110bf366..a19095f64d2 100644--- a/packages/app-store/_utils/oauth/getCurrentTokenObject.ts+++ b/packages/app-store/_utils/oauth/getCurrentTokenObject.ts@@ -1,6 +1,6 @@import { isInMemoryDelegationCredential } from "@calcom/lib/delegationCredential";import logger from "@calcom/lib/logger";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import type { CredentialForCalendarService } from "@calcom/types/Credential";import { getTokenObjectFromCredential } from "./getTokenObjectFromCredential";diff --git a/packages/app-store/_utils/oauth/updateTokenObject.ts b/packages/app-store/_utils/oauth/updateTokenObject.tsindex d7ba4ef6032..2ca29cd5970 100644--- a/packages/app-store/_utils/oauth/updateTokenObject.ts+++ b/packages/app-store/_utils/oauth/updateTokenObject.ts@@ -1,7 +1,7 @@import type z from "zod";import logger from "@calcom/lib/logger";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { prisma } from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";diff --git a/packages/app-store/btcpayserver/pages/setup/_getServerSideProps.tsx b/packages/app-store/btcpayserver/pages/setup/_getServerSideProps.tsxindex 5e79d6945b9..800c5950657 100644--- a/packages/app-store/btcpayserver/pages/setup/_getServerSideProps.tsx+++ b/packages/app-store/btcpayserver/pages/setup/_getServerSideProps.tsx@@ -2,7 +2,7 @@ import type { GetServerSidePropsContext } from "next";import { z } from "zod";import { getServerSession } from "@calcom/features/auth/lib/getServerSession";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { btcpayCredentialKeysSchema } from "../../lib/btcpayCredentialKeysSchema";diff --git a/packages/app-store/delegationCredential.test.ts b/packages/app-store/delegationCredential.test.tsindex 7fde091e8dd..37f09eece30 100644--- a/packages/app-store/delegationCredential.test.ts+++ b/packages/app-store/delegationCredential.test.ts@@ -4,8 +4,8 @@ import { describe, it, expect, beforeEach, vi } from "vitest";import { metadata as googleCalendarMetadata } from "@calcom/app-store/googlecalendar/_metadata";import { metadata as googleMeetMetadata } from "@calcom/app-store/googlevideo/_metadata";-import type { ServiceAccountKey } from "@calcom/lib/server/repository/delegationCredential";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";import { SMSLockState, RRTimestampBasis } from "@calcom/prisma/enums";import type { CredentialForCalendarService, CredentialPayload } from "@calcom/types/Credential";@@ -28,7 +28,7 @@ vi.mock("@calcom/features/ee/organizations/repositories/OrganizationRepository",}));// Mock DelegationCredentialRepository-vi.mock("@calcom/lib/server/repository/delegationCredential", () => ({+vi.mock("@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository", () => ({DelegationCredentialRepository: {findUniqueByOrgMemberEmailIncludeSensitiveServiceAccountKey: vi.fn(),findUniqueByOrganizationIdAndDomainIncludeSensitiveServiceAccountKey: vi.fn(),diff --git a/packages/app-store/delegationCredential.ts b/packages/app-store/delegationCredential.tsindex 3642c6afa86..b0bdefb1bf1 100644--- a/packages/app-store/delegationCredential.ts+++ b/packages/app-store/delegationCredential.ts@@ -10,9 +10,9 @@ import {} from "@calcom/lib/delegationCredential";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";-import type { ServiceAccountKey } from "@calcom/lib/server/repository/delegationCredential";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";import { prisma } from "@calcom/prisma";import type { SelectedCalendar } from "@calcom/prisma/client";diff --git a/packages/app-store/dub/lib/AnalyticsService.ts b/packages/app-store/dub/lib/AnalyticsService.tsindex 14af8e6b507..71fd037a8b5 100644--- a/packages/app-store/dub/lib/AnalyticsService.ts+++ b/packages/app-store/dub/lib/AnalyticsService.ts@@ -1,7 +1,7 @@import { Dub } from "dub-package";import logger from "@calcom/lib/logger";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import type { AnalyticsService, SendEventProps } from "@calcom/types/AnalyticsService";import type { CredentialPayload } from "@calcom/types/Credential";diff --git a/packages/app-store/googlecalendar/api/callback.ts b/packages/app-store/googlecalendar/api/callback.tsindex 85c3ba0be65..283841c6b58 100644--- a/packages/app-store/googlecalendar/api/callback.ts+++ b/packages/app-store/googlecalendar/api/callback.ts@@ -14,7 +14,7 @@ import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";import { HttpError } from "@calcom/lib/http-error";import { defaultHandler } from "@calcom/lib/server/defaultHandler";import { defaultResponder } from "@calcom/lib/server/defaultResponder";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { Prisma } from "@calcom/prisma/client";import getInstalledAppPath from "../../_utils/getInstalledAppPath";diff --git a/packages/app-store/hubspot/lib/CrmService.ts b/packages/app-store/hubspot/lib/CrmService.tsindex e94849f34d0..4c75cde9405 100644--- a/packages/app-store/hubspot/lib/CrmService.ts+++ b/packages/app-store/hubspot/lib/CrmService.ts@@ -7,8 +7,8 @@ import type {SimplePublicObjectInput,} from "@hubspot/api-client/lib/codegen/crm/objects/meetings";-import getLabelValueMapFromResponses from "@calcom/features/bookings/lib/getLabelValueMapFromResponses";import { getLocation } from "@calcom/lib/CalEventParser";+import getLabelValueMapFromResponses from "@calcom/lib/bookings/getLabelValueMapFromResponses";import { WEBAPP_URL } from "@calcom/lib/constants";import { HttpError } from "@calcom/lib/http-error";import logger from "@calcom/lib/logger";diff --git a/packages/app-store/routing-forms/api/responses/[formId].ts b/packages/app-store/routing-forms/api/responses/[formId].tsindex 8bfb73d675a..0d07bdce73e 100644--- a/packages/app-store/routing-forms/api/responses/[formId].ts+++ b/packages/app-store/routing-forms/api/responses/[formId].ts@@ -1,8 +1,11 @@import type { NextApiRequest, NextApiResponse } from "next";import { getSession } from "next-auth/react";+import {+ entityPrismaWhereClause,+ canEditEntity,+} from "@calcom/features/pbac/lib/entityPermissionUtils.server";import { sanitizeValue } from "@calcom/lib/csvUtils";-import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";import prisma from "@calcom/prisma";import type { App_RoutingForms_Form } from "@calcom/prisma/client";diff --git a/packages/app-store/routing-forms/lib/formSubmissionUtils.test.ts b/packages/app-store/routing-forms/lib/formSubmissionUtils.test.tsindex 03adbcd2a82..b2b77bb1378 100644--- a/packages/app-store/routing-forms/lib/formSubmissionUtils.test.ts+++ b/packages/app-store/routing-forms/lib/formSubmissionUtils.test.ts@@ -3,9 +3,9 @@ import { prisma } from "@calcom/prisma/__mocks__/prisma";import { describe, it, vi, expect, beforeEach, afterEach } from "vitest";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload";-import { WorkflowService } from "@calcom/lib/server/service/workflows";import {WebhookTriggerEvents,WorkflowTriggerEvents,@@ -37,7 +37,7 @@ vi.mock("@calcom/features/tasker", () => {});// Mock workflow dependencies-vi.mock("@calcom/lib/server/service/workflows", () => ({+vi.mock("@calcom/features/ee/workflows/lib/service/WorkflowService", () => ({WorkflowService: {getAllWorkflowsFromRoutingForm: vi.fn(() => Promise.resolve([])),scheduleFormWorkflows: vi.fn(() => Promise.resolve()),diff --git a/packages/app-store/routing-forms/lib/formSubmissionUtils.ts b/packages/app-store/routing-forms/lib/formSubmissionUtils.tsindex 8c24ece10c4..b05b86816cd 100644--- a/packages/app-store/routing-forms/lib/formSubmissionUtils.ts+++ b/packages/app-store/routing-forms/lib/formSubmissionUtils.ts@@ -6,7 +6,7 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";import { HttpError } from "@calcom/lib/http-error";import logger from "@calcom/lib/logger";import { withReporting } from "@calcom/lib/sentryWrapper";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import { prisma } from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";import type { App_RoutingForms_Form, User } from "@calcom/prisma/client";diff --git a/packages/app-store/routing-forms/lib/getSerializableForm.ts b/packages/app-store/routing-forms/lib/getSerializableForm.tsindex 7c146a6b4a8..b9846a41a57 100644--- a/packages/app-store/routing-forms/lib/getSerializableForm.ts+++ b/packages/app-store/routing-forms/lib/getSerializableForm.ts@@ -1,6 +1,6 @@import type { z } from "zod";-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";import type { App_RoutingForms_Form } from "@calcom/prisma/client";diff --git a/packages/app-store/routing-forms/lib/isFormCreateEditAllowed.ts b/packages/app-store/routing-forms/lib/isFormCreateEditAllowed.tsindex 7460c920403..3d687b57ecc 100644--- a/packages/app-store/routing-forms/lib/isFormCreateEditAllowed.ts+++ b/packages/app-store/routing-forms/lib/isFormCreateEditAllowed.ts@@ -1,4 +1,4 @@-import { canCreateEntity, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";+import { canCreateEntity, canEditEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";import prisma from "@calcom/prisma";import type { App_RoutingForms_Form, User } from "@calcom/prisma/client";diff --git a/packages/app-store/salesforce/lib/routingForm/incompleteBookingAction.ts b/packages/app-store/salesforce/lib/routingForm/incompleteBookingAction.tsindex ae440c55788..e08a2f28ff8 100644--- a/packages/app-store/salesforce/lib/routingForm/incompleteBookingAction.ts+++ b/packages/app-store/salesforce/lib/routingForm/incompleteBookingAction.ts@@ -1,4 +1,4 @@-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import logger from "@calcom/lib/logger";import { routingFormIncompleteBookingDataSchema } from "../../zod";diff --git a/packages/app-store/salesforce/lib/routingFormBookingFormHandler.ts b/packages/app-store/salesforce/lib/routingFormBookingFormHandler.tsindex 01cc317aa3d..53c4ed052b5 100644--- a/packages/app-store/salesforce/lib/routingFormBookingFormHandler.ts+++ b/packages/app-store/salesforce/lib/routingFormBookingFormHandler.ts@@ -1,4 +1,4 @@-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import type { AttributeRoutingConfig } from "../../routing-forms/types/types";import SalesforceCRMService from "./CrmService";diff --git a/packages/app-store/stripepayment/api/__tests__/portal.test.ts b/packages/app-store/stripepayment/api/__tests__/portal.test.tsindex 8c13dc3c14b..5d9880ce12a 100644--- a/packages/app-store/stripepayment/api/__tests__/portal.test.ts+++ b/packages/app-store/stripepayment/api/__tests__/portal.test.ts@@ -4,7 +4,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";import { WEBAPP_URL } from "@calcom/lib/constants";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { MembershipRole } from "@calcom/prisma/enums";import {@@ -18,7 +18,7 @@ import { validateAuthentication, buildReturnUrl } from "../portal";// Mock dependenciesvi.mock("@calcom/features/pbac/services/permission-check.service");-vi.mock("@calcom/lib/server/repository/team");+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");vi.mock("../../lib/customer");vi.mock("../../lib/server");vi.mock("../../lib/subscriptions");diff --git a/packages/app-store/stripepayment/lib/services/base/BillingPortalService.ts b/packages/app-store/stripepayment/lib/services/base/BillingPortalService.tsindex d89afcc68d5..4b92f57697b 100644--- a/packages/app-store/stripepayment/lib/services/base/BillingPortalService.ts+++ b/packages/app-store/stripepayment/lib/services/base/BillingPortalService.ts@@ -4,7 +4,7 @@ import { PermissionCheckService } from "@calcom/features/pbac/services/permissioimport { WEBAPP_URL } from "@calcom/lib/constants";import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";import logger from "@calcom/lib/logger";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import prisma from "@calcom/prisma";import stripe from "../../server";diff --git a/packages/app-store/stripepayment/lib/services/factory/BillingPortalServiceFactory.ts b/packages/app-store/stripepayment/lib/services/factory/BillingPortalServiceFactory.tsindex ece4731ebd0..4611c74cad7 100644--- a/packages/app-store/stripepayment/lib/services/factory/BillingPortalServiceFactory.ts+++ b/packages/app-store/stripepayment/lib/services/factory/BillingPortalServiceFactory.ts@@ -1,4 +1,4 @@-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import prisma from "@calcom/prisma";import type { BillingPortalService } from "../base/BillingPortalService";diff --git a/packages/emails/src/components/UserFieldsResponses.tsx b/packages/emails/src/components/UserFieldsResponses.tsxindex 8312b6441c8..f656c3ec3ec 100644--- a/packages/emails/src/components/UserFieldsResponses.tsx+++ b/packages/emails/src/components/UserFieldsResponses.tsx@@ -1,6 +1,6 @@import type { TFunction } from "i18next";-import getLabelValueMapFromResponses from "@calcom/features/bookings/lib/getLabelValueMapFromResponses";+import getLabelValueMapFromResponses from "@calcom/lib/bookings/getLabelValueMapFromResponses";import type { CalendarEvent } from "@calcom/types/Calendar";import { Info } from "./Info";diff --git a/packages/features/auth/lib/next-auth-options.ts b/packages/features/auth/lib/next-auth-options.tsindex 867ffd42dfa..bd27b53b3e5 100644--- a/packages/features/auth/lib/next-auth-options.ts+++ b/packages/features/auth/lib/next-auth-options.ts@@ -32,7 +32,7 @@ import logger from "@calcom/lib/logger";import { randomString } from "@calcom/lib/random";import { safeStringify } from "@calcom/lib/safeStringify";import { hashEmail } from "@calcom/lib/server/PiiHasher";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { DeploymentRepository } from "@calcom/lib/server/repository/deployment";import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";diff --git a/packages/features/auth/signup/handlers/calcomHandler.ts b/packages/features/auth/signup/handlers/calcomHandler.tsindex c6c87c965e9..76a95feb71f 100644--- a/packages/features/auth/signup/handlers/calcomHandler.ts+++ b/packages/features/auth/signup/handlers/calcomHandler.ts@@ -6,6 +6,7 @@ import { getLocaleFromRequest } from "@calcom/features/auth/lib/getLocaleFromReqimport { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail";import { createOrUpdateMemberships } from "@calcom/features/auth/signup/utils/createOrUpdateMemberships";import { prefillAvatar } from "@calcom/features/auth/signup/utils/prefillAvatar";+import { validateAndGetCorrectedUsernameAndEmail } from "@calcom/features/auth/signup/utils/validateUsername";import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billing-service";import { sentrySpan } from "@calcom/features/watchlist/lib/telemetry";import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";@@ -15,7 +16,6 @@ import { HttpError } from "@calcom/lib/http-error";import logger from "@calcom/lib/logger";import type { CustomNextApiHandler } from "@calcom/lib/server/username";import { usernameHandler } from "@calcom/lib/server/username";-import { validateAndGetCorrectedUsernameAndEmail } from "@calcom/lib/validateUsername";import { prisma } from "@calcom/prisma";import { CreationSource } from "@calcom/prisma/enums";import { IdentityProvider } from "@calcom/prisma/enums";diff --git a/packages/features/auth/signup/handlers/selfHostedHandler.ts b/packages/features/auth/signup/handlers/selfHostedHandler.tsindex 6b2028b2e88..5bfc23335cf 100644--- a/packages/features/auth/signup/handlers/selfHostedHandler.ts+++ b/packages/features/auth/signup/handlers/selfHostedHandler.ts@@ -3,12 +3,12 @@ import { NextResponse } from "next/server";import { checkPremiumUsername } from "@calcom/ee/common/lib/checkPremiumUsername";import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail";import { createOrUpdateMemberships } from "@calcom/features/auth/signup/utils/createOrUpdateMemberships";+import { validateAndGetCorrectedUsernameAndEmail } from "@calcom/features/auth/signup/utils/validateUsername";import { hashPassword } from "@calcom/lib/auth/hashPassword";import { IS_PREMIUM_USERNAME_ENABLED } from "@calcom/lib/constants";import logger from "@calcom/lib/logger";import { isUsernameReservedDueToMigration } from "@calcom/lib/server/username";import slugify from "@calcom/lib/slugify";-import { validateAndGetCorrectedUsernameAndEmail } from "@calcom/lib/validateUsername";import prisma from "@calcom/prisma";import { IdentityProvider } from "@calcom/prisma/enums";import { signupSchema } from "@calcom/prisma/zod-utils";diff --git a/packages/features/auth/signup/utils/token.ts b/packages/features/auth/signup/utils/token.tsindex 88c23c34e8a..843a5d6e87c 100644--- a/packages/features/auth/signup/utils/token.ts+++ b/packages/features/auth/signup/utils/token.ts@@ -1,6 +1,6 @@import dayjs from "@calcom/dayjs";+import { validateAndGetCorrectedUsernameInTeam } from "@calcom/features/auth/signup/utils/validateUsername";import { HttpError } from "@calcom/lib/http-error";-import { validateAndGetCorrectedUsernameInTeam } from "@calcom/lib/validateUsername";import { prisma } from "@calcom/prisma";export async function findTokenByToken({ token }: { token: string }) {diff --git a/packages/lib/validateUsername.ts b/packages/features/auth/signup/utils/validateUsername.tssimilarity index 100%rename from packages/lib/validateUsername.tsrename to packages/features/auth/signup/utils/validateUsername.tsdiff --git a/packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.ts b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.tssimilarity index 100%rename from packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.tsrename to packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.test.tsdiff --git a/packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.tssimilarity index 95%rename from packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.tsrename to packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.tsindex 7bde5594f20..f1706f7dec8 100644--- a/packages/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts+++ b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/filterRedundantDateRanges.ts@@ -1,4 +1,4 @@-import type { DateRange } from "@calcom/lib/date-ranges";+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";import { IntervalTree, ContainmentSearchAlgorithm, createIntervalNodes } from "@calcom/lib/intervalTree";/**diff --git a/packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.tssimilarity index 97%rename from packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.tsrename to packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.tsindex 2aa8cc6809d..1fe980f1c70 100644--- a/packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts+++ b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.test.ts@@ -1,7 +1,7 @@import { describe, it, expect } from "vitest";import dayjs from "@calcom/dayjs";-import type { DateRange } from "@calcom/lib/date-ranges";+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";import { mergeOverlappingDateRanges } from "./mergeOverlappingDateRanges";diff --git a/packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.tssimilarity index 92%rename from packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.tsrename to packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.tsindex 21199be1584..7f2411d33c5 100644--- a/packages/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts+++ b/packages/features/availability/lib/getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges.ts@@ -1,4 +1,4 @@-import type { DateRange } from "@calcom/lib/date-ranges";+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";export function mergeOverlappingDateRanges(dateRanges: DateRange[]) {dateRanges.sort((a, b) => a.start.valueOf() - b.start.valueOf());diff --git a/packages/lib/getAggregatedAvailability.test.ts b/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.test.tssimilarity index 100%rename from packages/lib/getAggregatedAvailability.test.tsrename to packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.test.tsdiff --git a/packages/lib/getAggregatedAvailability.ts b/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.tssimilarity index 87%rename from packages/lib/getAggregatedAvailability.tsrename to packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.tsindex e78f5d19821..ad3afaa1e2f 100644--- a/packages/lib/getAggregatedAvailability.ts+++ b/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts@@ -1,10 +1,10 @@+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";+import { intersect } from "@calcom/features/schedules/lib/date-ranges";import { DEFAULT_GROUP_ID } from "@calcom/lib/constants";-import type { DateRange } from "@calcom/lib/date-ranges";-import { intersect } from "@calcom/lib/date-ranges";import { SchedulingType } from "@calcom/prisma/enums";-import { filterRedundantDateRanges } from "./getAggregatedAvailability/date-range-utils/filterRedundantDateRanges";-import { mergeOverlappingDateRanges } from "./getAggregatedAvailability/date-range-utils/mergeOverlappingDateRanges";+import { filterRedundantDateRanges } from "./date-range-utils/filterRedundantDateRanges";+import { mergeOverlappingDateRanges } from "./date-range-utils/mergeOverlappingDateRanges";function uniqueAndSortedDateRanges(ranges: DateRange[]): DateRange[] {const seen = new Set<string>();diff --git a/packages/features/availability/lib/getUserAvailability.ts b/packages/features/availability/lib/getUserAvailability.tsindex 8d97a1540d1..f135e611592 100644--- a/packages/features/availability/lib/getUserAvailability.ts+++ b/packages/features/availability/lib/getUserAvailability.ts@@ -12,9 +12,9 @@ import {import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes";import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";import type { IRedisService } from "@calcom/features/redis/IRedisService";+import type { DateOverride, WorkingHours } from "@calcom/features/schedules/lib/date-ranges";+import { buildDateRanges, subtract } from "@calcom/features/schedules/lib/date-ranges";import { getWorkingHours } from "@calcom/lib/availability";-import type { DateOverride, WorkingHours } from "@calcom/lib/date-ranges";-import { buildDateRanges, subtract } from "@calcom/lib/date-ranges";import { stringToDayjsZod } from "@calcom/lib/dayjs";import { ErrorCode } from "@calcom/lib/errorCodes";import { HttpError } from "@calcom/lib/http-error";@@ -641,9 +641,9 @@ export class UserAvailabilityService {// you can obtain that from user availability defined outside of herefromUser: { id: user.id, displayName: user.name },// optional chaining destructuring toUser- toUser: !!toUser ? { id: toUser.id, displayName: toUser.name, username: toUser.username } : null,- reason: !!reason ? reason.reason : null,- emoji: !!reason ? reason.emoji : null,+ toUser: toUser ? { id: toUser.id, displayName: toUser.name, username: toUser.username } : null,+ reason: reason ? reason.reason : null,+ emoji: reason ? reason.emoji : null,};}diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsxindex 4712b0bfb6e..3b7195ef782 100644--- a/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx+++ b/packages/features/bookings/Booker/components/BookEventForm/BookingFields.tsx@@ -8,7 +8,7 @@ import getLocationOptionsForSelect from "@calcom/features/bookings/lib/getLocatiimport { FormBuilderField } from "@calcom/features/form-builder/FormBuilderField";import { fieldTypesConfigMap } from "@calcom/features/form-builder/fieldTypes";import { fieldsThatSupportLabelAsSafeHtml } from "@calcom/features/form-builder/fieldsThatSupportLabelAsSafeHtml";-import { SystemField } from "@calcom/lib/SystemField";+import { SystemField } from "@calcom/lib/bookings/SystemField";import { useLocale } from "@calcom/lib/hooks/useLocale";import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";import type { RouterOutputs } from "@calcom/trpc/react";diff --git a/packages/features/bookings/lib/EventManager.ts b/packages/features/bookings/lib/EventManager.tsindex f0819ec7711..fe254500a2c 100644--- a/packages/features/bookings/lib/EventManager.ts+++ b/packages/features/bookings/lib/EventManager.ts@@ -24,7 +24,7 @@ import {getPiiFreeCalendarEvent,} from "@calcom/lib/piiFreeData";import { safeStringify } from "@calcom/lib/safeStringify";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { prisma } from "@calcom/prisma";import type { DestinationCalendar, BookingReference } from "@calcom/prisma/client";import { createdEventSchema } from "@calcom/prisma/zod-utils";diff --git a/packages/lib/bookings/buildEventUrlFromBooking.test.ts b/packages/features/bookings/lib/buildEventUrlFromBooking.test.tssimilarity index 100%rename from packages/lib/bookings/buildEventUrlFromBooking.test.tsrename to packages/features/bookings/lib/buildEventUrlFromBooking.test.tsdiff --git a/packages/lib/bookings/buildEventUrlFromBooking.ts b/packages/features/bookings/lib/buildEventUrlFromBooking.tssimilarity index 97%rename from packages/lib/bookings/buildEventUrlFromBooking.tsrename to packages/features/bookings/lib/buildEventUrlFromBooking.tsindex c7c722910f1..cf5e3754856 100644--- a/packages/lib/bookings/buildEventUrlFromBooking.ts+++ b/packages/features/bookings/lib/buildEventUrlFromBooking.ts@@ -1,8 +1,7 @@import { getBookerBaseUrl } from "@calcom/features/ee/organizations/lib/getBookerUrlServer";+import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import logger from "../logger";-type BookingEventType = {slug: string;team: {diff --git a/packages/lib/bookings/getAllUserBookings.ts b/packages/features/bookings/lib/getAllUserBookings.tssimilarity index 100%rename from packages/lib/bookings/getAllUserBookings.tsrename to packages/features/bookings/lib/getAllUserBookings.tsdiff --git a/packages/features/bookings/lib/getBookingFields.ts b/packages/features/bookings/lib/getBookingFields.tsindex 6897f69922d..d3639ecda0a 100644--- a/packages/features/bookings/lib/getBookingFields.ts+++ b/packages/features/bookings/lib/getBookingFields.ts@@ -3,7 +3,7 @@ import type { z } from "zod";import {SMS_REMINDER_NUMBER_FIELD,CAL_AI_AGENT_PHONE_NUMBER_FIELD,-} from "@calcom/lib/SystemField";+} from "@calcom/lib/bookings/SystemField";import type { Workflow } from "@calcom/features/ee/workflows/lib/types";import { fieldsThatSupportLabelAsSafeHtml } from "@calcom/features/form-builder/fieldsThatSupportLabelAsSafeHtml";import { getFieldIdentifier } from "@calcom/features/form-builder/utils/getFieldIdentifier";diff --git a/packages/features/bookings/lib/getBookingResponsesSchema.ts b/packages/features/bookings/lib/getBookingResponsesSchema.tsindex d7269224551..249806982a6 100644--- a/packages/features/bookings/lib/getBookingResponsesSchema.ts+++ b/packages/features/bookings/lib/getBookingResponsesSchema.ts@@ -2,7 +2,8 @@ import { isValidPhoneNumber } from "libphonenumber-js";import z from "zod";import type { ALL_VIEWS } from "@calcom/features/form-builder/schema";-import { dbReadResponseSchema, fieldTypesSchemaMap } from "@calcom/features/form-builder/schema";+import { fieldTypesSchemaMap } from "@calcom/features/form-builder/schema";+import { dbReadResponseSchema } from "@calcom/lib/dbReadResponseSchema";import type { eventTypeBookingFields } from "@calcom/prisma/zod-utils";import { bookingResponses, emailSchemaRefinement } from "@calcom/prisma/zod-utils";diff --git a/packages/features/bookings/lib/getCalEventResponses.ts b/packages/features/bookings/lib/getCalEventResponses.tsindex 912286a83ab..14fe2a7665e 100644--- a/packages/features/bookings/lib/getCalEventResponses.ts+++ b/packages/features/bookings/lib/getCalEventResponses.ts@@ -1,6 +1,6 @@import type z from "zod";-import { SystemField } from "@calcom/lib/SystemField";+import { SystemField } from "@calcom/lib/bookings/SystemField";import type { bookingResponsesDbSchema } from "@calcom/features/bookings/lib/getBookingResponsesSchema";import { contructEmailFromPhoneNumber } from "@calcom/lib/contructEmailFromPhoneNumber";import { getBookingWithResponses } from "@calcom/lib/getBooking";diff --git a/packages/features/bookings/lib/getLuckyUser.ts b/packages/features/bookings/lib/getLuckyUser.tsindex c355affa9f0..ceb7a275403 100644--- a/packages/features/bookings/lib/getLuckyUser.ts+++ b/packages/features/bookings/lib/getLuckyUser.ts@@ -3,7 +3,7 @@ import type { FormResponse, Fields } from "@calcom/app-store/routing-forms/typesimport { zodRoutes } from "@calcom/app-store/routing-forms/zod";import dayjs from "@calcom/dayjs";import { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager";-import { mergeOverlappingRanges } from "@calcom/lib/date-ranges";+import { mergeOverlappingRanges } from "@calcom/features/schedules/lib/date-ranges";import logger from "@calcom/lib/logger";import { raqbQueryValueSchema } from "@calcom/lib/raqb/zod";import { safeStringify } from "@calcom/lib/safeStringify";diff --git a/packages/features/bookings/lib/handleBookingRequested.ts b/packages/features/bookings/lib/handleBookingRequested.tsindex a09629a7e17..d9813ce6f99 100644--- a/packages/features/bookings/lib/handleBookingRequested.ts+++ b/packages/features/bookings/lib/handleBookingRequested.ts@@ -6,7 +6,7 @@ import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload";import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import type { Prisma } from "@calcom/prisma/client";import { WebhookTriggerEvents, WorkflowTriggerEvents } from "@calcom/prisma/enums";import type { EventTypeMetadata } from "@calcom/prisma/zod-utils";diff --git a/packages/features/bookings/lib/handleConfirmation.ts b/packages/features/bookings/lib/handleConfirmation.tsindex bf259d9576c..91a59dd71fe 100644--- a/packages/features/bookings/lib/handleConfirmation.ts+++ b/packages/features/bookings/lib/handleConfirmation.ts@@ -18,7 +18,7 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import type { PrismaClient } from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";import type { SchedulingType } from "@calcom/prisma/enums";diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.tsindex 1dc8b4a2be3..ffec09d50f8 100644--- a/packages/features/bookings/lib/handleNewBooking.ts+++ b/packages/features/bookings/lib/handleNewBooking.ts@@ -70,8 +70,8 @@ import { getTranslation } from "@calcom/lib/server/i18n";import type { PrismaAttributeRepository as AttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";import type { HostRepository } from "@calcom/lib/server/repository/host";import type { PrismaOOORepository as OooRepository } from "@calcom/lib/server/repository/ooo";-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";import type { PrismaClient } from "@calcom/prisma";import type { DestinationCalendar, Prisma, User, AssignmentReasonEnum } from "@calcom/prisma/client";diff --git a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.tsindex 8280d737099..57f6fe60902 100644--- a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts+++ b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts@@ -3,7 +3,7 @@ import type { Logger } from "tslog";import dayjs from "@calcom/dayjs";import type { Dayjs } from "@calcom/dayjs";import { checkForConflicts } from "@calcom/features/bookings/lib/conflictChecker/checkForConflicts";-import { buildDateRanges } from "@calcom/lib/date-ranges";+import { buildDateRanges } from "@calcom/features/schedules/lib/date-ranges";import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes";import { getUserAvailabilityService } from "@calcom/features/di/containers/GetUserAvailability";import { ErrorCode } from "@calcom/lib/errorCodes";diff --git a/packages/features/bookings/lib/handleSeats/handleSeats.ts b/packages/features/bookings/lib/handleSeats/handleSeats.tsindex be2c592392d..3473da579c5 100644--- a/packages/features/bookings/lib/handleSeats/handleSeats.ts+++ b/packages/features/bookings/lib/handleSeats/handleSeats.ts@@ -4,7 +4,7 @@ import { handleWebhookTrigger } from "@calcom/features/bookings/lib/handleWebhooimport type { EventPayloadType } from "@calcom/features/webhooks/lib/sendPayload";import { ErrorCode } from "@calcom/lib/errorCodes";import { HttpError } from "@calcom/lib/http-error";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import prisma from "@calcom/prisma";import { BookingStatus } from "@calcom/prisma/enums";diff --git a/packages/features/bookings/lib/payment/handleNoShowFee.test.ts b/packages/features/bookings/lib/payment/handleNoShowFee.test.tsindex ba51ac2384b..e2a9537a3c7 100644--- a/packages/features/bookings/lib/payment/handleNoShowFee.test.ts+++ b/packages/features/bookings/lib/payment/handleNoShowFee.test.ts@@ -6,9 +6,9 @@ import { sendNoShowFeeChargedEmail } from "@calcom/emails";import { ErrorCode } from "@calcom/lib/errorCodes";import { ErrorWithCode } from "@calcom/lib/errors";import { getTranslation } from "@calcom/lib/server/i18n";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { handleNoShowFee } from "./handleNoShowFee";@@ -30,7 +30,7 @@ vi.mock("@calcom/lib/server/i18n", () => ({getTranslation: vi.fn().mockResolvedValue((key: string) => key),}));-vi.mock("@calcom/lib/server/repository/credential", () => ({+vi.mock("@calcom/features/credentials/repositories/CredentialRepository", () => ({CredentialRepository: {findPaymentCredentialByAppIdAndUserIdOrTeamId: vi.fn(),findPaymentCredentialByAppIdAndTeamId: vi.fn(),@@ -43,7 +43,7 @@ vi.mock("@calcom/features/membership/repositories/MembershipRepository", () => (},}));-vi.mock("@calcom/lib/server/repository/team", () => ({+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository", () => ({TeamRepository: vi.fn().mockImplementation(() => ({findParentOrganizationByTeamId: vi.fn(),})),diff --git a/packages/features/bookings/lib/payment/handleNoShowFee.ts b/packages/features/bookings/lib/payment/handleNoShowFee.tsindex 2a3b78e48da..3725ba224b3 100644--- a/packages/features/bookings/lib/payment/handleNoShowFee.ts+++ b/packages/features/bookings/lib/payment/handleNoShowFee.ts@@ -7,9 +7,9 @@ import { ErrorCode } from "@calcom/lib/errorCodes";import { ErrorWithCode } from "@calcom/lib/errors";import logger from "@calcom/lib/logger";import { getTranslation } from "@calcom/lib/server/i18n";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import prisma from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";import type { CalendarEvent } from "@calcom/types/Calendar";diff --git a/packages/features/busyTimes/services/getBusyTimes.ts b/packages/features/busyTimes/services/getBusyTimes.tsindex 9962d7db948..27fc99985f2 100644--- a/packages/features/busyTimes/services/getBusyTimes.ts+++ b/packages/features/busyTimes/services/getBusyTimes.ts@@ -1,7 +1,7 @@import dayjs from "@calcom/dayjs";import { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager";import { getDefinedBufferTimes } from "@calcom/features/eventtypes/lib/getDefinedBufferTimes";-import { subtract } from "@calcom/lib/date-ranges";+import { subtract } from "@calcom/features/schedules/lib/date-ranges";import { stringToDayjs } from "@calcom/lib/dayjs";import { intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";diff --git a/packages/features/credentials/deleteCredential.test.ts b/packages/features/credentials/deleteCredential.test.tsindex 33762d0d8c1..d2618056ef2 100644--- a/packages/features/credentials/deleteCredential.test.ts+++ b/packages/features/credentials/deleteCredential.test.ts@@ -6,7 +6,7 @@ import {import { describe, test, expect, beforeEach } from "vitest";import { PrismaAppRepository } from "@calcom/features/apps/repository/PrismaAppRepository";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { DestinationCalendarRepository } from "@calcom/lib/server/repository/destinationCalendar";import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";diff --git a/packages/lib/server/repository/credential.ts b/packages/features/credentials/repositories/CredentialRepository.tssimilarity index 98%rename from packages/lib/server/repository/credential.tsrename to packages/features/credentials/repositories/CredentialRepository.tsindex e5ae810cda9..d685a469c59 100644--- a/packages/lib/server/repository/credential.ts+++ b/packages/features/credentials/repositories/CredentialRepository.ts@@ -1,11 +1,10 @@+import { buildNonDelegationCredential } from "@calcom/lib/delegationCredential";import logger from "@calcom/lib/logger";import { prisma } from "@calcom/prisma";import type { Prisma, PrismaClient } from "@calcom/prisma/client";import { safeCredentialSelect } from "@calcom/prisma/selects/credential";import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";-import { buildNonDelegationCredential } from "../../delegationCredential";-const log = logger.getSubLogger({ prefix: ["CredentialRepository"] });type CredentialCreateInput = {diff --git a/packages/lib/server/repository/__tests__/delegationCredential.test.ts b/packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.tssimilarity index 98%rename from packages/lib/server/repository/__tests__/delegationCredential.test.tsrename to packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.tsindex cfb35220ee0..a6e3ffc6026 100644--- a/packages/lib/server/repository/__tests__/delegationCredential.test.ts+++ b/packages/features/delegation-credentials/repositories/DelegationCredentialRepository.test.ts@@ -1,11 +1,11 @@-import prismock from "../../../../../tests/libs/__mocks__/prisma";+import prismock from "../../../../tests/libs/__mocks__/prisma";import { describe, expect, it, beforeEach, vi } from "vitest";import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";import { encryptServiceAccountKey } from "@calcom/lib/server/serviceAccountKey";-import { DelegationCredentialRepository } from "../delegationCredential";+import { DelegationCredentialRepository } from "./DelegationCredentialRepository";vi.mock("@calcom/features/ee/organizations/repositories/OrganizationRepository", () => ({OrganizationRepository: {diff --git a/packages/lib/server/repository/delegationCredential.ts b/packages/features/delegation-credentials/repositories/DelegationCredentialRepository.tssimilarity index 100%rename from packages/lib/server/repository/delegationCredential.tsrename to packages/features/delegation-credentials/repositories/DelegationCredentialRepository.tsdiff --git a/packages/features/di/modules/Team.ts b/packages/features/di/modules/Team.tsindex 2052c536a56..2e0b5f1526c 100644--- a/packages/features/di/modules/Team.ts+++ b/packages/features/di/modules/Team.ts@@ -1,5 +1,5 @@import { DI_TOKENS } from "@calcom/features/di/tokens";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { createModule } from "../di";diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.tsindex 607bc286f4b..b0bfa99cee4 100644--- a/packages/features/ee/billing/credit-service.test.ts+++ b/packages/features/ee/billing/credit-service.test.ts@@ -5,7 +5,7 @@ import dayjs from "@calcom/dayjs";import * as EmailManager from "@calcom/emails/email-manager";import { CreditsRepository } from "@calcom/lib/server/repository/credits";import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { CreditType } from "@calcom/prisma/enums";import { CreditService } from "./credit-service";@@ -61,7 +61,7 @@ vi.mock("@calcom/prisma/enums", async (importOriginal) => {vi.mock("@calcom/lib/server/repository/credits");vi.mock("@calcom/features/membership/repositories/MembershipRepository");-vi.mock("@calcom/lib/server/repository/team");+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");vi.mock("@calcom/emails/email-manager");vi.mock("../workflows/lib/reminders/reminderScheduler", () => ({cancelScheduledMessagesAndScheduleEmails: vi.fn().mockResolvedValue(undefined),diff --git a/packages/features/ee/billing/credit-service.ts b/packages/features/ee/billing/credit-service.tsindex bc850d0a303..2ea4332acbe 100644--- a/packages/features/ee/billing/credit-service.ts+++ b/packages/features/ee/billing/credit-service.ts@@ -13,7 +13,7 @@ import logger from "@calcom/lib/logger";import { getTranslation } from "@calcom/lib/server/i18n";import { CreditsRepository } from "@calcom/lib/server/repository/credits";import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import prisma, { type PrismaTransaction } from "@calcom/prisma";import type { CreditUsageType } from "@calcom/prisma/enums";import { CreditType } from "@calcom/prisma/enums";diff --git a/packages/lib/service/attribute/server/assignValueToUser.test.ts b/packages/features/ee/dsync/lib/assignValueToUser.test.tssimilarity index 99%rename from packages/lib/service/attribute/server/assignValueToUser.test.tsrename to packages/features/ee/dsync/lib/assignValueToUser.test.tsindex 0ebaf2e5fed..955daf9833b 100644--- a/packages/lib/service/attribute/server/assignValueToUser.test.ts+++ b/packages/features/ee/dsync/lib/assignValueToUser.test.ts@@ -801,7 +801,6 @@ describe("addValueForMember", () => {membershipId: membership.id,// EngineeringattributeOptionId: "101",- //@ts-expect-error - prismock can't handle string ids it seemsdsyncId: dsync.id,});diff --git a/packages/lib/service/attribute/server/assignValueToUser.ts b/packages/features/ee/dsync/lib/assignValueToUser.tssimilarity index 97%rename from packages/lib/service/attribute/server/assignValueToUser.tsrename to packages/features/ee/dsync/lib/assignValueToUser.tsindex 12d92245a25..53b6563f6e8 100644--- a/packages/lib/service/attribute/server/assignValueToUser.ts+++ b/packages/features/ee/dsync/lib/assignValueToUser.ts@@ -1,11 +1,15 @@import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import prisma from "@calcom/prisma";--import { PrismaAttributeOptionRepository } from "../../../server/repository/PrismaAttributeOptionRepository";-import { PrismaAttributeRepository } from "../../../server/repository/PrismaAttributeRepository";-import type { AttributeId, AttributeName, BulkAttributeAssigner, AttributeOptionAssignment } from "../types";+import { PrismaAttributeOptionRepository } from "@calcom/lib/server/repository/PrismaAttributeOptionRepository";+import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";+import { findAssignmentsForMember } from "@calcom/lib/service/attribute/server/utils";+import type {+ AttributeId,+ AttributeName,+ BulkAttributeAssigner,+ AttributeOptionAssignment,+} from "@calcom/lib/service/attribute/types";import {doesSupportMultipleValues,isAssignmentForLockedAttribute,@@ -13,8 +17,8 @@ import {isAssignmentSame,buildSlugFromValue,canSetValueBeyondOptions,-} from "../utils";-import { findAssignmentsForMember } from "./utils";+} from "@calcom/lib/service/attribute/utils";+import prisma from "@calcom/prisma";const log = logger.getSubLogger({ prefix: ["entity/attribute"] });diff --git a/packages/features/ee/dsync/lib/handleUserEvents.ts b/packages/features/ee/dsync/lib/handleUserEvents.tsindex cae30c5ed8a..bee2c1fe673 100644--- a/packages/features/ee/dsync/lib/handleUserEvents.ts+++ b/packages/features/ee/dsync/lib/handleUserEvents.ts@@ -1,11 +1,10 @@import type { DirectorySyncEvent, User } from "@boxyhq/saml-jackson";import removeUserFromOrg from "@calcom/features/ee/dsync/lib/removeUserFromOrg";+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";import { getTranslation } from "@calcom/lib/server/i18n";-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";-import { assignValueToUserInOrgBulk } from "@calcom/lib/service/attribute/server/assignValueToUser";import prisma from "@calcom/prisma";import { IdentityProvider } from "@calcom/prisma/enums";import { getTeamOrThrow } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";@@ -13,6 +12,7 @@ import type { UserWithMembership } from "@calcom/trpc/server/routers/viewer/teamimport { sendExistingUserTeamInviteEmails } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";import { sendSignupToOrganizationEmail } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";+import { assignValueToUserInOrgBulk } from "./assignValueToUser";import getAttributesFromScimPayload from "./getAttributesFromScimPayload";import createUsersAndConnectToOrg from "./users/createUsersAndConnectToOrg";import dSyncUserSelect from "./users/dSyncUserSelect";diff --git a/packages/lib/server/repository/__mocks__/organization.ts b/packages/features/ee/organizations/__mocks__/organizationMock.tssimilarity index 100%rename from packages/lib/server/repository/__mocks__/organization.tsrename to packages/features/ee/organizations/__mocks__/organizationMock.tsdiff --git a/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx b/packages/features/ee/teams/components/TeamAvailabilityTimes.tsxindex 7478ef5f13e..8b829b7ff49 100644--- a/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx+++ b/packages/features/ee/teams/components/TeamAvailabilityTimes.tsx@@ -9,8 +9,8 @@ import React from "react";import type { ITimezone } from "react-timezone-select";import type { Dayjs } from "@calcom/dayjs";+import getSlots from "@calcom/features/schedules/lib/slots";import { useLocale } from "@calcom/lib/hooks/useLocale";-import getSlots from "@calcom/lib/slots";import { trpc } from "@calcom/trpc/react";import SkeletonLoader from "./SkeletonLoaderAvailabilityTimes";diff --git a/packages/features/ee/teams/components/TeamEventTypeForm.tsx b/packages/features/ee/teams/components/TeamEventTypeForm.tsxindex 8928daf6575..a05365fab96 100644--- a/packages/features/ee/teams/components/TeamEventTypeForm.tsx+++ b/packages/features/ee/teams/components/TeamEventTypeForm.tsx@@ -2,7 +2,7 @@ import type { ReactNode } from "react";import type { UseFormReturn } from "react-hook-form";import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";-import type { CreateEventTypeFormValues } from "@calcom/lib/hooks/useCreateEventType";+import type { CreateEventTypeFormValues } from "@calcom/features/eventtypes/hooks/useCreateEventType";import { useLocale } from "@calcom/lib/hooks/useLocale";import slugify from "@calcom/lib/slugify";import { SchedulingType } from "@calcom/prisma/enums";diff --git a/packages/features/ee/teams/lib/queries.ts b/packages/features/ee/teams/lib/queries.tsindex 30750e5a04a..5a5b660338e 100644--- a/packages/features/ee/teams/lib/queries.ts+++ b/packages/features/ee/teams/lib/queries.ts@@ -6,7 +6,7 @@ import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBimport { 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 { getTeam, getOrg } from "@calcom/features/ee/teams/repositories/TeamRepository";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";import prisma from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";diff --git a/packages/lib/server/repository/team.test.ts b/packages/features/ee/teams/repositories/TeamRepository.test.tssimilarity index 57%rename from packages/lib/server/repository/team.test.tsrename to packages/features/ee/teams/repositories/TeamRepository.test.tsindex 8e2e71885da..9d56ec29f12 100644--- a/packages/lib/server/repository/team.test.ts+++ b/packages/features/ee/teams/repositories/TeamRepository.test.ts@@ -1,18 +1,23 @@-import prismaMock from "../../../../tests/libs/__mocks__/prismaMock";+import prismaMock from "../../../../../tests/libs/__mocks__/prismaMock";-import { it, describe, expect } from "vitest";+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";-import { getTeam, getOrg } from "./team";+import type { Team } from "@calcom/prisma/client";++import { getTeam, getOrg, TeamRepository } from "./TeamRepository";const sampleTeamProps = {logo: null,+ logoUrl: null,+ calVideoLogo: null,appLogo: null,+ appIconLogo: null,bio: null,description: null,hideBranding: false,isPrivate: false,- appIconLogo: null,hideBookATeamMember: false,+ hideTeamProfileLink: false,createdAt: new Date(),theme: null,brandColor: "",@@ -21,8 +26,159 @@ const sampleTeamProps = {timeZone: "",weekStart: "",parentId: null,+ metadata: null,+ isOrganization: false,+ organizationSettings: null,+ isPlatform: false,+ bannerUrl: null,+ rrResetInterval: 0,+ rrResetOccurrence: 0,+ rrResetLimitOn: null,+ rrResetLimitOccurrences: null,+ rrResetLimitDate: null,+ includeManagedEventsInLimits: false,+ rrTimestampBasis: null,+ pendingPayment: false,+ createdByOAuthClientId: null,+ smsLockState: null,+ smsLockReviewedByAdmin: false,+ bookingLimits: null,};+describe("TeamRepository", () => {+ let teamRepository: TeamRepository;++ beforeEach(() => {+ vi.resetAllMocks();+ teamRepository = new TeamRepository(prismaMock);+ });++ afterEach(() => {+ vi.clearAllMocks();+ });++ describe("findById", () => {+ it("should return null if team is not found", async () => {+ prismaMock.team.findUnique.mockResolvedValue(null);+ const result = await teamRepository.findById({ id: 1 });+ expect(result).toBeNull();+ });++ it("should return parsed team if found", async () => {+ const mockTeam = {+ id: 1,+ name: "Test Team",+ slug: "test-team",+ logoUrl: "test-logo-url",+ parentId: 1,+ metadata: {+ requestedSlug: null,+ },+ isOrganization: true,+ organizationSettings: {},+ isPlatform: true,+ requestedSlug: null,+ };+ prismaMock.team.findUnique.mockResolvedValue(mockTeam as unknown as Team);+ const result = await teamRepository.findById({ id: 1 });+ expect(result).toEqual(mockTeam);+ });+ });++ describe("deleteById", () => {+ it("should delete team and related data", async () => {+ const mockDeletedTeam = { id: 1, name: "Deleted Team" };+ const deleteManyEventTypeMock = vi.fn();+ const deleteManyMembershipMock = vi.fn();+ const deleteTeamMock = vi.fn().mockResolvedValue(mockDeletedTeam as unknown as Team);+ prismaMock.$transaction.mockImplementation(async (callback) => {+ const mockTx = {+ ...prismaMock,+ eventType: {+ ...prismaMock.eventType,+ deleteMany: deleteManyEventTypeMock,+ },+ membership: {+ ...prismaMock.membership,+ deleteMany: deleteManyMembershipMock,+ },+ team: {+ ...prismaMock.team,+ delete: deleteTeamMock,+ },+ };+ return callback(mockTx);+ });++ const result = await teamRepository.deleteById({ id: 1 });++ expect(deleteManyEventTypeMock).toHaveBeenCalledWith({+ where: {+ teamId: 1,+ schedulingType: "MANAGED",+ },+ });+ expect(deleteManyMembershipMock).toHaveBeenCalledWith({+ where: {+ teamId: 1,+ },+ });+ expect(deleteTeamMock).toHaveBeenCalledWith({+ where: {+ id: 1,+ },+ });+ expect(result).toEqual(mockDeletedTeam);+ });+ });++ describe("findAllByParentId", () => {+ it("should return all teams with given parentId", async () => {+ const mockTeams = [{ id: 1 }, { id: 2 }];+ prismaMock.team.findMany.mockResolvedValue(mockTeams as unknown as Team[]);+ const result = await teamRepository.findAllByParentId({ parentId: 1 });+ expect(prismaMock.team.findMany).toHaveBeenCalledWith({+ where: { parentId: 1 },+ select: {+ id: true,+ name: true,+ slug: true,+ logoUrl: true,+ parentId: true,+ metadata: true,+ isOrganization: true,+ organizationSettings: true,+ isPlatform: true,+ },+ });+ expect(result).toEqual(mockTeams);+ });+ });++ describe("findTeamWithMembers", () => {+ it("should return team with its members", async () => {+ const mockTeam = { id: 1, members: [] };+ prismaMock.team.findUnique.mockResolvedValue(mockTeam as unknown as Team & { members: [] });+ const result = await teamRepository.findTeamWithMembers(1);+ expect(prismaMock.team.findUnique).toHaveBeenCalledWith({+ where: { id: 1 },+ select: {+ members: {+ select: {+ accepted: true,+ },+ },+ id: true,+ metadata: true,+ parentId: true,+ isOrganization: true,+ },+ });+ expect(result).toEqual(mockTeam);+ });+ });+});+describe("getOrg", () => {it("should return an Organization correctly by slug even if there is a team with the same slug", async () => {prismaMock.team.findMany.mockResolvedValue([@@ -31,7 +187,7 @@ describe("getOrg", () => {name: "Test Team",slug: "test-slug",isOrganization: true,- },+ } as Team,]);const org = await getOrg({@@ -70,7 +226,7 @@ describe("getOrg", () => {name: "Test Team",slug: "test-slug",metadata: {},- },+ } as Team,]);const org = await getOrg({@@ -109,7 +265,7 @@ describe("getOrg", () => {name: "Test Team",slug: "test-slug",metadata: [],- },+ } as Team,]);await expect(() =>@@ -139,7 +295,7 @@ describe("getTeam", () => {anything: "here",paymentId: "1",},- },+ } as Team,]);const team = await getTeam({@@ -181,7 +337,7 @@ describe("getTeam", () => {name: "Test Team",slug: "test-slug",isOrganization: true,- },+ } as Team,]);const team = await getTeam({@@ -222,7 +378,7 @@ describe("getTeam", () => {slug: "test-slug",parentId: 100,metadata: null,- },+ } as Team,]);await getTeam({diff --git a/packages/lib/server/repository/team.ts b/packages/features/ee/teams/repositories/TeamRepository.tssimilarity index 99%rename from packages/lib/server/repository/team.tsrename to packages/features/ee/teams/repositories/TeamRepository.tsindex 3ffee199e15..09fccc603cb 100644--- a/packages/lib/server/repository/team.ts+++ b/packages/features/ee/teams/repositories/TeamRepository.ts@@ -2,14 +2,13 @@ import type { z } from "zod";import { whereClauseForOrgWithSlugOrRequestedSlug } from "@calcom/ee/organizations/lib/orgDomains";import logger from "@calcom/lib/logger";+import { getParsedTeam } from "@calcom/lib/server/repository/teamUtils";import type { PrismaClient } from "@calcom/prisma";import { prisma } from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";import { MembershipRole } from "@calcom/prisma/enums";import { teamMetadataSchema } from "@calcom/prisma/zod-utils";-import { getParsedTeam } from "./teamUtils";-type TeamGetPayloadWithParsedMetadata<TeamSelect extends Prisma.TeamSelect> =| (Omit<Prisma.TeamGetPayload<{ select: TeamSelect }>, "metadata" | "isOrganization"> & {metadata: z.infer<typeof teamMetadataSchema>;diff --git a/packages/features/ee/teams/services/teamService.alternative.test.ts b/packages/features/ee/teams/services/teamService.alternative.test.tsindex 9b4809a640e..2d15dbcfaa6 100644--- a/packages/features/ee/teams/services/teamService.alternative.test.ts+++ b/packages/features/ee/teams/services/teamService.alternative.test.ts@@ -4,8 +4,8 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";import { TeamBilling } from "@calcom/features/ee/billing/teams";import { deleteDomain } from "@calcom/lib/domainManager/organization";-import { TeamRepository } from "@calcom/lib/server/repository/team";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import { TeamService } from "./teamService";@@ -14,8 +14,8 @@ vi.mock("@calcom/prisma", () => ({}));vi.mock("@calcom/features/ee/billing/teams");-vi.mock("@calcom/lib/server/repository/team");-vi.mock("@calcom/lib/server/service/workflows");+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");+vi.mock("@calcom/features/ee/workflows/lib/service/WorkflowService");vi.mock("@calcom/lib/domainManager/organization");vi.mock("@calcom/features/ee/teams/lib/removeMember");class Database {diff --git a/packages/features/ee/teams/services/teamService.test.ts b/packages/features/ee/teams/services/teamService.test.tsindex c8855a5e1a5..657bb5f4cac 100644--- a/packages/features/ee/teams/services/teamService.test.ts+++ b/packages/features/ee/teams/services/teamService.test.ts@@ -6,8 +6,8 @@ import { TeamBilling } from "@calcom/features/ee/billing/teams";import { updateNewTeamMemberEventTypes } from "@calcom/features/ee/teams/lib/queries";import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/createAProfileForAnExistingUser";import { deleteDomain } from "@calcom/lib/domainManager/organization";-import { TeamRepository } from "@calcom/lib/server/repository/team";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import type { Membership, Team, User, VerificationToken, Profile } from "@calcom/prisma/client";import { MembershipRole } from "@calcom/prisma/enums";@@ -16,8 +16,8 @@ import { TRPCError } from "@trpc/server";import { TeamService } from "./teamService";vi.mock("@calcom/features/ee/billing/teams");-vi.mock("@calcom/lib/server/repository/team");-vi.mock("@calcom/lib/server/service/workflows");+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");+vi.mock("@calcom/features/ee/workflows/lib/service/WorkflowService");vi.mock("@calcom/lib/domainManager/organization");vi.mock("@calcom/features/ee/teams/lib/removeMember");vi.mock("@calcom/features/profile/lib/createAProfileForAnExistingUser");diff --git a/packages/features/ee/teams/services/teamService.ts b/packages/features/ee/teams/services/teamService.tsindex 14835593e71..66256e2e832 100644--- a/packages/features/ee/teams/services/teamService.ts+++ b/packages/features/ee/teams/services/teamService.ts@@ -8,8 +8,8 @@ import { createAProfileForAnExistingUser } from "@calcom/features/profile/lib/crimport { deleteDomain } from "@calcom/lib/domainManager/organization";import logger from "@calcom/lib/logger";import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import { prisma } from "@calcom/prisma";import { Prisma } from "@calcom/prisma/client";import type { Membership } from "@calcom/prisma/client";diff --git a/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts b/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.tsindex d5660d3271f..9dc8b09babf 100644--- a/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts+++ b/packages/features/ee/workflows/lib/reminders/aiPhoneCallManager.ts@@ -1,7 +1,7 @@import { v4 as uuidv4 } from "uuid";import dayjs from "@calcom/dayjs";-import { CAL_AI_AGENT_PHONE_NUMBER_FIELD } from "@calcom/lib/SystemField";+import { CAL_AI_AGENT_PHONE_NUMBER_FIELD } from "@calcom/lib/bookings/SystemField";import { FeaturesRepository } from "@calcom/features/flags/features.repository";import tasker from "@calcom/features/tasker";import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";diff --git a/packages/lib/server/service/workflows.test.ts b/packages/features/ee/workflows/lib/service/WorkflowService.test.tssimilarity index 99%rename from packages/lib/server/service/workflows.test.tsrename to packages/features/ee/workflows/lib/service/WorkflowService.test.tsindex fa087755939..04c6a03bd68 100644--- a/packages/lib/server/service/workflows.test.ts+++ b/packages/features/ee/workflows/lib/service/WorkflowService.test.ts@@ -5,7 +5,7 @@ import { tasker } from "@calcom/features/tasker";import { WorkflowTriggerEvents, WorkflowActions, WorkflowTemplates, TimeUnit } from "@calcom/prisma/enums";import { test } from "@calcom/web/test/fixtures/fixtures";-import { WorkflowService } from "./workflows";+import { WorkflowService } from "./WorkflowService";vi.mock("@calcom/features/ee/workflows/lib/reminders/reminderScheduler");vi.mock("@calcom/features/tasker");diff --git a/packages/lib/server/service/workflows.ts b/packages/features/ee/workflows/lib/service/WorkflowService.tssimilarity index 98%rename from packages/lib/server/service/workflows.tsrename to packages/features/ee/workflows/lib/service/WorkflowService.tsindex d55b9372067..c57529e9078 100644--- a/packages/lib/server/service/workflows.ts+++ b/packages/features/ee/workflows/lib/service/WorkflowService.ts@@ -4,16 +4,15 @@ import type { ScheduleWorkflowRemindersArgs } from "@calcom/ee/workflows/lib/remimport { scheduleWorkflowReminders } from "@calcom/ee/workflows/lib/reminders/reminderScheduler";import type { timeUnitLowerCase } from "@calcom/ee/workflows/lib/reminders/smsReminderManager";import type { Workflow } from "@calcom/ee/workflows/lib/types";-import { tasker } from "@calcom/features/tasker";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";import { getHideBranding } from "@calcom/features/profile/lib/hideBranding";+import { tasker } from "@calcom/features/tasker";import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";import { prisma } from "@calcom/prisma";import { WorkflowTriggerEvents, WorkflowType } from "@calcom/prisma/enums";import type { FORM_SUBMITTED_WEBHOOK_RESPONSES } from "@calcom/routing-forms/lib/formSubmissionUtils";-import { TeamRepository } from "../repository/team";-// TODO (Sean): Move most of the logic migrated in 16861 to this serviceexport class WorkflowService {static _beforeAfterEventTriggers: WorkflowTriggerEvents[] = [diff --git a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx b/packages/features/eventtypes/components/CreateEventTypeDialog.tsxindex cae2fc70af6..ad9ba941cd0 100644--- a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx+++ b/packages/features/eventtypes/components/CreateEventTypeDialog.tsx@@ -5,7 +5,7 @@ import { z } from "zod";import { Dialog } from "@calcom/features/components/controlled-dialog";import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";-import { useCreateEventType } from "@calcom/lib/hooks/useCreateEventType";+import { useCreateEventType } from "@calcom/features/eventtypes/hooks/useCreateEventType";import { useLocale } from "@calcom/lib/hooks/useLocale";import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";import type { EventType } from "@calcom/prisma/client";diff --git a/packages/features/eventtypes/components/CreateEventTypeForm.tsx b/packages/features/eventtypes/components/CreateEventTypeForm.tsxindex 01070f280a1..c780117e0fa 100644--- a/packages/features/eventtypes/components/CreateEventTypeForm.tsx+++ b/packages/features/eventtypes/components/CreateEventTypeForm.tsx@@ -4,7 +4,7 @@ import type { UseFormReturn } from "react-hook-form";import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";import { MAX_EVENT_DURATION_MINUTES, MIN_EVENT_DURATION_MINUTES } from "@calcom/lib/constants";-import type { CreateEventTypeFormValues } from "@calcom/lib/hooks/useCreateEventType";+import type { CreateEventTypeFormValues } from "@calcom/features/eventtypes/hooks/useCreateEventType";import { useLocale } from "@calcom/lib/hooks/useLocale";import { md } from "@calcom/lib/markdownIt";import slugify from "@calcom/lib/slugify";diff --git a/packages/lib/hooks/useCreateEventType.ts b/packages/features/eventtypes/hooks/useCreateEventType.tssimilarity index 100%rename from packages/lib/hooks/useCreateEventType.tsrename to packages/features/eventtypes/hooks/useCreateEventType.tsdiff --git a/packages/features/form-builder/schema.ts b/packages/features/form-builder/schema.tsindex fb4e881524f..9f248075df0 100644--- a/packages/features/form-builder/schema.ts+++ b/packages/features/form-builder/schema.ts@@ -257,20 +257,3 @@ export const fieldTypesSchemaMap: Partial<},},};--/**- * DB Read schema has no field type based validation because user might change the type of a field from Type1 to Type2 after some data has been collected with Type1.- * Parsing that type1 data with type2 schema will fail.- * So, we just validate that the response conforms to one of the field types' schema.- */-export const dbReadResponseSchema = z.union([- z.string(),- z.boolean(),- z.string().array(),- z.object({- optionValue: z.string(),- value: z.string(),- }),- // For variantsConfig case- z.record(z.string()),-]);diff --git a/packages/features/handleMarkNoShow.ts b/packages/features/handleMarkNoShow.tsindex aaf64f3ebd2..b33cd78b683 100644--- a/packages/features/handleMarkNoShow.ts+++ b/packages/features/handleMarkNoShow.ts@@ -9,7 +9,7 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";import { HttpError } from "@calcom/lib/http-error";import logger from "@calcom/lib/logger";import { getTranslation } from "@calcom/lib/server/i18n";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";import { prisma } from "@calcom/prisma";import { WebhookTriggerEvents, WorkflowTriggerEvents } from "@calcom/prisma/enums";diff --git a/packages/lib/server/repository/hashedLinkRepository.ts b/packages/features/hashedLink/repositories/hashedLinkRepository.tssimilarity index 100%rename from packages/lib/server/repository/hashedLinkRepository.tsrename to packages/features/hashedLink/repositories/hashedLinkRepository.tsdiff --git a/packages/lib/server/service/hashedLinkService.ts b/packages/features/hashedLink/services/hashedLinkService.tssimilarity index 96%rename from packages/lib/server/service/hashedLinkService.tsrename to packages/features/hashedLink/services/hashedLinkService.tsindex bbe4d29b7ca..9d7fb178ed8 100644--- a/packages/lib/server/service/hashedLinkService.ts+++ b/packages/features/hashedLink/services/hashedLinkService.ts@@ -1,9 +1,11 @@+import {+ HashedLinkRepository,+ type HashedLinkInputType,+} from "@calcom/features/hashedLink/repositories/hashedLinkRepository";+import { MembershipService } from "@calcom/features/membership/services/membershipService";import { ErrorCode } from "@calcom/lib/errorCodes";import { validateHashedLinkData } from "@calcom/lib/hashedLinksUtils";-import { HashedLinkRepository, type HashedLinkInputType } from "../repository/hashedLinkRepository";-import { MembershipService } from "./membershipService";-type NormalizedLink = {link: string;expiresAt: Date | null;diff --git a/packages/features/insights/services/InsightsBookingBaseService.ts b/packages/features/insights/services/InsightsBookingBaseService.tsindex f89f910ccd8..6272aa0c940 100644--- a/packages/features/insights/services/InsightsBookingBaseService.ts+++ b/packages/features/insights/services/InsightsBookingBaseService.ts@@ -16,7 +16,7 @@ import { extractDateRangeFromColumnFilters } from "@calcom/features/insights/libimport type { DateRange } from "@calcom/features/insights/server/insightsDateUtils";import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import type { PrismaClient } from "@calcom/prisma";import { Prisma } from "@calcom/prisma/client";import { MembershipRole } from "@calcom/prisma/enums";diff --git a/packages/features/insights/services/InsightsRoutingBaseService.ts b/packages/features/insights/services/InsightsRoutingBaseService.tsindex 5af80c8497c..7c19cfb7881 100644--- a/packages/features/insights/services/InsightsRoutingBaseService.ts+++ b/packages/features/insights/services/InsightsRoutingBaseService.ts@@ -12,7 +12,7 @@ import {} from "@calcom/features/data-table/lib/utils";import type { DateRange } from "@calcom/features/insights/server/insightsDateUtils";import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import type { PrismaClient } from "@calcom/prisma";import { Prisma } from "@calcom/prisma/client";import type { BookingStatus } from "@calcom/prisma/enums";diff --git a/packages/features/membership/repositories/MembershipRepository.ts b/packages/features/membership/repositories/MembershipRepository.tsindex c9bd073e328..b016ea5bec2 100644--- a/packages/features/membership/repositories/MembershipRepository.ts+++ b/packages/features/membership/repositories/MembershipRepository.ts@@ -373,35 +373,6 @@ export class MembershipRepository {return membershipsWithSelectedCalendars;}- static async findMembershipsForBothOrgAndTeam({ orgId, teamId }: { orgId: number; teamId: number }) {- const memberships = await prisma.membership.findMany({- where: {- teamId: {- in: [orgId, teamId],- },- },- });-- type Membership = (typeof memberships)[number];-- const { teamMemberships, orgMemberships } = memberships.reduce(- (acc, membership) => {- if (membership.teamId === teamId) {- acc.teamMemberships.push(membership);- } else if (membership.teamId === orgId) {- acc.orgMemberships.push(membership);- }- return acc;- },- { teamMemberships: [] as Membership[], orgMemberships: [] as Membership[] }- );-- return {- teamMemberships,- orgMemberships,- };- }-static async getAdminOrOwnerMembership(userId: number, teamId: number) {return prisma.membership.findFirst({where: {diff --git a/packages/lib/server/service/membershipService.ts b/packages/features/membership/services/membershipService.tssimilarity index 100%rename from packages/lib/server/service/membershipService.tsrename to packages/features/membership/services/membershipService.tsdiff --git a/packages/lib/entityPermissionUtils.server.ts b/packages/features/pbac/lib/entityPermissionUtils.server.tssimilarity index 100%rename from packages/lib/entityPermissionUtils.server.tsrename to packages/features/pbac/lib/entityPermissionUtils.server.tsdiff --git a/packages/features/profile/lib/createAProfileForAnExistingUser.ts b/packages/features/profile/lib/createAProfileForAnExistingUser.tsindex 8d6b3c5f142..860e675fcc4 100644--- a/packages/features/profile/lib/createAProfileForAnExistingUser.ts+++ b/packages/features/profile/lib/createAProfileForAnExistingUser.ts@@ -4,7 +4,7 @@ import { ProfileRepository } from "@calcom/features/profile/repositories/Profileimport { UserRepository } from "@calcom/features/users/repositories/UserRepository";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import prisma from "@calcom/prisma";import { RedirectType } from "@calcom/prisma/enums";diff --git a/packages/features/profile/lib/hideBranding.ts b/packages/features/profile/lib/hideBranding.tsindex c951a696952..e82c2ecf4d8 100644--- a/packages/features/profile/lib/hideBranding.ts+++ b/packages/features/profile/lib/hideBranding.ts@@ -1,7 +1,7 @@import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";import logger from "@calcom/lib/logger";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { prisma } from "@calcom/prisma";const log = logger.getSubLogger({ name: "hideBranding" });diff --git a/packages/lib/date-ranges.test.ts b/packages/features/schedules/lib/date-ranges.test.tssimilarity index 100%rename from packages/lib/date-ranges.test.tsrename to packages/features/schedules/lib/date-ranges.test.tsdiff --git a/packages/lib/date-ranges.ts b/packages/features/schedules/lib/date-ranges.tssimilarity index 100%rename from packages/lib/date-ranges.tsrename to packages/features/schedules/lib/date-ranges.tsdiff --git a/packages/lib/slots.test.ts b/packages/features/schedules/lib/slots.test.tssimilarity index 99%rename from packages/lib/slots.test.tsrename to packages/features/schedules/lib/slots.test.tsindex 1a1f1527a38..35a32a6a1c4 100644--- a/packages/lib/slots.test.ts+++ b/packages/features/schedules/lib/slots.test.ts@@ -1,8 +1,8 @@import { describe, expect, it, beforeAll, vi } from "vitest";import dayjs from "@calcom/dayjs";+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";-import type { DateRange } from "./date-ranges";import getSlots from "./slots";let dateRangesNextDay: DateRange[];diff --git a/packages/lib/slots.ts b/packages/features/schedules/lib/slots.tssimilarity index 98%rename from packages/lib/slots.tsrename to packages/features/schedules/lib/slots.tsindex fdd95575698..22c1c1c7df3 100644--- a/packages/lib/slots.ts+++ b/packages/features/schedules/lib/slots.ts@@ -5,11 +5,10 @@ import type {IOutOfOfficeData,IToUser,} from "@calcom/features/availability/lib/getUserAvailability";+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";+import { getTimeZone } from "@calcom/lib/dayjs";import { withReporting } from "@calcom/lib/sentryWrapper";-import type { DateRange } from "./date-ranges";-import { getTimeZone } from "./dayjs";-export type GetSlots = {inviteeDate: Dayjs;frequency: number;@@ -131,7 +130,7 @@ function buildSlotsWithDateRanges({// For current day bookings, normalizing the seconds to zero to avoid issues with time calculationsslotStartTime = slotStartTime.set("second", 0).set("millisecond", 0);-+// Convert to target timezone BEFORE checking if rounding is needed// This ensures we check minute alignment in the local timezone, not UTC// This prevents issues with half-hour offset timezones like Asia/Kolkata (GMT+5:30)diff --git a/packages/features/tasker/tasks/analytics/sendAnalyticsEvent.ts b/packages/features/tasker/tasks/analytics/sendAnalyticsEvent.tsindex 17864c78ce3..410e7576a76 100644--- a/packages/features/tasker/tasks/analytics/sendAnalyticsEvent.ts+++ b/packages/features/tasker/tasks/analytics/sendAnalyticsEvent.ts@@ -1,6 +1,6 @@import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import AnalyticsManager from "./analyticsManager";import { sendAnalyticsEventSchema } from "./schema";diff --git a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx b/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsxindex 31dc02d01d7..75a12ce69e9 100644--- a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx+++ b/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx@@ -10,7 +10,7 @@ import { DataTableProvider } from "@calcom/features/data-table/DataTableProviderimport { DataTable, DataTableToolbar } from "@calcom/features/data-table/components";import { useDataTable } from "@calcom/features/data-table/hooks";import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";-import type { DateRange } from "@calcom/lib/date-ranges";+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";import { useLocale } from "@calcom/lib/hooks/useLocale";import { CURRENT_TIMEZONE } from "@calcom/lib/timezoneConstants";import type { MembershipRole } from "@calcom/prisma/enums";diff --git a/packages/features/timezone-buddy/components/TimeDial.tsx b/packages/features/timezone-buddy/components/TimeDial.tsxindex b8810522e9f..e9f26d10734 100644--- a/packages/features/timezone-buddy/components/TimeDial.tsx+++ b/packages/features/timezone-buddy/components/TimeDial.tsx@@ -4,7 +4,7 @@ import { useStore } from "zustand";import type { Dayjs } from "@calcom/dayjs";import dayjs from "@calcom/dayjs";-import type { DateRange } from "@calcom/lib/date-ranges";+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";import classNames from "@calcom/ui/classNames";import { DAY_CELL_WIDTH } from "../constants";diff --git a/packages/lib/CalEventParser.ts b/packages/lib/CalEventParser.tsindex 3a052c973c5..03e1b6ac6f7 100644--- a/packages/lib/CalEventParser.ts+++ b/packages/lib/CalEventParser.ts@@ -2,7 +2,7 @@ import type { TFunction } from "i18next";import short from "short-uuid";import { v5 as uuidv5 } from "uuid";-import getLabelValueMapFromResponses from "@calcom/features/bookings/lib/getLabelValueMapFromResponses";+import getLabelValueMapFromResponses from "@calcom/lib/bookings/getLabelValueMapFromResponses";import type { CalendarEvent, Person } from "@calcom/types/Calendar";import { WEBAPP_URL } from "./constants";diff --git a/packages/lib/SystemField.ts b/packages/lib/bookings/SystemField.tssimilarity index 100%rename from packages/lib/SystemField.tsrename to packages/lib/bookings/SystemField.tsdiff --git a/packages/features/bookings/lib/getLabelValueMapFromResponses.ts b/packages/lib/bookings/getLabelValueMapFromResponses.tssimilarity index 90%rename from packages/features/bookings/lib/getLabelValueMapFromResponses.tsrename to packages/lib/bookings/getLabelValueMapFromResponses.tsindex 1909c604fbf..d72eb52afa9 100644--- a/packages/features/bookings/lib/getLabelValueMapFromResponses.ts+++ b/packages/lib/bookings/getLabelValueMapFromResponses.ts@@ -1,7 +1,7 @@import type z from "zod";-import { TITLE_FIELD, SMS_REMINDER_NUMBER_FIELD } from "@calcom/lib/SystemField";-import type { bookingResponse } from "@calcom/features/bookings/lib/getBookingResponsesSchema";+import { TITLE_FIELD, SMS_REMINDER_NUMBER_FIELD } from "@calcom/lib/bookings/SystemField";+import type { dbReadResponseSchema as bookingResponse } from "@calcom/lib/dbReadResponseSchema";import type { CalendarEvent } from "@calcom/types/Calendar";export default function getLabelValueMapFromResponses(diff --git a/packages/lib/dbReadResponseSchema.ts b/packages/lib/dbReadResponseSchema.tsnew file mode 100644index 00000000000..973fde46913--- /dev/null+++ b/packages/lib/dbReadResponseSchema.ts@@ -0,0 +1,18 @@+import { z } from "zod";++/**+ * DB Read schema has no field type based validation because user might change the type of a field from Type1 to Type2 after some data has been collected with Type1.+ * Parsing that type1 data with type2 schema will fail.+ * So, we just validate that the response conforms to one of the field types' schema.+ */+export const dbReadResponseSchema = z.union([+ z.string(),+ z.boolean(),+ z.string().array(),+ z.object({+ optionValue: z.string(),+ value: z.string(),+ }),+ // For variantsConfig case+ z.record(z.string()),+]);diff --git a/packages/lib/restrictionSchedule.ts b/packages/lib/restrictionSchedule.tsdeleted file mode 100644index 306ea5c0336..00000000000--- a/packages/lib/restrictionSchedule.ts+++ /dev/null@@ -1,16 +0,0 @@-import { FeaturesRepository } from "@calcom/features/flags/features.repository";-import prisma from "@calcom/prisma";--/**- * Checks if the restriction schedule feature is enabled for a team- * @param teamId - The team ID to check- * @returns Promise<boolean> - True if the feature is enabled, false otherwise- */-export async function isRestrictionScheduleEnabled(teamId?: number): Promise<boolean> {- if (!teamId) {- return false; // Personal events don't have restriction schedules- }-- const featureRepo = new FeaturesRepository(prisma);- return await featureRepo.checkIfTeamHasFeature(teamId, "restriction-schedule");-}diff --git a/packages/lib/server/repository/TeamRepository.test.ts b/packages/lib/server/repository/TeamRepository.test.tsdeleted file mode 100644index dd203575741..00000000000--- a/packages/lib/server/repository/TeamRepository.test.ts+++ /dev/null@@ -1,141 +0,0 @@-import prismaMock from "../../../../tests/libs/__mocks__/prismaMock";--import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";--import type { Team } from "@calcom/prisma/client";--import { TeamRepository } from "./team";--describe("TeamRepository", () => {- let teamRepository: TeamRepository;-- beforeEach(() => {- vi.resetAllMocks();- teamRepository = new TeamRepository(prismaMock);- });-- afterEach(() => {- vi.clearAllMocks();- });-- describe("findById", () => {- it("should return null if team is not found", async () => {- prismaMock.team.findUnique.mockResolvedValue(null);- const result = await teamRepository.findById({ id: 1 });- expect(result).toBeNull();- });-- it("should return parsed team if found", async () => {- const mockTeam = {- id: 1,- name: "Test Team",- slug: "test-team",- logoUrl: "test-logo-url",- parentId: 1,- metadata: {- requestedSlug: null,- },- isOrganization: true,- organizationSettings: {},- isPlatform: true,- requestedSlug: null,- };- prismaMock.team.findUnique.mockResolvedValue(mockTeam as unknown as Team);- const result = await teamRepository.findById({ id: 1 });- expect(result).toEqual(mockTeam);- });- });-- describe("deleteById", () => {- it("should delete team and related data", async () => {- const mockDeletedTeam = { id: 1, name: "Deleted Team" };- const deleteManyEventTypeMock = vi.fn();- const deleteManyMembershipMock = vi.fn();- const deleteTeamMock = vi.fn().mockResolvedValue(mockDeletedTeam as unknown as Team);- prismaMock.$transaction.mockImplementation(async (callback) => {- const mockTx = {- ...prismaMock,- eventType: {- ...prismaMock.eventType,- deleteMany: deleteManyEventTypeMock,- },- membership: {- ...prismaMock.membership,- deleteMany: deleteManyMembershipMock,- },- team: {- ...prismaMock.team,- delete: deleteTeamMock,- },- };- return callback(mockTx);- });-- const result = await teamRepository.deleteById({ id: 1 });-- expect(deleteManyEventTypeMock).toHaveBeenCalledWith({- where: {- teamId: 1,- schedulingType: "MANAGED",- },- });- expect(deleteManyMembershipMock).toHaveBeenCalledWith({- where: {- teamId: 1,- },- });- expect(deleteTeamMock).toHaveBeenCalledWith({- where: {- id: 1,- },- });- expect(result).toEqual(mockDeletedTeam);- });- });-- describe("findAllByParentId", () => {- it("should return all teams with given parentId", async () => {- const mockTeams = [{ id: 1 }, { id: 2 }];- prismaMock.team.findMany.mockResolvedValue(mockTeams as unknown as Team[]);- const result = await teamRepository.findAllByParentId({ parentId: 1 });- expect(prismaMock.team.findMany).toHaveBeenCalledWith({- where: { parentId: 1 },- select: {- id: true,- name: true,- slug: true,- logoUrl: true,- parentId: true,- metadata: true,- isOrganization: true,- organizationSettings: true,- isPlatform: true,- },- });- expect(result).toEqual(mockTeams);- });- });-- describe("findTeamWithMembers", () => {- it("should return team with its members", async () => {- const mockTeam = { id: 1, members: [] };- prismaMock.team.findUnique.mockResolvedValue(mockTeam as unknown as Team & { members: [] });- const result = await teamRepository.findTeamWithMembers(1);- expect(prismaMock.team.findUnique).toHaveBeenCalledWith({- where: { id: 1 },- select: {- members: {- select: {- accepted: true,- },- },- id: true,- metadata: true,- parentId: true,- isOrganization: true,- },- });- expect(result).toEqual(mockTeam);- });- });-});diff --git a/packages/lib/service/attribute/server/getAttributes.ts b/packages/lib/service/attribute/server/getAttributes.tsindex be7378fe365..58d9a29c6f0 100644--- a/packages/lib/service/attribute/server/getAttributes.ts+++ b/packages/lib/service/attribute/server/getAttributes.ts@@ -1,5 +1,4 @@// TODO: Queries in this file are not optimized. Need to optimize them.-import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";import prisma from "@calcom/prisma";@@ -70,6 +69,35 @@ export type AttributeOptionValueWithType = {attributeOption: AttributeOptionValue | AttributeOptionValue[];};+async function _findMembershipsForBothOrgAndTeam({ orgId, teamId }: { orgId: number; teamId: number }) {+ const memberships = await prisma.membership.findMany({+ where: {+ teamId: {+ in: [orgId, teamId],+ },+ },+ });++ type Membership = (typeof memberships)[number];++ const { teamMemberships, orgMemberships } = memberships.reduce(+ (acc, membership) => {+ if (membership.teamId === teamId) {+ acc.teamMemberships.push(membership);+ } else if (membership.teamId === orgId) {+ acc.orgMemberships.push(membership);+ }+ return acc;+ },+ { teamMemberships: [] as Membership[], orgMemberships: [] as Membership[] }+ );++ return {+ teamMemberships,+ orgMemberships,+ };+}+function _prepareAssignmentData({assignmentsForTheTeam,attributesOfTheOrg,@@ -184,7 +212,7 @@ function _getAttributeOptionFromAttributeOption({}async function _getOrgMembershipToUserIdForTeam({ orgId, teamId }: { orgId: number; teamId: number }) {- const { orgMemberships, teamMemberships } = await MembershipRepository.findMembershipsForBothOrgAndTeam({+ const { orgMemberships, teamMemberships } = await _findMembershipsForBothOrgAndTeam({orgId,teamId,});diff --git a/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsxindex 2fca4b72321..2dcd2f6376d 100644--- a/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx+++ b/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx@@ -2,7 +2,7 @@ import { AtomsWrapper } from "@/components/atoms-wrapper";import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";import CreateEventTypeForm from "@calcom/features/eventtypes/components/CreateEventTypeForm";-import { useCreateEventTypeForm } from "@calcom/lib/hooks/useCreateEventType";+import { useCreateEventTypeForm } from "@calcom/features/eventtypes/hooks/useCreateEventType";import { useLocale } from "@calcom/lib/hooks/useLocale";import type { EventType } from "@calcom/prisma/client";import { Button } from "@calcom/ui/components/button";diff --git a/packages/platform/libraries/app-store.ts b/packages/platform/libraries/app-store.tsindex f1fbbcc37f8..2b86dcf42a7 100644--- a/packages/platform/libraries/app-store.ts+++ b/packages/platform/libraries/app-store.ts@@ -43,7 +43,7 @@ export {CalendarAppDelegationCredentialNotSetupError,} from "@calcom/lib/CalendarAppError";-export { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+export { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";export { OAuth2UniversalSchema } from "@calcom/app-store/_utils/oauth/universalSchema";export { getUsersCredentialsIncludeServiceAccountKey } from "@calcom/app-store/delegationCredential";diff --git a/packages/platform/libraries/index.ts b/packages/platform/libraries/index.tsindex 891977dc899..d1202588093 100644--- a/packages/platform/libraries/index.ts+++ b/packages/platform/libraries/index.ts@@ -1,4 +1,5 @@import { getBookingForReschedule } from "@calcom/features/bookings/lib/get-booking";+import getAllUserBookings from "@calcom/features/bookings/lib/getAllUserBookings";import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields";import getBookingInfo from "@calcom/features/bookings/lib/getBookingInfo";import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";@@ -11,7 +12,6 @@ import {import { handleCreatePhoneCall } from "@calcom/features/handleCreatePhoneCall";import handleMarkNoShow from "@calcom/features/handleMarkNoShow";import { getRoutedUrl } from "@calcom/features/routing-forms/lib/getRoutedUrl";-import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings";import { symmetricEncrypt, symmetricDecrypt } from "@calcom/lib/crypto";import { getTranslation } from "@calcom/lib/server/i18n";import type { Prisma } from "@calcom/prisma/client";diff --git a/packages/platform/libraries/repositories.ts b/packages/platform/libraries/repositories.tsindex 91e5270e179..efc39f817fa 100644--- a/packages/platform/libraries/repositories.ts+++ b/packages/platform/libraries/repositories.ts@@ -5,7 +5,7 @@ export { BookingRepository as PrismaBookingRepository } from "@calcom/features/bexport { EventTypeRepository as PrismaEventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";export { RoutingFormResponseRepository as PrismaRoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse";export { PrismaSelectedSlotRepository } from "@calcom/lib/server/repository/PrismaSelectedSlotRepository";-export { TeamRepository as PrismaTeamRepository } from "@calcom/lib/server/repository/team";+export { TeamRepository as PrismaTeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";export { UserRepository as PrismaUserRepository } from "@calcom/features/users/repositories/UserRepository";export { FeaturesRepository as PrismaFeaturesRepository } from "@calcom/features/flags/features.repository";export { MembershipRepository as PrismaMembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";diff --git a/packages/trpc/server/routers/apps/routing-forms/deleteForm.handler.ts b/packages/trpc/server/routers/apps/routing-forms/deleteForm.handler.tsindex 07db89f09f0..29fe2057bc7 100644--- a/packages/trpc/server/routers/apps/routing-forms/deleteForm.handler.ts+++ b/packages/trpc/server/routers/apps/routing-forms/deleteForm.handler.ts@@ -1,5 +1,5 @@import getConnectedForms from "@calcom/app-store/routing-forms/lib/getConnectedForms";-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";import type { PrismaClient } from "@calcom/prisma";import { MembershipRole } from "@calcom/prisma/enums";import type { TrpcSessionUser } from "@calcom/trpc/server/types";diff --git a/packages/trpc/server/routers/apps/routing-forms/formMutation.handler.ts b/packages/trpc/server/routers/apps/routing-forms/formMutation.handler.tsindex 9668c750234..36d66ce286d 100644--- a/packages/trpc/server/routers/apps/routing-forms/formMutation.handler.ts+++ b/packages/trpc/server/routers/apps/routing-forms/formMutation.handler.ts@@ -9,7 +9,7 @@ import isRouterLinkedField from "@calcom/app-store/routing-forms/lib/isRouterLinimport type { SerializableForm } from "@calcom/app-store/routing-forms/types/types";import { zodFields, zodRouterRoute, zodRoutes } from "@calcom/app-store/routing-forms/zod";import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";-import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";+import { entityPrismaWhereClause, canEditEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";import type { PrismaClient } from "@calcom/prisma";import { MembershipRole } from "@calcom/prisma/enums";import type { TrpcSessionUser } from "@calcom/trpc/server/types";diff --git a/packages/trpc/server/routers/apps/routing-forms/formQuery.handler.ts b/packages/trpc/server/routers/apps/routing-forms/formQuery.handler.tsindex 05a0b9c4185..7e332bde76d 100644--- a/packages/trpc/server/routers/apps/routing-forms/formQuery.handler.ts+++ b/packages/trpc/server/routers/apps/routing-forms/formQuery.handler.ts@@ -1,5 +1,5 @@import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";import type { PrismaClient } from "@calcom/prisma";import { MembershipRole } from "@calcom/prisma/enums";import type { TrpcSessionUser } from "@calcom/trpc/server/types";diff --git a/packages/trpc/server/routers/apps/routing-forms/forms.handler.ts b/packages/trpc/server/routers/apps/routing-forms/forms.handler.tsindex d29e291d496..8501f83a637 100644--- a/packages/trpc/server/routers/apps/routing-forms/forms.handler.ts+++ b/packages/trpc/server/routers/apps/routing-forms/forms.handler.ts@@ -3,7 +3,7 @@ import type { z } from "zod";import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";import type { zodFields, zodRoutes } from "@calcom/app-store/routing-forms/zod";import { hasFilter } from "@calcom/features/filters/lib/hasFilter";-import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";+import { entityPrismaWhereClause, canEditEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";import type { PrismaClient } from "@calcom/prisma";diff --git a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.tsindex cc426602519..0359b2a2e55 100644--- a/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts+++ b/packages/trpc/server/routers/apps/routing-forms/getResponseWithFormFields.handler.ts@@ -3,7 +3,7 @@ import type { z } from "zod";import { enrichFormWithMigrationData } from "@calcom/app-store/routing-forms/enrichFormWithMigrationData";import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";import type { FormResponse } from "@calcom/app-store/routing-forms/types/types";-import { canAccessEntity } from "@calcom/lib/entityPermissionUtils.server";+import { canAccessEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";import { getTranslation } from "@calcom/lib/server/i18n";import { prisma } from "@calcom/prisma";import type { TrpcSessionUser } from "@calcom/trpc/server/types";diff --git a/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts b/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.tsindex 4923c8d6d89..d8bc42e1127 100644--- a/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts+++ b/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts@@ -1,7 +1,7 @@import type { Dayjs } from "@calcom/dayjs";import dayjs from "@calcom/dayjs";-import type { DateRange } from "@calcom/lib/date-ranges";-import { buildDateRanges } from "@calcom/lib/date-ranges";+import type { DateRange } from "@calcom/features/schedules/lib/date-ranges";+import { buildDateRanges } from "@calcom/features/schedules/lib/date-ranges";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";import { prisma } from "@calcom/prisma";import { Prisma } from "@calcom/prisma/client";diff --git a/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts b/packages/trpc/server/routers/viewer/bookings/confirm.handler.tsindex ca0d5f827d2..f975a7f8d39 100644--- a/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts+++ b/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts@@ -16,7 +16,7 @@ import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";import { getTranslation } from "@calcom/lib/server/i18n";-import { WorkflowService } from "@calcom/lib/server/service/workflows";+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";import { prisma } from "@calcom/prisma";import { Prisma } from "@calcom/prisma/client";diff --git a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.tsindex 7ddc414d152..48ab05b92af 100644--- a/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts+++ b/packages/trpc/server/routers/viewer/bookings/editLocation.handler.ts@@ -11,7 +11,7 @@ import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";import { getTranslation } from "@calcom/lib/server/i18n";import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";-import { CredentialRepository } from "@calcom/lib/server/repository/credential";+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";import { prisma } from "@calcom/prisma";import type { Booking, BookingReference } from "@calcom/prisma/client";diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.tsindex 19d99cff918..b52de1681eb 100644--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts@@ -3,10 +3,10 @@ import { type SelectQueryBuilder } from "kysely";import { jsonObjectFrom, jsonArrayFrom } from "kysely/helpers/postgres";import dayjs from "@calcom/dayjs";+import getAllUserBookings from "@calcom/features/bookings/lib/getAllUserBookings";import { isTextFilterValue } from "@calcom/features/data-table/lib/utils";import type { DB } from "@calcom/kysely";import kysely from "@calcom/kysely";-import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings";import { parseEventTypeColor } from "@calcom/lib/isEventTypeColor";import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";import logger from "@calcom/lib/logger";diff --git a/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts b/packages/trpc/server/routers/viewer/credits/buyCredits.handler.tsindex c2c4f9522c5..e3a61baff28 100644--- a/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts+++ b/packages/trpc/server/routers/viewer/credits/buyCredits.handler.ts@@ -2,7 +2,7 @@ import { StripeBillingService } from "@calcom/features/ee/billing/stripe-billingimport { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";import { WEBAPP_URL } from "@calcom/lib/constants";import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { TeamService } from "@calcom/features/ee/teams/services/teamService";import prisma from "@calcom/prisma";import { MembershipRole } from "@calcom/prisma/enums";diff --git a/packages/trpc/server/routers/viewer/delegationCredential/add.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/add.handler.tsindex 189dda593ad..6d0979db48c 100644--- a/packages/trpc/server/routers/viewer/delegationCredential/add.handler.ts+++ b/packages/trpc/server/routers/viewer/delegationCredential/add.handler.ts@@ -1,6 +1,6 @@import type { z } from "zod";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { WorkspacePlatformRepository } from "@calcom/lib/server/repository/workspacePlatform";import { TRPCError } from "@trpc/server";diff --git a/packages/trpc/server/routers/viewer/delegationCredential/delete.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/delete.handler.tsindex b8d7db6beb8..dba3b5ec51e 100644--- a/packages/trpc/server/routers/viewer/delegationCredential/delete.handler.ts+++ b/packages/trpc/server/routers/viewer/delegationCredential/delete.handler.ts@@ -1,6 +1,6 @@import type z from "zod";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { TRPCError } from "@trpc/server";diff --git a/packages/trpc/server/routers/viewer/delegationCredential/getAffectedMembersForDisable.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/getAffectedMembersForDisable.handler.tsindex 25ac9ced68b..e821fc8f038 100644--- a/packages/trpc/server/routers/viewer/delegationCredential/getAffectedMembersForDisable.handler.ts+++ b/packages/trpc/server/routers/viewer/delegationCredential/getAffectedMembersForDisable.handler.ts@@ -1,5 +1,5 @@import logger from "@calcom/lib/logger";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";import type { TDelegationCredentialGetAffectedMembersForDisableSchema } from "./schema";diff --git a/packages/trpc/server/routers/viewer/delegationCredential/list.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/list.handler.tsindex e604e8f238b..66ed7e72f9f 100644--- a/packages/trpc/server/routers/viewer/delegationCredential/list.handler.ts+++ b/packages/trpc/server/routers/viewer/delegationCredential/list.handler.ts@@ -1,4 +1,4 @@-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { encryptedServiceAccountKeySchema } from "@calcom/lib/server/serviceAccountKey";import type { PrismaClient } from "@calcom/prisma";diff --git a/packages/trpc/server/routers/viewer/delegationCredential/toggleEnabled.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/toggleEnabled.handler.tsindex e9b9efec217..44f68fa2c16 100644--- a/packages/trpc/server/routers/viewer/delegationCredential/toggleEnabled.handler.ts+++ b/packages/trpc/server/routers/viewer/delegationCredential/toggleEnabled.handler.ts@@ -4,8 +4,8 @@ import { sendDelegationCredentialDisabledEmail } from "@calcom/emails/email-manaimport { checkIfSuccessfullyConfiguredInWorkspace } from "@calcom/app-store/delegationCredential";import logger from "@calcom/lib/logger";import { getTranslation } from "@calcom/lib/server/i18n";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";-import type { ServiceAccountKey } from "@calcom/lib/server/repository/delegationCredential";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { getAffectedMembersForDisable } from "./getAffectedMembersForDisable.handler";import type { DelegationCredentialToggleEnabledSchema } from "./schema";diff --git a/packages/trpc/server/routers/viewer/delegationCredential/update.handler.ts b/packages/trpc/server/routers/viewer/delegationCredential/update.handler.tsindex 0ba2194779c..fc79bf3798a 100644--- a/packages/trpc/server/routers/viewer/delegationCredential/update.handler.ts+++ b/packages/trpc/server/routers/viewer/delegationCredential/update.handler.ts@@ -1,6 +1,6 @@import type { z } from "zod";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import { WorkspacePlatformRepository } from "@calcom/lib/server/repository/workspacePlatform";import { TRPCError } from "@trpc/server";diff --git a/packages/trpc/server/routers/viewer/delegationCredential/utils.ts b/packages/trpc/server/routers/viewer/delegationCredential/utils.tsindex 475bc249c8d..a237225cb05 100644--- a/packages/trpc/server/routers/viewer/delegationCredential/utils.ts+++ b/packages/trpc/server/routers/viewer/delegationCredential/utils.ts@@ -2,7 +2,7 @@ import { z } from "zod";import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";import type { Prisma } from "@calcom/prisma/client";import { TRPCError } from "@trpc/server";diff --git a/packages/trpc/server/routers/viewer/eventTypes/getHashedLink.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getHashedLink.handler.tsindex c81374fd115..25544d25a44 100644--- a/packages/trpc/server/routers/viewer/eventTypes/getHashedLink.handler.ts+++ b/packages/trpc/server/routers/viewer/eventTypes/getHashedLink.handler.ts@@ -1,5 +1,5 @@-import { HashedLinkRepository } from "@calcom/lib/server/repository/hashedLinkRepository";-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";+import { HashedLinkRepository } from "@calcom/features/hashedLink/repositories/hashedLinkRepository";+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";import type { PrismaClient } from "@calcom/prisma";import type { TrpcSessionUser } from "@calcom/trpc/server/types";diff --git a/packages/trpc/server/routers/viewer/eventTypes/getHashedLinks.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/getHashedLinks.handler.tsindex 53996fa30af..7c783b4773d 100644--- a/packages/trpc/server/routers/viewer/eventTypes/getHashedLinks.handler.ts+++ b/packages/trpc/server/routers/viewer/eventTypes/getHashedLinks.handler.ts@@ -1,5 +1,5 @@-import { HashedLinkRepository } from "@calcom/lib/server/repository/hashedLinkRepository";-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";+import { HashedLinkRepository } from "@calcom/features/hashedLink/repositories/hashedLinkRepository";+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";import type { PrismaClient } from "@calcom/prisma";import type { TrpcSessionUser } from "@calcom/trpc/server/types";diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.tsindex a019e9cb272..ec23c4e1d01 100644--- a/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts+++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts@@ -8,15 +8,15 @@ import {allowDisablingAttendeeConfirmationEmails,allowDisablingHostConfirmationEmails,} from "@calcom/features/ee/workflows/lib/allowDisablingStandardEmails";+import { HashedLinkRepository } from "@calcom/features/hashedLink/repositories/hashedLinkRepository";+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";+import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";import tasker from "@calcom/features/tasker";import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateIntervalLimitOrder";import logger from "@calcom/lib/logger";import { getTranslation } from "@calcom/lib/server/i18n";import { CalVideoSettingsRepository } from "@calcom/lib/server/repository/calVideoSettings";-import { HashedLinkRepository } from "@calcom/lib/server/repository/hashedLinkRepository";-import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";import { ScheduleRepository } from "@calcom/lib/server/repository/schedule";-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts";import type { PrismaClient } from "@calcom/prisma";import { Prisma } from "@calcom/prisma/client";diff --git a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.tsindex abf719542a9..e71d5950ebb 100644--- a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts+++ b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts@@ -10,7 +10,7 @@ import { enrichHostsWithDelegationCredentials } from "@calcom/app-store/delegatiimport { enrichFormWithMigrationData } from "@calcom/app-store/routing-forms/enrichFormWithMigrationData";import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser";import { getUrlSearchParamsToForwardForTestPreview } from "@calcom/features/routing-forms/lib/getUrlSearchParamsToForward";-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";import { fromEntriesWithDuplicateKeys } from "@calcom/lib/fromEntriesWithDuplicateKeys";import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";diff --git a/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts b/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.tsindex c761f1af9b0..e0027751b1d 100644--- a/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts+++ b/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.ts@@ -4,7 +4,7 @@ import type { IRedisService } from "@calcom/features/redis/IRedisService";import { IS_PRODUCTION, WEBAPP_URL } from "@calcom/lib/constants";import { getTranslation } from "@calcom/lib/server/i18n";import type { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";-import type { TeamRepository } from "@calcom/lib/server/repository/team";+import type { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";type EventDetails = {username: string;diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.tsindex 570181247ae..5f5e369ecef 100644--- a/packages/trpc/server/routers/viewer/slots/util.ts+++ b/packages/trpc/server/routers/viewer/slots/util.ts@@ -5,6 +5,7 @@ import { v4 as uuid } from "uuid";import type { Dayjs } from "@calcom/dayjs";import dayjs from "@calcom/dayjs";import { orgDomainConfig } from "@calcom/ee/organizations/lib/orgDomains";+import { getAggregatedAvailability } from "@calcom/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability";import type {CurrentSeats,EventType,@@ -13,26 +14,31 @@ import type {IFromUser,IToUser,} from "@calcom/features/availability/lib/getUserAvailability";+import type { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";import { checkForConflicts } from "@calcom/features/bookings/lib/conflictChecker/checkForConflicts";import type { QualifiedHostsService } from "@calcom/features/bookings/lib/host-filtering/findQualifiedHostsWithDelegationCredentials";import { isEventTypeLoggingEnabled } from "@calcom/features/bookings/lib/isEventTypeLoggingEnabled";+import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";import type { BusyTimesService } from "@calcom/features/busyTimes/services/getBusyTimes";import type { CacheService } from "@calcom/features/calendar-cache/lib/getShouldServeCache";import type { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes";+import type { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";+import type { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";import type { FeaturesRepository } from "@calcom/features/flags/features.repository";import type { IRedisService } from "@calcom/features/redis/IRedisService";+import { buildDateRanges } from "@calcom/features/schedules/lib/date-ranges";+import getSlots from "@calcom/features/schedules/lib/slots";+import type { UserRepository } from "@calcom/features/users/repositories/UserRepository";+import { withSelectedCalendars } from "@calcom/features/users/repositories/UserRepository";import { shouldIgnoreContactOwner } from "@calcom/lib/bookings/routing/utils";import { RESERVED_SUBDOMAINS } from "@calcom/lib/constants";-import { buildDateRanges } from "@calcom/lib/date-ranges";import { getUTCOffsetByTimezone } from "@calcom/lib/dayjs";-import { getAggregatedAvailability } from "@calcom/lib/getAggregatedAvailability";import { descendingLimitKeys, intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits";import { parseDurationLimit } from "@calcom/lib/intervalLimits/isDurationLimits";import LimitManager from "@calcom/lib/intervalLimits/limitManager";-import type { CheckBookingLimitsService } from "@calcom/features/bookings/lib/checkBookingLimits";import { isBookingWithinPeriod } from "@calcom/lib/intervalLimits/utils";import {calculatePeriodLimits,@@ -44,15 +50,9 @@ import logger from "@calcom/lib/logger";import { safeStringify } from "@calcom/lib/safeStringify";import { withReporting } from "@calcom/lib/sentryWrapper";import type { ISelectedSlotRepository } from "@calcom/lib/server/repository/ISelectedSlotRepository";-import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";-import type { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";import type { RoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse";import type { PrismaOOORepository } from "@calcom/lib/server/repository/ooo";import type { ScheduleRepository } from "@calcom/lib/server/repository/schedule";-import type { TeamRepository } from "@calcom/lib/server/repository/team";-import type { UserRepository } from "@calcom/features/users/repositories/UserRepository";-import { withSelectedCalendars } from "@calcom/features/users/repositories/UserRepository";-import getSlots from "@calcom/lib/slots";import { SchedulingType, PeriodType } from "@calcom/prisma/enums";import type { EventBusyDate, EventBusyDetails } from "@calcom/types/Calendar";import type { CredentialForCalendarService } from "@calcom/types/Credential";diff --git a/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.ts b/packages/trpc/server/routers/viewer/teams/changeMemberRole.handler.tsindex 4c04ab20f17..850b652993d 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 { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { prisma } from "@calcom/prisma";import type { TrpcSessionUser } from "@calcom/trpc/server/types";diff --git a/packages/trpc/server/routers/viewer/teams/list.handler.ts b/packages/trpc/server/routers/viewer/teams/list.handler.tsindex de41749d3ef..c1e6b4e9255 100644--- a/packages/trpc/server/routers/viewer/teams/list.handler.ts+++ b/packages/trpc/server/routers/viewer/teams/list.handler.ts@@ -1,4 +1,4 @@-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import prisma from "@calcom/prisma";import type { TrpcSessionUser } from "../../../types";diff --git a/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts b/packages/trpc/server/routers/viewer/teams/listMembers.handler.tsindex 600a7e8d07d..5ae0aef261b 100644--- a/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts+++ b/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts@@ -7,7 +7,7 @@ import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permiimport { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory";import { getBookerBaseUrlSync } from "@calcom/features/ee/organizations/lib/getBookerBaseUrlSync";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { UserRepository } from "@calcom/features/users/repositories/UserRepository";import { prisma } from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";diff --git a/packages/trpc/server/routers/viewer/teams/update.handler.ts b/packages/trpc/server/routers/viewer/teams/update.handler.tsindex 7096e52617b..9d3cec5adc4 100644--- a/packages/trpc/server/routers/viewer/teams/update.handler.ts+++ b/packages/trpc/server/routers/viewer/teams/update.handler.ts@@ -4,7 +4,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 { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { prisma } from "@calcom/prisma";import type { Prisma } from "@calcom/prisma/client";import { MembershipRole, RedirectType, RRTimestampBasis } from "@calcom/prisma/enums";diff --git a/packages/trpc/server/routers/viewer/workflows/list.handler.ts b/packages/trpc/server/routers/viewer/workflows/list.handler.tsindex 85fcc49bd49..82118b0d88e 100644--- a/packages/trpc/server/routers/viewer/workflows/list.handler.ts+++ b/packages/trpc/server/routers/viewer/workflows/list.handler.ts@@ -1,6 +1,6 @@import type { WorkflowType } from "@calcom/features/ee/workflows/components/WorkflowListPage";import { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";// import dayjs from "@calcom/dayjs";// import { getErrorFromUnknown } from "@calcom/lib/errors";import { addPermissionsToWorkflows } from "@calcom/lib/server/repository/workflow-permissions";diff --git a/packages/trpc/server/routers/viewer/workflows/update.handler.ts b/packages/trpc/server/routers/viewer/workflows/update.handler.tsindex ae4ce4d716f..935bf7259e5 100755--- a/packages/trpc/server/routers/viewer/workflows/update.handler.ts+++ b/packages/trpc/server/routers/viewer/workflows/update.handler.ts@@ -8,7 +8,7 @@ import { IS_SELF_HOSTED, SCANNING_WORKFLOW_STEPS } from "@calcom/lib/constants";import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata";import logger from "@calcom/lib/logger";import { PrismaAgentRepository } from "@calcom/lib/server/repository/PrismaAgentRepository";-import { TeamRepository } from "@calcom/lib/server/repository/team";+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";import { addPermissionsToWorkflow } from "@calcom/lib/server/repository/workflow-permissions";import { WorkflowRelationsRepository } from "@calcom/lib/server/repository/workflowRelations";import { WorkflowStepRepository } from "@calcom/lib/server/repository/workflowStep";diff --git a/packages/trpc/server/routers/viewer/workflows/util.ts b/packages/trpc/server/routers/viewer/workflows/util.tsindex 7ca0c66dbd6..4d3e8c1ab82 100644--- a/packages/trpc/server/routers/viewer/workflows/util.ts+++ b/packages/trpc/server/routers/viewer/workflows/util.ts@@ -12,7 +12,7 @@ import type { Workflow as WorkflowType } from "@calcom/ee/workflows/lib/types";import {SMS_REMINDER_NUMBER_FIELD,CAL_AI_AGENT_PHONE_NUMBER_FIELD,-} from "@calcom/lib/SystemField";+} from "@calcom/lib/bookings/SystemField";import {getSmsReminderNumberField,getSmsReminderNumberSource,