diff --git a/apps/api/v1/pages/api/availability/_get.ts b/apps/api/v1/pages/api/availability/_get.ts index 1a7059bd83..5a50919502 100644 --- a/apps/api/v1/pages/api/availability/_get.ts +++ b/apps/api/v1/pages/api/availability/_get.ts @@ -1,7 +1,7 @@ import type { NextApiRequest } from "next"; import { z } from "zod"; -import { getUserAvailabilityService } from "@calcom/lib/di/containers/GetUserAvailability"; +import { getUserAvailabilityService } from "@calcom/features/di/containers/GetUserAvailability"; import { HttpError } from "@calcom/lib/http-error"; import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; diff --git a/apps/api/v1/pages/api/slots/_get.ts b/apps/api/v1/pages/api/slots/_get.ts index 7589a41737..a344755f3e 100644 --- a/apps/api/v1/pages/api/slots/_get.ts +++ b/apps/api/v1/pages/api/slots/_get.ts @@ -4,7 +4,7 @@ import type { NextApiRequest, NextApiResponse } from "next"; import dayjs from "@calcom/dayjs"; import { isSupportedTimeZone } from "@calcom/lib/dayjs"; -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import { HttpError } from "@calcom/lib/http-error"; import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import { createContext } from "@calcom/trpc/server/createContext"; diff --git a/apps/api/v1/test/lib/bookings/_post.test.ts b/apps/api/v1/test/lib/bookings/_post.test.ts index dcebba79f6..5f74118274 100644 --- a/apps/api/v1/test/lib/bookings/_post.test.ts +++ b/apps/api/v1/test/lib/bookings/_post.test.ts @@ -76,7 +76,7 @@ vi.mock("@calcom/features/watchlist/operations/check-if-users-are-blocked.contro checkIfUsersAreBlocked: vi.fn().mockResolvedValue(false), })); -vi.mock("@calcom/lib/di/containers/QualifiedHosts", () => ({ +vi.mock("@calcom/features/di/containers/QualifiedHosts", () => ({ getQualifiedHostsService: vi.fn().mockReturnValue({ findQualifiedHostsWithDelegationCredentials: vi.fn().mockResolvedValue({ qualifiedRRHosts: [], diff --git a/apps/web/pages/api/get-inbound-dynamic-variables.ts b/apps/web/pages/api/get-inbound-dynamic-variables.ts index 595259d2eb..b107cac3d9 100644 --- a/apps/web/pages/api/get-inbound-dynamic-variables.ts +++ b/apps/web/pages/api/get-inbound-dynamic-variables.ts @@ -5,7 +5,7 @@ import { z } from "zod"; import dayjs from "@calcom/dayjs"; import { ZGetRetellLLMSchema } from "@calcom/features/calAIPhone/zod-utils"; import type { TGetRetellLLMSchema } from "@calcom/features/calAIPhone/zod-utils"; -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import { fetcher } from "@calcom/lib/retellAIFetcher"; import { defaultHandler } from "@calcom/lib/server/defaultHandler"; import prisma from "@calcom/prisma"; diff --git a/apps/web/test/lib/checkBookingLimits.test.ts b/apps/web/test/lib/checkBookingLimits.test.ts index 19e9791c0b..eb856ef17c 100644 --- a/apps/web/test/lib/checkBookingLimits.test.ts +++ b/apps/web/test/lib/checkBookingLimits.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from "vitest"; import dayjs from "@calcom/dayjs"; -import { getCheckBookingLimitsService } from "@calcom/lib/di/containers/BookingLimits"; +import { getCheckBookingLimitsService } from "@calcom/features/di/containers/BookingLimits"; import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema"; import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateIntervalLimitOrder"; diff --git a/apps/web/test/lib/getSchedule.test.ts b/apps/web/test/lib/getSchedule.test.ts index 49ce568582..7494cfeca0 100644 --- a/apps/web/test/lib/getSchedule.test.ts +++ b/apps/web/test/lib/getSchedule.test.ts @@ -17,7 +17,7 @@ import { import { describe, vi, test } from "vitest"; import dayjs from "@calcom/dayjs"; -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import { SchedulingType, type BookingStatus } from "@calcom/prisma/enums"; import { expect, expectedSlotsForSchedule } from "./getSchedule/expects"; diff --git a/apps/web/test/lib/getSchedule/calendarEvents.test.ts b/apps/web/test/lib/getSchedule/calendarEvents.test.ts index 8d5e4d730f..7958d7999f 100644 --- a/apps/web/test/lib/getSchedule/calendarEvents.test.ts +++ b/apps/web/test/lib/getSchedule/calendarEvents.test.ts @@ -9,7 +9,7 @@ import { import { describe, test } from "vitest"; -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import { expect, expectedSlotsForSchedule } from "./expects"; import { setupAndTeardown } from "./setupAndTeardown"; diff --git a/apps/web/test/lib/getSchedule/delegation-credential.test.ts b/apps/web/test/lib/getSchedule/delegation-credential.test.ts index 968273f30e..04ec01ce1c 100644 --- a/apps/web/test/lib/getSchedule/delegation-credential.test.ts +++ b/apps/web/test/lib/getSchedule/delegation-credential.test.ts @@ -12,7 +12,7 @@ import { expectNoAttemptToGetAvailability } from "../../utils/bookingScenario/ex import { describe, test } from "vitest"; -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import { MembershipRole } from "@calcom/prisma/enums"; import { expect, expectedSlotsForSchedule } from "./expects"; diff --git a/apps/web/test/lib/getSchedule/futureLimit.timezone.test.ts b/apps/web/test/lib/getSchedule/futureLimit.timezone.test.ts index 78d3eb8ad8..5defd710b0 100644 --- a/apps/web/test/lib/getSchedule/futureLimit.timezone.test.ts +++ b/apps/web/test/lib/getSchedule/futureLimit.timezone.test.ts @@ -8,7 +8,7 @@ import type { ScenarioData } from "../../utils/bookingScenario/bookingScenario"; import { describe, expect, vi, test } from "vitest"; -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import { PeriodType } from "@calcom/prisma/enums"; import { expectedSlotsForSchedule } from "./expects"; diff --git a/apps/web/test/lib/getSchedule/restrictionSchedule.test.ts b/apps/web/test/lib/getSchedule/restrictionSchedule.test.ts index e00beaabe1..102ce6d96a 100644 --- a/apps/web/test/lib/getSchedule/restrictionSchedule.test.ts +++ b/apps/web/test/lib/getSchedule/restrictionSchedule.test.ts @@ -10,7 +10,7 @@ import { import { describe, test, vi } from "vitest"; import type { z } from "zod"; -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import type { getScheduleSchema } from "@calcom/trpc/server/routers/viewer/slots/types"; import { expect } from "./expects"; diff --git a/apps/web/test/lib/getSchedule/selectedSlots.test.ts b/apps/web/test/lib/getSchedule/selectedSlots.test.ts index 645e339aa6..6abecdddc3 100644 --- a/apps/web/test/lib/getSchedule/selectedSlots.test.ts +++ b/apps/web/test/lib/getSchedule/selectedSlots.test.ts @@ -11,7 +11,7 @@ import type { IncomingMessage } from "http"; import { describe, test, beforeEach, vi } from "vitest"; import type { z } from "zod"; -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import { prisma } from "@calcom/prisma"; import type { getScheduleSchema, GetScheduleOptions } from "@calcom/trpc/server/routers/viewer/slots/types"; diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts index 74f08daa95..5c23a24619 100644 --- a/packages/features/bookings/lib/handleNewBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking.ts @@ -47,9 +47,9 @@ import { enrichHostsWithDelegationCredentials, getFirstDelegationConferencingCredentialAppLocation, } from "@calcom/lib/delegationCredential/server"; -import { getCheckBookingAndDurationLimitsService } from "@calcom/lib/di/containers/BookingLimits"; -import { getCacheService } from "@calcom/lib/di/containers/Cache"; -import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser"; +import { getCheckBookingAndDurationLimitsService } from "@calcom/features/di/containers/BookingLimits"; +import { getCacheService } from "@calcom/features/di/containers/Cache"; +import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser"; import { ErrorCode } from "@calcom/lib/errorCodes"; import { getErrorFromUnknown } from "@calcom/lib/errors"; import { extractBaseEmail } from "@calcom/lib/extract-base-email"; diff --git a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts index 15d849cc86..8280d73709 100644 --- a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts +++ b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts @@ -4,8 +4,8 @@ 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 { getBusyTimesService } from "@calcom/lib/di/containers/BusyTimes"; -import { getUserAvailabilityService } from "@calcom/lib/di/containers/GetUserAvailability"; +import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes"; +import { getUserAvailabilityService } from "@calcom/features/di/containers/GetUserAvailability"; import { ErrorCode } from "@calcom/lib/errorCodes"; import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits"; import { parseDurationLimit } from "@calcom/lib/intervalLimits/isDurationLimits"; diff --git a/packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts b/packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts index bf49f2baab..4167f74623 100644 --- a/packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts +++ b/packages/features/bookings/lib/handleNewBooking/loadAndValidateUsers.ts @@ -2,7 +2,7 @@ import type { Logger } from "tslog"; import { checkIfUsersAreBlocked } from "@calcom/features/watchlist/operations/check-if-users-are-blocked.controller"; import { enrichUsersWithDelegationCredentials } from "@calcom/lib/delegationCredential/server"; -import { getQualifiedHostsService } from "@calcom/lib/di/containers/QualifiedHosts"; +import { getQualifiedHostsService } from "@calcom/features/di/containers/QualifiedHosts"; import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId"; import { HttpError } from "@calcom/lib/http-error"; import { getPiiFreeUser } from "@calcom/lib/piiFreeData"; diff --git a/packages/lib/di/bookings/containers/InstantBookingCreateService.container.ts b/packages/features/di/bookings/containers/InstantBookingCreateService.container.ts similarity index 89% rename from packages/lib/di/bookings/containers/InstantBookingCreateService.container.ts rename to packages/features/di/bookings/containers/InstantBookingCreateService.container.ts index 63bf89ce2a..4be7f406cc 100644 --- a/packages/lib/di/bookings/containers/InstantBookingCreateService.container.ts +++ b/packages/features/di/bookings/containers/InstantBookingCreateService.container.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { createContainer } from "../../di"; import { diff --git a/packages/lib/di/bookings/containers/RecurringBookingService.container.ts b/packages/features/di/bookings/containers/RecurringBookingService.container.ts similarity index 67% rename from packages/lib/di/bookings/containers/RecurringBookingService.container.ts rename to packages/features/di/bookings/containers/RecurringBookingService.container.ts index bf2f84aad4..86575191f4 100644 --- a/packages/lib/di/bookings/containers/RecurringBookingService.container.ts +++ b/packages/features/di/bookings/containers/RecurringBookingService.container.ts @@ -1,9 +1,9 @@ -import { bookingRepositoryModule } from "@calcom/lib/di/modules/Booking"; -import { cacheModule } from "@calcom/lib/di/modules/Cache"; -import { checkBookingAndDurationLimitsModule } from "@calcom/lib/di/modules/CheckBookingAndDurationLimits"; -import { checkBookingLimitsModule } from "@calcom/lib/di/modules/CheckBookingLimits"; -import { featuresRepositoryModule } from "@calcom/lib/di/modules/Features"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { bookingRepositoryModule } from "@calcom/features/di/modules/Booking"; +import { cacheModule } from "@calcom/features/di/modules/Cache"; +import { checkBookingAndDurationLimitsModule } from "@calcom/features/di/modules/CheckBookingAndDurationLimits"; +import { checkBookingLimitsModule } from "@calcom/features/di/modules/CheckBookingLimits"; +import { featuresRepositoryModule } from "@calcom/features/di/modules/Features"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { prismaModule } from "@calcom/prisma/prisma.module"; import { createContainer } from "../../di"; diff --git a/packages/lib/di/bookings/containers/RegularBookingService.container.ts b/packages/features/di/bookings/containers/RegularBookingService.container.ts similarity index 100% rename from packages/lib/di/bookings/containers/RegularBookingService.container.ts rename to packages/features/di/bookings/containers/RegularBookingService.container.ts diff --git a/packages/lib/di/bookings/modules/InstantBookingCreateService.module.ts b/packages/features/di/bookings/modules/InstantBookingCreateService.module.ts similarity index 87% rename from packages/lib/di/bookings/modules/InstantBookingCreateService.module.ts rename to packages/features/di/bookings/modules/InstantBookingCreateService.module.ts index c20327944b..aebfe66c6f 100644 --- a/packages/lib/di/bookings/modules/InstantBookingCreateService.module.ts +++ b/packages/features/di/bookings/modules/InstantBookingCreateService.module.ts @@ -1,5 +1,5 @@ import { InstantBookingCreateService } from "@calcom/features/instant-meeting/handleInstantMeeting"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { createModule } from "../../di"; diff --git a/packages/lib/di/bookings/modules/RecurringBookingService.module.ts b/packages/features/di/bookings/modules/RecurringBookingService.module.ts similarity index 88% rename from packages/lib/di/bookings/modules/RecurringBookingService.module.ts rename to packages/features/di/bookings/modules/RecurringBookingService.module.ts index 8ff9fdc255..b93e760fe5 100644 --- a/packages/lib/di/bookings/modules/RecurringBookingService.module.ts +++ b/packages/features/di/bookings/modules/RecurringBookingService.module.ts @@ -1,5 +1,5 @@ import { RecurringBookingService } from "@calcom/features/bookings/lib/handleNewRecurringBooking"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { createModule } from "../../di"; diff --git a/packages/lib/di/bookings/modules/RegularBookingService.module.ts b/packages/features/di/bookings/modules/RegularBookingService.module.ts similarity index 78% rename from packages/lib/di/bookings/modules/RegularBookingService.module.ts rename to packages/features/di/bookings/modules/RegularBookingService.module.ts index d1e3c920ad..b00b03a1eb 100644 --- a/packages/lib/di/bookings/modules/RegularBookingService.module.ts +++ b/packages/features/di/bookings/modules/RegularBookingService.module.ts @@ -1,10 +1,10 @@ import { RegularBookingService } from "@calcom/features/bookings/lib/handleNewBooking"; -import { moduleLoader as bookingRepositoryModuleLoader } from "@calcom/lib/di/modules/Booking"; -import { moduleLoader as cacheModuleLoader } from "@calcom/lib/di/modules/Cache"; -import { moduleLoader as checkBookingAndDurationLimitsModuleLoader } from "@calcom/lib/di/modules/CheckBookingAndDurationLimits"; -import { moduleLoader as checkBookingLimitsModuleLoader } from "@calcom/lib/di/modules/CheckBookingLimits"; -import { moduleLoader as featuresRepositoryModuleLoader } from "@calcom/lib/di/modules/Features"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { moduleLoader as bookingRepositoryModuleLoader } from "@calcom/features/di/modules/Booking"; +import { moduleLoader as cacheModuleLoader } from "@calcom/features/di/modules/Cache"; +import { moduleLoader as checkBookingAndDurationLimitsModuleLoader } from "@calcom/features/di/modules/CheckBookingAndDurationLimits"; +import { moduleLoader as checkBookingLimitsModuleLoader } from "@calcom/features/di/modules/CheckBookingLimits"; +import { moduleLoader as featuresRepositoryModuleLoader } from "@calcom/features/di/modules/Features"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module"; import { bindModuleToClassOnToken, createModule } from "../../di"; diff --git a/packages/lib/di/bookings/tokens.ts b/packages/features/di/bookings/tokens.ts similarity index 100% rename from packages/lib/di/bookings/tokens.ts rename to packages/features/di/bookings/tokens.ts diff --git a/packages/lib/di/containers/AvailableSlots.ts b/packages/features/di/containers/AvailableSlots.ts similarity index 98% rename from packages/lib/di/containers/AvailableSlots.ts rename to packages/features/di/containers/AvailableSlots.ts index 99e6eb1495..4ddfd5b240 100644 --- a/packages/lib/di/containers/AvailableSlots.ts +++ b/packages/features/di/containers/AvailableSlots.ts @@ -1,5 +1,5 @@ import { redisModule } from "@calcom/features/redis/di/redisModule"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { prismaModule } from "@calcom/prisma/prisma.module"; import type { AvailableSlotsService } from "@calcom/trpc/server/routers/viewer/slots/util"; diff --git a/packages/lib/di/containers/BookingLimits.ts b/packages/features/di/containers/BookingLimits.ts similarity index 83% rename from packages/lib/di/containers/BookingLimits.ts rename to packages/features/di/containers/BookingLimits.ts index f1e5fc828a..614346ca14 100644 --- a/packages/lib/di/containers/BookingLimits.ts +++ b/packages/features/di/containers/BookingLimits.ts @@ -1,8 +1,8 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; +import type { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits"; import { prismaModule } from "@calcom/prisma/prisma.module"; -import type { CheckBookingAndDurationLimitsService } from "../../../features/bookings/lib/handleNewBooking/checkBookingAndDurationLimits"; -import type { CheckBookingLimitsService } from "../../intervalLimits/server/checkBookingLimits"; +import type { CheckBookingAndDurationLimitsService } from "../../bookings/lib/handleNewBooking/checkBookingAndDurationLimits"; import { createContainer } from "../di"; import { bookingRepositoryModule } from "../modules/Booking"; import { checkBookingAndDurationLimitsModule } from "../modules/CheckBookingAndDurationLimits"; diff --git a/packages/lib/di/containers/BusyTimes.ts b/packages/features/di/containers/BusyTimes.ts similarity index 82% rename from packages/lib/di/containers/BusyTimes.ts rename to packages/features/di/containers/BusyTimes.ts index c63e39a099..153793d2de 100644 --- a/packages/lib/di/containers/BusyTimes.ts +++ b/packages/features/di/containers/BusyTimes.ts @@ -1,7 +1,7 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { prismaModule } from "@calcom/prisma/prisma.module"; -import type { BusyTimesService } from "../../getBusyTimes"; +import type { BusyTimesService } from "@calcom/lib/getBusyTimes"; import { createContainer } from "../di"; import { bookingRepositoryModule } from "../modules/Booking"; import { busyTimesModule } from "../modules/BusyTimes"; diff --git a/packages/lib/di/containers/Cache.ts b/packages/features/di/containers/Cache.ts similarity index 92% rename from packages/lib/di/containers/Cache.ts rename to packages/features/di/containers/Cache.ts index 52bae05781..bb77b2260d 100644 --- a/packages/lib/di/containers/Cache.ts +++ b/packages/features/di/containers/Cache.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { prismaModule } from "@calcom/prisma/prisma.module"; import type { CacheService } from "../../../features/calendar-cache/lib/getShouldServeCache"; diff --git a/packages/lib/di/containers/FilterHosts.ts b/packages/features/di/containers/FilterHosts.ts similarity index 92% rename from packages/lib/di/containers/FilterHosts.ts rename to packages/features/di/containers/FilterHosts.ts index c84f8cf2d7..3672a0f5c4 100644 --- a/packages/lib/di/containers/FilterHosts.ts +++ b/packages/features/di/containers/FilterHosts.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { prismaModule } from "@calcom/prisma/prisma.module"; import type { FilterHostsService } from "../../bookings/filterHostsBySameRoundRobinHost"; diff --git a/packages/lib/di/containers/GetUserAvailability.ts b/packages/features/di/containers/GetUserAvailability.ts similarity index 89% rename from packages/lib/di/containers/GetUserAvailability.ts rename to packages/features/di/containers/GetUserAvailability.ts index 536346fa28..dc701a2f77 100644 --- a/packages/lib/di/containers/GetUserAvailability.ts +++ b/packages/features/di/containers/GetUserAvailability.ts @@ -1,8 +1,8 @@ +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { redisModule } from "@calcom/features/redis/di/redisModule"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import type { UserAvailabilityService } from "@calcom/lib/getUserAvailability"; import { prismaModule } from "@calcom/prisma/prisma.module"; -import type { UserAvailabilityService } from "../../getUserAvailability"; import { createContainer } from "../di"; import { bookingRepositoryModule } from "../modules/Booking"; import { busyTimesModule } from "../modules/BusyTimes"; diff --git a/packages/lib/di/containers/InsightsBooking.ts b/packages/features/di/containers/InsightsBooking.ts similarity index 94% rename from packages/lib/di/containers/InsightsBooking.ts rename to packages/features/di/containers/InsightsBooking.ts index 1e9881a1db..822ecb0b8b 100644 --- a/packages/lib/di/containers/InsightsBooking.ts +++ b/packages/features/di/containers/InsightsBooking.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import type { InsightsBookingServicePublicOptions, InsightsBookingServiceFilterOptions, diff --git a/packages/lib/di/containers/InsightsRouting.ts b/packages/features/di/containers/InsightsRouting.ts similarity index 94% rename from packages/lib/di/containers/InsightsRouting.ts rename to packages/features/di/containers/InsightsRouting.ts index 2f341ab6de..4178f4ecc6 100644 --- a/packages/lib/di/containers/InsightsRouting.ts +++ b/packages/features/di/containers/InsightsRouting.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import type { InsightsRoutingServicePublicOptions, InsightsRoutingServiceFilterOptions, diff --git a/packages/lib/di/containers/LuckyUser.ts b/packages/features/di/containers/LuckyUser.ts similarity index 100% rename from packages/lib/di/containers/LuckyUser.ts rename to packages/features/di/containers/LuckyUser.ts diff --git a/packages/lib/di/containers/NoSlotsNotification.ts b/packages/features/di/containers/NoSlotsNotification.ts similarity index 94% rename from packages/lib/di/containers/NoSlotsNotification.ts rename to packages/features/di/containers/NoSlotsNotification.ts index eff2c4b85c..6e909c42b9 100644 --- a/packages/lib/di/containers/NoSlotsNotification.ts +++ b/packages/features/di/containers/NoSlotsNotification.ts @@ -1,5 +1,5 @@ import { redisModule } from "@calcom/features/redis/di/redisModule"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { prismaModule } from "@calcom/prisma/prisma.module"; import type { NoSlotsNotificationService } from "@calcom/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots"; diff --git a/packages/lib/di/containers/QualifiedHosts.ts b/packages/features/di/containers/QualifiedHosts.ts similarity index 81% rename from packages/lib/di/containers/QualifiedHosts.ts rename to packages/features/di/containers/QualifiedHosts.ts index 089683e540..7fb9a6f963 100644 --- a/packages/lib/di/containers/QualifiedHosts.ts +++ b/packages/features/di/containers/QualifiedHosts.ts @@ -1,7 +1,7 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; +import type { QualifiedHostsService } from "@calcom/lib/bookings/findQualifiedHostsWithDelegationCredentials"; import { prismaModule } from "@calcom/prisma/prisma.module"; -import type { QualifiedHostsService } from "../../bookings/findQualifiedHostsWithDelegationCredentials"; import { createContainer } from "../di"; import { bookingRepositoryModule } from "../modules/Booking"; import { filterHostsModule } from "../modules/FilterHosts"; diff --git a/packages/lib/di/di.ts b/packages/features/di/di.ts similarity index 100% rename from packages/lib/di/di.ts rename to packages/features/di/di.ts diff --git a/packages/lib/di/modules/Attribute.ts b/packages/features/di/modules/Attribute.ts similarity index 92% rename from packages/lib/di/modules/Attribute.ts rename to packages/features/di/modules/Attribute.ts index 11f06dd1bd..581d446ca0 100644 --- a/packages/lib/di/modules/Attribute.ts +++ b/packages/features/di/modules/Attribute.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository"; import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module"; diff --git a/packages/lib/di/modules/AvailableSlots.ts b/packages/features/di/modules/AvailableSlots.ts similarity index 100% rename from packages/lib/di/modules/AvailableSlots.ts rename to packages/features/di/modules/AvailableSlots.ts diff --git a/packages/lib/di/modules/Booking.ts b/packages/features/di/modules/Booking.ts similarity index 90% rename from packages/lib/di/modules/Booking.ts rename to packages/features/di/modules/Booking.ts index 802d95cf8f..f2d973687f 100644 --- a/packages/lib/di/modules/Booking.ts +++ b/packages/features/di/modules/Booking.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { BookingRepository } from "@calcom/lib/server/repository/booking"; import { type Container, createModule } from "../di"; diff --git a/packages/lib/di/modules/BusyTimes.ts b/packages/features/di/modules/BusyTimes.ts similarity index 70% rename from packages/lib/di/modules/BusyTimes.ts rename to packages/features/di/modules/BusyTimes.ts index 6ba085ee51..2bf3ce2ebf 100644 --- a/packages/lib/di/modules/BusyTimes.ts +++ b/packages/features/di/modules/BusyTimes.ts @@ -1,5 +1,5 @@ -import type { IBusyTimesService } from "../../getBusyTimes"; -import { BusyTimesService } from "../../getBusyTimes"; +import type { IBusyTimesService } from "@calcom/lib/getBusyTimes"; +import { BusyTimesService } from "@calcom/lib/getBusyTimes"; import { createModule } from "../di"; import { DI_TOKENS } from "../tokens"; diff --git a/packages/lib/di/modules/Cache.ts b/packages/features/di/modules/Cache.ts similarity index 100% rename from packages/lib/di/modules/Cache.ts rename to packages/features/di/modules/Cache.ts diff --git a/packages/lib/di/modules/CheckBookingAndDurationLimits.ts b/packages/features/di/modules/CheckBookingAndDurationLimits.ts similarity index 100% rename from packages/lib/di/modules/CheckBookingAndDurationLimits.ts rename to packages/features/di/modules/CheckBookingAndDurationLimits.ts diff --git a/packages/lib/di/modules/CheckBookingLimits.ts b/packages/features/di/modules/CheckBookingLimits.ts similarity index 91% rename from packages/lib/di/modules/CheckBookingLimits.ts rename to packages/features/di/modules/CheckBookingLimits.ts index 5748af0dc0..e6f72e8b30 100644 --- a/packages/lib/di/modules/CheckBookingLimits.ts +++ b/packages/features/di/modules/CheckBookingLimits.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { CheckBookingLimitsService } from "@calcom/lib/intervalLimits/server/checkBookingLimits"; import { type Container, createModule } from "../di"; diff --git a/packages/lib/di/modules/EventType.ts b/packages/features/di/modules/EventType.ts similarity index 84% rename from packages/lib/di/modules/EventType.ts rename to packages/features/di/modules/EventType.ts index 0fbc5ffbb8..153c3f0a72 100644 --- a/packages/lib/di/modules/EventType.ts +++ b/packages/features/di/modules/EventType.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository"; import { createModule } from "../di"; diff --git a/packages/lib/di/modules/Features.ts b/packages/features/di/modules/Features.ts similarity index 90% rename from packages/lib/di/modules/Features.ts rename to packages/features/di/modules/Features.ts index a13fe28965..5207d3e0e3 100644 --- a/packages/lib/di/modules/Features.ts +++ b/packages/features/di/modules/Features.ts @@ -1,5 +1,5 @@ import { FeaturesRepository } from "@calcom/features/flags/features.repository"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { type Container, createModule } from "../di"; diff --git a/packages/lib/di/modules/FilterHosts.ts b/packages/features/di/modules/FilterHosts.ts similarity index 67% rename from packages/lib/di/modules/FilterHosts.ts rename to packages/features/di/modules/FilterHosts.ts index bf7a1f1893..5076e0bad5 100644 --- a/packages/lib/di/modules/FilterHosts.ts +++ b/packages/features/di/modules/FilterHosts.ts @@ -1,5 +1,6 @@ -import type { IFilterHostsService } from "../../bookings/filterHostsBySameRoundRobinHost"; -import { FilterHostsService } from "../../bookings/filterHostsBySameRoundRobinHost"; +import type { IFilterHostsService } from "@calcom/lib/bookings/filterHostsBySameRoundRobinHost"; +import { FilterHostsService } from "@calcom/lib/bookings/filterHostsBySameRoundRobinHost"; + import { createModule } from "../di"; import { DI_TOKENS } from "../tokens"; diff --git a/packages/lib/di/modules/GetUserAvailability.ts b/packages/features/di/modules/GetUserAvailability.ts similarity index 76% rename from packages/lib/di/modules/GetUserAvailability.ts rename to packages/features/di/modules/GetUserAvailability.ts index f2fefb9ac9..b45a895b95 100644 --- a/packages/lib/di/modules/GetUserAvailability.ts +++ b/packages/features/di/modules/GetUserAvailability.ts @@ -1,5 +1,6 @@ -import type { IUserAvailabilityService } from "../../getUserAvailability"; -import { UserAvailabilityService } from "../../getUserAvailability"; +import type { IUserAvailabilityService } from "@calcom/lib/getUserAvailability"; +import { UserAvailabilityService } from "@calcom/lib/getUserAvailability"; + import { createModule } from "../di"; import { DI_TOKENS } from "../tokens"; diff --git a/packages/lib/di/modules/Host.ts b/packages/features/di/modules/Host.ts similarity index 91% rename from packages/lib/di/modules/Host.ts rename to packages/features/di/modules/Host.ts index 4bd97cdd18..cf6c9c1581 100644 --- a/packages/lib/di/modules/Host.ts +++ b/packages/features/di/modules/Host.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { HostRepository } from "@calcom/lib/server/repository/host"; import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module"; diff --git a/packages/lib/di/modules/InsightsBooking.ts b/packages/features/di/modules/InsightsBooking.ts similarity index 100% rename from packages/lib/di/modules/InsightsBooking.ts rename to packages/features/di/modules/InsightsBooking.ts diff --git a/packages/lib/di/modules/InsightsRouting.ts b/packages/features/di/modules/InsightsRouting.ts similarity index 100% rename from packages/lib/di/modules/InsightsRouting.ts rename to packages/features/di/modules/InsightsRouting.ts diff --git a/packages/lib/di/modules/LuckyUser.ts b/packages/features/di/modules/LuckyUser.ts similarity index 95% rename from packages/lib/di/modules/LuckyUser.ts rename to packages/features/di/modules/LuckyUser.ts index 96cf779e31..c34dc032c0 100644 --- a/packages/lib/di/modules/LuckyUser.ts +++ b/packages/features/di/modules/LuckyUser.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { LuckyUserService } from "@calcom/lib/server/getLuckyUser"; import { bindModuleToClassOnToken, createModule, type ModuleLoader } from "../di"; diff --git a/packages/lib/di/modules/Membership.ts b/packages/features/di/modules/Membership.ts similarity index 84% rename from packages/lib/di/modules/Membership.ts rename to packages/features/di/modules/Membership.ts index 7c7d5e1ffd..fac1faa6cf 100644 --- a/packages/lib/di/modules/Membership.ts +++ b/packages/features/di/modules/Membership.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { MembershipRepository } from "@calcom/lib/server/repository/membership"; import { createModule } from "../di"; diff --git a/packages/lib/di/modules/NoSlotsNotification.ts b/packages/features/di/modules/NoSlotsNotification.ts similarity index 100% rename from packages/lib/di/modules/NoSlotsNotification.ts rename to packages/features/di/modules/NoSlotsNotification.ts diff --git a/packages/lib/di/modules/Ooo.ts b/packages/features/di/modules/Ooo.ts similarity index 91% rename from packages/lib/di/modules/Ooo.ts rename to packages/features/di/modules/Ooo.ts index 523c7e9b0f..e2652fc177 100644 --- a/packages/lib/di/modules/Ooo.ts +++ b/packages/features/di/modules/Ooo.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { PrismaOOORepository } from "@calcom/lib/server/repository/ooo"; import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module"; diff --git a/packages/lib/di/modules/QualifiedHosts.ts b/packages/features/di/modules/QualifiedHosts.ts similarity index 70% rename from packages/lib/di/modules/QualifiedHosts.ts rename to packages/features/di/modules/QualifiedHosts.ts index 98c16bed04..3077a3aaee 100644 --- a/packages/lib/di/modules/QualifiedHosts.ts +++ b/packages/features/di/modules/QualifiedHosts.ts @@ -1,5 +1,6 @@ -import type { IQualifiedHostsService } from "../../bookings/findQualifiedHostsWithDelegationCredentials"; -import { QualifiedHostsService } from "../../bookings/findQualifiedHostsWithDelegationCredentials"; +import type { IQualifiedHostsService } from "@calcom/lib/bookings/findQualifiedHostsWithDelegationCredentials"; +import { QualifiedHostsService } from "@calcom/lib/bookings/findQualifiedHostsWithDelegationCredentials"; + import { createModule } from "../di"; import { DI_TOKENS } from "../tokens"; diff --git a/packages/lib/di/modules/RoutingFormResponse.ts b/packages/features/di/modules/RoutingFormResponse.ts similarity index 86% rename from packages/lib/di/modules/RoutingFormResponse.ts rename to packages/features/di/modules/RoutingFormResponse.ts index 6f85b8d9d8..8fadfe109b 100644 --- a/packages/lib/di/modules/RoutingFormResponse.ts +++ b/packages/features/di/modules/RoutingFormResponse.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { RoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse"; import { createModule } from "../di"; diff --git a/packages/lib/di/modules/Schedule.ts b/packages/features/di/modules/Schedule.ts similarity index 86% rename from packages/lib/di/modules/Schedule.ts rename to packages/features/di/modules/Schedule.ts index a974b71fcf..3f898011ff 100644 --- a/packages/lib/di/modules/Schedule.ts +++ b/packages/features/di/modules/Schedule.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { ScheduleRepository } from "@calcom/lib/server/repository/schedule"; import { createModule } from "../di"; diff --git a/packages/lib/di/modules/SelectedSlots.ts b/packages/features/di/modules/SelectedSlots.ts similarity index 86% rename from packages/lib/di/modules/SelectedSlots.ts rename to packages/features/di/modules/SelectedSlots.ts index 3aa52978ab..c106559b48 100644 --- a/packages/lib/di/modules/SelectedSlots.ts +++ b/packages/features/di/modules/SelectedSlots.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { PrismaSelectedSlotRepository } from "@calcom/lib/server/repository/PrismaSelectedSlotRepository"; import { createModule } from "../di"; diff --git a/packages/lib/di/modules/Team.ts b/packages/features/di/modules/Team.ts similarity index 82% rename from packages/lib/di/modules/Team.ts rename to packages/features/di/modules/Team.ts index b9c7c29445..2052c536a5 100644 --- a/packages/lib/di/modules/Team.ts +++ b/packages/features/di/modules/Team.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { TeamRepository } from "@calcom/lib/server/repository/team"; import { createModule } from "../di"; diff --git a/packages/lib/di/modules/User.ts b/packages/features/di/modules/User.ts similarity index 91% rename from packages/lib/di/modules/User.ts rename to packages/features/di/modules/User.ts index f8daa69e2d..ba154e6ab9 100644 --- a/packages/lib/di/modules/User.ts +++ b/packages/features/di/modules/User.ts @@ -1,4 +1,4 @@ -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { UserRepository } from "@calcom/lib/server/repository/user"; import { moduleLoader as prismaModuleLoader } from "@calcom/prisma/prisma.module"; diff --git a/packages/lib/di/shared/services/logger.service.ts b/packages/features/di/shared/services/logger.service.ts similarity index 100% rename from packages/lib/di/shared/services/logger.service.ts rename to packages/features/di/shared/services/logger.service.ts diff --git a/packages/lib/di/shared/services/tasker.service.ts b/packages/features/di/shared/services/tasker.service.ts similarity index 100% rename from packages/lib/di/shared/services/tasker.service.ts rename to packages/features/di/shared/services/tasker.service.ts diff --git a/packages/lib/di/shared/shared.tokens.ts b/packages/features/di/shared/shared.tokens.ts similarity index 100% rename from packages/lib/di/shared/shared.tokens.ts rename to packages/features/di/shared/shared.tokens.ts diff --git a/packages/lib/di/tokens.ts b/packages/features/di/tokens.ts similarity index 100% rename from packages/lib/di/tokens.ts rename to packages/features/di/tokens.ts diff --git a/packages/lib/di/webhooks/Webhooks.tokens.ts b/packages/features/di/webhooks/Webhooks.tokens.ts similarity index 100% rename from packages/lib/di/webhooks/Webhooks.tokens.ts rename to packages/features/di/webhooks/Webhooks.tokens.ts diff --git a/packages/lib/di/webhooks/containers/webhook.ts b/packages/features/di/webhooks/containers/webhook.ts similarity index 100% rename from packages/lib/di/webhooks/containers/webhook.ts rename to packages/features/di/webhooks/containers/webhook.ts diff --git a/packages/lib/di/webhooks/modules/Webhook.module.ts b/packages/features/di/webhooks/modules/Webhook.module.ts similarity index 100% rename from packages/lib/di/webhooks/modules/Webhook.module.ts rename to packages/features/di/webhooks/modules/Webhook.module.ts diff --git a/packages/lib/di/webhooks/repositories/Webhook.repository.ts b/packages/features/di/webhooks/repositories/Webhook.repository.ts similarity index 100% rename from packages/lib/di/webhooks/repositories/Webhook.repository.ts rename to packages/features/di/webhooks/repositories/Webhook.repository.ts diff --git a/packages/lib/di/webhooks/services/Webhook.service.ts b/packages/features/di/webhooks/services/Webhook.service.ts similarity index 100% rename from packages/lib/di/webhooks/services/Webhook.service.ts rename to packages/features/di/webhooks/services/Webhook.service.ts diff --git a/packages/features/ee/round-robin/roundRobinReassignment.ts b/packages/features/ee/round-robin/roundRobinReassignment.ts index 796600d711..380fc01572 100644 --- a/packages/features/ee/round-robin/roundRobinReassignment.ts +++ b/packages/features/ee/round-robin/roundRobinReassignment.ts @@ -24,7 +24,7 @@ import { enrichHostsWithDelegationCredentials, enrichUserWithDelegationCredentialsIncludeServiceAccountKey, } from "@calcom/lib/delegationCredential/server"; -import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser"; +import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser"; import { ErrorCode } from "@calcom/lib/errorCodes"; import { IdempotencyKeyService } from "@calcom/lib/idempotencyKey/idempotencyKeyService"; import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; diff --git a/packages/features/insights/server/trpc-router.ts b/packages/features/insights/server/trpc-router.ts index a287db00ae..65022aae2b 100644 --- a/packages/features/insights/server/trpc-router.ts +++ b/packages/features/insights/server/trpc-router.ts @@ -13,8 +13,8 @@ import { routedToPerPeriodCsvInputSchema, bookingRepositoryBaseInputSchema, } from "@calcom/features/insights/server/raw-data.schema"; -import { getInsightsBookingService } from "@calcom/lib/di/containers/InsightsBooking"; -import { getInsightsRoutingService } from "@calcom/lib/di/containers/InsightsRouting"; +import { getInsightsBookingService } from "@calcom/features/di/containers/InsightsBooking"; +import { getInsightsRoutingService } from "@calcom/features/di/containers/InsightsRouting"; import type { PrismaClient } from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; import authedProcedure from "@calcom/trpc/server/procedures/authedProcedure"; diff --git a/packages/features/redis/di/redisModule.ts b/packages/features/redis/di/redisModule.ts index 8301285d7c..66e357facf 100644 --- a/packages/features/redis/di/redisModule.ts +++ b/packages/features/redis/di/redisModule.ts @@ -1,5 +1,5 @@ -import { createModule } from "@calcom/lib/di/di"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { createModule } from "@calcom/features/di/di"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { NoopRedisService } from "../NoopRedisService"; import { RedisService } from "../RedisService"; diff --git a/packages/lib/bookings/filterHostsByLeadThreshold.test.ts b/packages/lib/bookings/filterHostsByLeadThreshold.test.ts index e5289b9e91..cb71daafae 100644 --- a/packages/lib/bookings/filterHostsByLeadThreshold.test.ts +++ b/packages/lib/bookings/filterHostsByLeadThreshold.test.ts @@ -3,7 +3,7 @@ import { prisma } from "@calcom/prisma/__mocks__/prisma"; import type { Mock } from "vitest"; import { describe, expect, it, vi, afterEach, beforeEach } from "vitest"; -import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser"; +import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser"; import { RRResetInterval, RRTimestampBasis } from "@calcom/prisma/enums"; import { filterHostsByLeadThreshold, errorCodes } from "./filterHostsByLeadThreshold"; diff --git a/packages/lib/bookings/filterHostsByLeadThreshold.ts b/packages/lib/bookings/filterHostsByLeadThreshold.ts index 554cf1dfa9..8f7b6ac408 100644 --- a/packages/lib/bookings/filterHostsByLeadThreshold.ts +++ b/packages/lib/bookings/filterHostsByLeadThreshold.ts @@ -1,9 +1,9 @@ +import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser"; import logger from "@calcom/lib/logger"; import type { RRResetInterval, SelectedCalendar } from "@calcom/prisma/client"; import { RRTimestampBasis } from "@calcom/prisma/enums"; import type { CredentialForCalendarService } from "@calcom/types/Credential"; -import { getLuckyUserService } from "../di/containers/LuckyUser"; import type { LuckyUserService, RoutingFormResponse } from "../server/getLuckyUser"; export const errorCodes = { diff --git a/packages/lib/bookings/findQualifiedHostsWithDelegationCredentials.test.ts b/packages/lib/bookings/findQualifiedHostsWithDelegationCredentials.test.ts index ed44c67d96..c4bd709802 100644 --- a/packages/lib/bookings/findQualifiedHostsWithDelegationCredentials.test.ts +++ b/packages/lib/bookings/findQualifiedHostsWithDelegationCredentials.test.ts @@ -3,9 +3,9 @@ import prismaMock from "../../../tests/libs/__mocks__/prismaMock"; import { vi, it, describe, expect, afterEach } from "vitest"; import type { Mock } from "vitest"; +import { getQualifiedHostsService } from "@calcom/features/di/containers/QualifiedHosts"; import { RRResetInterval, SchedulingType } from "@calcom/prisma/enums"; -import { getQualifiedHostsService } from "../di/containers/QualifiedHosts"; import { filterHostsByLeadThreshold } from "./filterHostsByLeadThreshold"; import * as getRoutedUsers from "./getRoutedUsers"; diff --git a/packages/lib/getBusyTimes.test.ts b/packages/lib/getBusyTimes.test.ts index 7a30f57b9a..2692fb7286 100644 --- a/packages/lib/getBusyTimes.test.ts +++ b/packages/lib/getBusyTimes.test.ts @@ -3,8 +3,7 @@ import { prisma } from "@calcom/prisma/__mocks__/prisma"; import { describe, expect, it, vi } from "vitest"; import dayjs from "@calcom/dayjs"; - -import { getBusyTimesService } from "./di/containers/BusyTimes"; +import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes"; vi.mock("@calcom/prisma", () => ({ prisma, diff --git a/packages/lib/getUserAvailability.ts b/packages/lib/getUserAvailability.ts index c07013f845..47811c9eb6 100644 --- a/packages/lib/getUserAvailability.ts +++ b/packages/lib/getUserAvailability.ts @@ -4,6 +4,7 @@ import { z } from "zod"; import { getCalendar } from "@calcom/app-store/_utils/getCalendar"; import type { Dayjs } from "@calcom/dayjs"; import dayjs from "@calcom/dayjs"; +import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes"; import type { IRedisService } from "@calcom/features/redis/IRedisService"; import { getWorkingHours } from "@calcom/lib/availability"; import type { DateOverride, WorkingHours } from "@calcom/lib/date-ranges"; @@ -36,7 +37,6 @@ import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils"; import type { EventBusyDetails, IntervalLimitUnit } from "@calcom/types/Calendar"; import type { TimeRange } from "@calcom/types/schedule"; -import { getBusyTimesService } from "./di/containers/BusyTimes"; import { getPeriodStartDatesBetween as getPeriodStartDatesBetweenUtil } from "./intervalLimits/utils/getPeriodStartDatesBetween"; import { withReporting } from "./sentryWrapper"; diff --git a/packages/lib/intervalLimits/server/getBusyTimesFromLimits.ts b/packages/lib/intervalLimits/server/getBusyTimesFromLimits.ts index e45cd6918c..2c0024609f 100644 --- a/packages/lib/intervalLimits/server/getBusyTimesFromLimits.ts +++ b/packages/lib/intervalLimits/server/getBusyTimesFromLimits.ts @@ -1,7 +1,7 @@ import type { Dayjs } from "@calcom/dayjs"; import dayjs from "@calcom/dayjs"; -import { getCheckBookingLimitsService } from "@calcom/lib/di/containers/BookingLimits"; -import { getBusyTimesService } from "@calcom/lib/di/containers/BusyTimes"; +import { getCheckBookingLimitsService } from "@calcom/features/di/containers/BookingLimits"; +import { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes"; import type { EventType } from "@calcom/lib/getUserAvailability"; import { getPeriodStartDatesBetween } from "@calcom/lib/intervalLimits/utils/getPeriodStartDatesBetween"; import { withReporting } from "@calcom/lib/sentryWrapper"; diff --git a/packages/lib/server/getLuckyUser.integration-test.ts b/packages/lib/server/getLuckyUser.integration-test.ts index ba806e118a..b5c695f5df 100644 --- a/packages/lib/server/getLuckyUser.integration-test.ts +++ b/packages/lib/server/getLuckyUser.integration-test.ts @@ -1,6 +1,6 @@ import { describe, it, vi, expect, afterEach, beforeEach, beforeAll, afterAll } from "vitest"; -import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser"; +import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser"; import prisma from "@calcom/prisma"; const luckyUserService = getLuckyUserService(); diff --git a/packages/lib/server/getLuckyUser.test.ts b/packages/lib/server/getLuckyUser.test.ts index a68043b1f6..75958d51b6 100644 --- a/packages/lib/server/getLuckyUser.test.ts +++ b/packages/lib/server/getLuckyUser.test.ts @@ -5,7 +5,7 @@ import { v4 as uuid } from "uuid"; import { expect, it, describe, vi, beforeAll } from "vitest"; import dayjs from "@calcom/dayjs"; -import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser"; +import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser"; import { buildUser, buildBooking } from "@calcom/lib/test/builder"; import { AttributeType, RRResetInterval, RRTimestampBasis } from "@calcom/prisma/enums"; diff --git a/packages/prisma/prisma.module.ts b/packages/prisma/prisma.module.ts index 0845fe03ff..0519c4e8ce 100644 --- a/packages/prisma/prisma.module.ts +++ b/packages/prisma/prisma.module.ts @@ -1,5 +1,5 @@ -import { type Container, createModule } from "@calcom/lib/di/di"; -import { DI_TOKENS } from "@calcom/lib/di/tokens"; +import { type Container, createModule } from "@calcom/features/di/di"; +import { DI_TOKENS } from "@calcom/features/di/tokens"; import { prisma, readonlyPrisma } from "./index"; diff --git a/packages/trpc/server/routers/viewer/availability/user.handler.ts b/packages/trpc/server/routers/viewer/availability/user.handler.ts index f89e80b075..64d9273fed 100644 --- a/packages/trpc/server/routers/viewer/availability/user.handler.ts +++ b/packages/trpc/server/routers/viewer/availability/user.handler.ts @@ -1,4 +1,4 @@ -import { getUserAvailabilityService } from "@calcom/lib/di/containers/GetUserAvailability"; +import { getUserAvailabilityService } from "@calcom/features/di/containers/GetUserAvailability"; import type { TrpcSessionUser } from "../../../types"; import type { TUserInputSchema } from "./user.schema"; diff --git a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts index 2145d2e219..413ec38a47 100644 --- a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts +++ b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts @@ -9,7 +9,7 @@ import type { NextApiResponse } from "next"; import { enrichFormWithMigrationData } from "@calcom/app-store/routing-forms/enrichFormWithMigrationData"; import { getUrlSearchParamsToForwardForTestPreview } from "@calcom/features/routing-forms/lib/getUrlSearchParamsToForward"; import { enrichHostsWithDelegationCredentials } from "@calcom/lib/delegationCredential/server"; -import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser"; +import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser"; import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server"; import { fromEntriesWithDuplicateKeys } from "@calcom/lib/fromEntriesWithDuplicateKeys"; import { findTeamMembersMatchingAttributeLogic } from "@calcom/lib/raqb/findTeamMembersMatchingAttributeLogic"; diff --git a/packages/trpc/server/routers/viewer/slots/getSchedule.handler.ts b/packages/trpc/server/routers/viewer/slots/getSchedule.handler.ts index b05728c9d0..9d6cb9bbcd 100644 --- a/packages/trpc/server/routers/viewer/slots/getSchedule.handler.ts +++ b/packages/trpc/server/routers/viewer/slots/getSchedule.handler.ts @@ -1,4 +1,4 @@ -import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots"; +import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots"; import type { GetScheduleOptions } from "./types"; diff --git a/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.test.ts b/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.test.ts index cf4043a1f2..e962ba6676 100644 --- a/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.test.ts +++ b/packages/trpc/server/routers/viewer/slots/handleNotificationWhenNoSlots.test.ts @@ -6,7 +6,7 @@ import { vi, describe, it, beforeAll, afterAll, expect, beforeEach, afterEach } import dayjs from "@calcom/dayjs"; import * as CalcomEmails from "@calcom/emails"; import { RedisService } from "@calcom/features/redis/RedisService"; -import { getNoSlotsNotificationService } from "@calcom/lib/di/containers/NoSlotsNotification"; +import { getNoSlotsNotificationService } from "@calcom/features/di/containers/NoSlotsNotification"; vi.mock("@calcom/features/redis/RedisService", () => { const mockedRedis = vi.fn(); diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts index ea976e7d77..31924f71c2 100644 --- a/packages/trpc/server/routers/viewer/slots/util.ts +++ b/packages/trpc/server/routers/viewer/slots/util.ts @@ -16,7 +16,7 @@ import { RESERVED_SUBDOMAINS } from "@calcom/lib/constants"; import { buildDateRanges } from "@calcom/lib/date-ranges"; import { getUTCOffsetByTimezone } from "@calcom/lib/dayjs"; import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents"; -import type { getBusyTimesService } from "@calcom/lib/di/containers/BusyTimes"; +import type { getBusyTimesService } from "@calcom/features/di/containers/BusyTimes"; import { getAggregatedAvailability } from "@calcom/lib/getAggregatedAvailability"; import type { BusyTimesService } from "@calcom/lib/getBusyTimes"; import type { diff --git a/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts b/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts index 4c42c41b89..6cd3936d90 100644 --- a/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/getMemberAvailability.handler.ts @@ -1,5 +1,5 @@ import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/lib/delegationCredential/server"; -import { getUserAvailabilityService } from "@calcom/lib/di/containers/GetUserAvailability"; +import { getUserAvailabilityService } from "@calcom/features/di/containers/GetUserAvailability"; import { isTeamMember } from "@calcom/features/ee/teams/lib/queries"; import { MembershipRepository } from "@calcom/lib/server/repository/membership"; import type { TrpcSessionUser } from "@calcom/trpc/server/types";