Skip to content

Scheduling infrastructure for absolutely everyone.

refactor: Move attribute and routing-forms code from `app-store`/`lib` to `features` (#26025)

Benny Joo00e5770273ef
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx
index 965db9892a9..61763e299a8 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/teams/[id]/members/page.tsx
@@ -4,11 +4,11 @@ import { unstable_cache } from "next/cache";
import { headers, cookies } from "next/headers";
import { redirect } from "next/navigation";
+import { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import { getTeamMemberPermissions } from "@calcom/features/pbac/lib/team-member-permissions";
import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
import { prisma } from "@calcom/prisma";
import { viewerTeamsRouter } from "@calcom/trpc/server/routers/viewer/teams/_router";
import { TeamMembersView } from "@calcom/web/modules/ee/teams/views/team-members-view";
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/page.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/page.tsx
index 97ded333688..98147f9277e 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/members/page.tsx
@@ -4,11 +4,11 @@ import { unstable_cache } from "next/cache";
import { headers, cookies } from "next/headers";
import { redirect } from "next/navigation";
+import { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository";
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import { Resource, CustomAction, CrudAction } from "@calcom/features/pbac/domain/types/permission-registry";
import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permissions";
import { RoleManagementFactory } from "@calcom/features/pbac/services/role-management.factory";
-import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
import { prisma } from "@calcom/prisma";
import { MembershipRole } from "@calcom/prisma/enums";
import { viewerOrganizationsRouter } from "@calcom/trpc/server/routers/viewer/organizations/_router";
diff --git a/apps/web/components/apps/AppPage.tsx b/apps/web/components/apps/AppPage.tsx
index 948b472970a..06f95931303 100644
--- a/apps/web/components/apps/AppPage.tsx
+++ b/apps/web/components/apps/AppPage.tsx
@@ -14,10 +14,8 @@ import { getAppOnboardingUrl } from "@calcom/lib/apps/getAppOnboardingUrl";
import { APP_NAME, COMPANY_NAME, SUPPORT_MAIL_ADDRESS, WEBAPP_URL } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { trpc } from "@calcom/trpc/react";
-import type { AppRouter } from "@calcom/trpc/types/server/routers/_app";
+import { trpc, type RouterOutputs } from "@calcom/trpc/react";
import type { App as AppType } from "@calcom/types/App";
-import type { inferRouterOutputs } from "@trpc/server";
import classNames from "@calcom/ui/classNames";
import { Badge } from "@calcom/ui/components/badge";
import { Button } from "@calcom/ui/components/button";
@@ -147,8 +145,7 @@ export const AppPage = ({
useGrouping: false,
}).format(price);
- type RouterOutput = inferRouterOutputs<AppRouter>;
- type Credentials = RouterOutput["viewer"]["apps"]["appCredentialsByType"]["credentials"];
+ type Credentials = RouterOutputs["viewer"]["apps"]["appCredentialsByType"]["credentials"];
const [existingCredentials, setExistingCredentials] = useState<Credentials>([]);
@@ -199,6 +196,7 @@ export const AppPage = ({
if (searchParams?.get("defaultInstall") === "true") {
mutation.mutate({ type, variant, slug, defaultInstall: true });
}
+ // eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only once on mount
}, []);
const installOrDisconnectAppButton = () => {
@@ -317,6 +315,7 @@ export const AppPage = ({
<iframe allowFullScreen {...descriptionItem.iframe} />
</div>
) : (
+ // eslint-disable-next-line @next/next/no-img-element -- external app screenshots with unknown dimensions
<img
key={descriptionItem}
src={descriptionItem}
@@ -338,6 +337,7 @@ export const AppPage = ({
<div className="mb-8 flex pt-4">
<header>
<div className="mb-4 flex items-center">
+ {/* eslint-disable-next-line @next/next/no-img-element -- external app logo with unknown dimensions */}
<img
className={classNames(logo.includes("-dark") && "dark:invert", "min-h-16 min-w-16 h-16 w-16")}
src={logo}
diff --git a/apps/web/components/apps/MultiDisconnectIntegration.tsx b/apps/web/components/apps/MultiDisconnectIntegration.tsx
index 5ecbecbdcc1..77b95e4d11c 100644
--- a/apps/web/components/apps/MultiDisconnectIntegration.tsx
+++ b/apps/web/components/apps/MultiDisconnectIntegration.tsx
@@ -2,8 +2,7 @@ import { useState } from "react";
import { Dialog } from "@calcom/features/components/controlled-dialog";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { trpc } from "@calcom/trpc/react";
-import type { AppRouter } from "@calcom/trpc/types/server/routers/_app";
+import { trpc, type RouterOutputs } from "@calcom/trpc/react";
import { Button } from "@calcom/ui/components/button";
import { ConfirmationDialogContent } from "@calcom/ui/components/dialog";
import {
@@ -16,10 +15,7 @@ import {
} from "@calcom/ui/components/dropdown";
import { showToast } from "@calcom/ui/components/toast";
-import type { inferRouterOutputs } from "@trpc/server";
-
-type RouterOutput = inferRouterOutputs<AppRouter>;
-type Credentials = RouterOutput["viewer"]["apps"]["appCredentialsByType"]["credentials"];
+type Credentials = RouterOutputs["viewer"]["apps"]["appCredentialsByType"]["credentials"];
interface Props {
credentials: Credentials;
diff --git a/apps/web/test/utils/bookingScenario/bookingScenario.ts b/apps/web/test/utils/bookingScenario/bookingScenario.ts
index db1aefc8370..aaf56f67c6d 100644
--- a/apps/web/test/utils/bookingScenario/bookingScenario.ts
+++ b/apps/web/test/utils/bookingScenario/bookingScenario.ts
@@ -10,13 +10,13 @@ import type { z } from "zod";
import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
import { handleStripePaymentSuccess } from "@calcom/features/ee/payments/api/webhook";
-import { distributedTracing } from "@calcom/lib/tracing/factory";
import { ProfileRepository } from "@calcom/features/profile/repositories/ProfileRepository";
import { weekdayToWeekIndex, type WeekDays } from "@calcom/lib/dayjs";
import type { HttpError } from "@calcom/lib/http-error";
import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
import logger from "@calcom/lib/logger";
import { safeStringify } from "@calcom/lib/safeStringify";
+import { distributedTracing } from "@calcom/lib/tracing/factory";
import type { BookingReference, Attendee, Booking, Membership } from "@calcom/prisma/client";
import type { Prisma } from "@calcom/prisma/client";
import type { WebhookTriggerEvents } from "@calcom/prisma/client";
@@ -73,7 +73,7 @@ vi.mock("@calcom/app-store/video.adapters.generated", () => ({
}));
// We don't need to test it. Also, it causes Formbricks error when imported
-vi.mock("@calcom/lib/raqb/findTeamMembersMatchingAttributeLogic", () => ({
+vi.mock("@calcom/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic", () => ({
default: {},
}));
@@ -2289,7 +2289,10 @@ export async function mockPaymentSuccessWebhookFromStripe({ externalId }: { exte
let webhookResponse = null;
try {
const traceContext = distributedTracing.createTrace("test_stripe_webhook");
- await handleStripePaymentSuccess(getMockedStripePaymentEvent({ paymentIntentId: externalId }), traceContext);
+ await handleStripePaymentSuccess(
+ getMockedStripePaymentEvent({ paymentIntentId: externalId }),
+ traceContext
+ );
} catch (e) {
log.silly("mockPaymentSuccessWebhookFromStripe:catch", JSON.stringify(e));
webhookResponse = e as HttpError;
diff --git a/packages/app-store/_utils/raqb/raqbUtils.server.ts b/packages/app-store/_utils/raqb/raqbUtils.server.ts
index be8c227465a..17b5c9bee00 100644
--- a/packages/app-store/_utils/raqb/raqbUtils.server.ts
+++ b/packages/app-store/_utils/raqb/raqbUtils.server.ts
@@ -6,16 +6,16 @@
import type { JsonGroup, JsonItem, JsonRule, JsonTree } from "react-awesome-query-builder";
import { getQueryBuilderConfigForAttributes } from "@calcom/app-store/routing-forms/lib/getQueryBuilderConfig";
-import type { LocalRoute } from "@calcom/app-store/routing-forms/types/types";
-import { resolveQueryValue } from "@calcom/lib/raqb/resolveQueryValue";
-import type { dynamicFieldValueOperands } from "@calcom/lib/raqb/types";
-import { caseInsensitive } from "@calcom/lib/raqb/utils";
-import { safeStringify } from "@calcom/lib/safeStringify";
+import { resolveQueryValue } from "@calcom/app-store/routing-forms/lib/resolveQueryValue";
import type {
+ LocalRoute,
+ Attribute,
AttributeOptionValueWithType,
AttributeOptionValue,
- Attribute,
-} from "@calcom/lib/service/attribute/server/getAttributes";
+} from "@calcom/app-store/routing-forms/types/types";
+import type { dynamicFieldValueOperands } from "@calcom/lib/raqb/types";
+import { caseInsensitive } from "@calcom/lib/raqb/utils";
+import { safeStringify } from "@calcom/lib/safeStringify";
import { AttributeType } from "@calcom/prisma/enums";
function ensureArray(value: string | string[]) {
diff --git a/packages/app-store/_utils/raqb/raqbUtils.test.ts b/packages/app-store/_utils/raqb/raqbUtils.test.ts
index e56f60d6094..e663706e8c9 100644
--- a/packages/app-store/_utils/raqb/raqbUtils.test.ts
+++ b/packages/app-store/_utils/raqb/raqbUtils.test.ts
@@ -1,7 +1,7 @@
import { expect, describe, it, vi } from "vitest";
+import type { Attribute } from "@calcom/app-store/routing-forms/types/types";
import type { AttributesQueryValue, RaqbChild } from "@calcom/lib/raqb/types";
-import type { Attribute } from "@calcom/lib/service/attribute/server/getAttributes";
import { AttributeType } from "@calcom/prisma/enums";
import { RoutingFormFieldType } from "@calcom/routing-forms/lib/FieldTypes";
diff --git a/packages/lib/raqb/resolveQueryValue.test.ts b/packages/app-store/routing-forms/lib/resolveQueryValue.test.ts
similarity index 99%
rename from packages/lib/raqb/resolveQueryValue.test.ts
rename to packages/app-store/routing-forms/lib/resolveQueryValue.test.ts
index d34e2a7030a..b829dc98dd5 100644
--- a/packages/lib/raqb/resolveQueryValue.test.ts
+++ b/packages/app-store/routing-forms/lib/resolveQueryValue.test.ts
@@ -1,9 +1,9 @@
import { expect, describe, it } from "vitest";
+import { RoutingFormFieldType } from "@calcom/app-store/routing-forms/lib/FieldTypes";
+import type { Attribute } from "@calcom/app-store/routing-forms/types/types";
import type { AttributesQueryValue, RaqbChild } from "@calcom/lib/raqb/types";
-import type { Attribute } from "@calcom/lib/service/attribute/server/getAttributes";
import { AttributeType } from "@calcom/prisma/enums";
-import { RoutingFormFieldType } from "@calcom/routing-forms/lib/FieldTypes";
import { resolveQueryValue } from "./resolveQueryValue";
diff --git a/packages/lib/raqb/resolveQueryValue.ts b/packages/app-store/routing-forms/lib/resolveQueryValue.ts
similarity index 98%
rename from packages/lib/raqb/resolveQueryValue.ts
rename to packages/app-store/routing-forms/lib/resolveQueryValue.ts
index a6c9240cb78..95ae3d269cb 100644
--- a/packages/lib/raqb/resolveQueryValue.ts
+++ b/packages/app-store/routing-forms/lib/resolveQueryValue.ts
@@ -1,9 +1,8 @@
+import type { Attribute } from "@calcom/app-store/routing-forms/types/types";
import logger from "@calcom/lib/logger";
import type { dynamicFieldValueOperands, dynamicFieldValueOperandsResponse } from "@calcom/lib/raqb/types";
import type { AttributesQueryValue } from "@calcom/lib/raqb/types";
-import type { Attribute } from "@calcom/lib/service/attribute/server/getAttributes";
-
-import { caseInsensitive } from "./utils";
+import { caseInsensitive } from "@calcom/lib/raqb/utils";
// Type for JSON values that can be in the query
type JsonValue = string | number | boolean | null | JsonValue[] | { [key: string]: JsonValue };
diff --git a/packages/app-store/routing-forms/types/types.d.ts b/packages/app-store/routing-forms/types/types.d.ts
index cd1d340597b..5bdc33c8ea3 100644
--- a/packages/app-store/routing-forms/types/types.d.ts
+++ b/packages/app-store/routing-forms/types/types.d.ts
@@ -2,7 +2,7 @@ import type { ImmutableTree, Config } from "react-awesome-query-builder";
import type z from "zod";
import type { App_RoutingForms_Form } from "@calcom/prisma/client";
-import type { AttributeType } from "@calcom/prisma/client";
+import type { AttributeType, AttributeToUser, AttributeOption } from "@calcom/prisma/client";
import type { RoutingFormSettings } from "@calcom/prisma/zod-utils";
import type QueryBuilderInitialConfig from "../components/react-awesome-query-builder/config/config";
@@ -78,6 +78,38 @@ export type Attribute = {
}[];
};
+export type AttributeName = string;
+export type AttributeId = string;
+export type BulkAttributeAssigner =
+ | {
+ dsyncId: string;
+ }
+ | {
+ userId: number;
+ };
+
+export type AttributeOptionAssignment = AttributeToUser & {
+ attributeOption: Pick<AttributeOption, "slug"> & {
+ label: string;
+ attribute: {
+ id: string;
+ type: AttributeType;
+ isLocked: boolean;
+ };
+ };
+};
+
+export type AttributeOptionValue = {
+ isGroup: boolean;
+ value: string;
+ contains: { id: string; value: string; slug: string }[];
+};
+
+export type AttributeOptionValueWithType = {
+ type: AttributeType;
+ attributeOption: AttributeOptionValue | AttributeOptionValue[];
+};
+
export type AttributesQueryValue = NonNullable<LocalRoute["attributesQueryValue"]>;
export type FormFieldsQueryValue = LocalRoute["queryValue"];
export type SerializableField = NonNullable<SerializableForm<App_RoutingForms_Form>["fields"]>[number];
diff --git a/packages/lib/service/attribute/server/getAttributes.test.ts b/packages/features/attributes/lib/getAttributes.test.ts
similarity index 99%
rename from packages/lib/service/attribute/server/getAttributes.test.ts
rename to packages/features/attributes/lib/getAttributes.test.ts
index 7c6801b9887..22f2adffee0 100644
--- a/packages/lib/service/attribute/server/getAttributes.test.ts
+++ b/packages/features/attributes/lib/getAttributes.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 } from "vitest";
+import type { Attribute } from "@calcom/app-store/routing-forms/types/types";
import type { AttributeOption } from "@calcom/prisma/client";
import { AttributeType, MembershipRole } from "@calcom/prisma/enums";
-import type { Attribute } from "./getAttributes";
import { getAttributesForTeam, getAttributesAssignmentData, getUsersAttributes } from "./getAttributes";
// Helper functions to create test data
diff --git a/packages/lib/service/attribute/server/getAttributes.ts b/packages/features/attributes/lib/getAttributes.ts
similarity index 93%
rename from packages/lib/service/attribute/server/getAttributes.ts
rename to packages/features/attributes/lib/getAttributes.ts
index 58d9a29c6f0..34a2a1394aa 100644
--- a/packages/lib/service/attribute/server/getAttributes.ts
+++ b/packages/features/attributes/lib/getAttributes.ts
@@ -1,14 +1,14 @@
// TODO: Queries in this file are not optimized. Need to optimize them.
+import type { Attribute } from "@calcom/app-store/routing-forms/types/types";
+import type { AttributeId, AttributeOptionValueWithType } from "@calcom/app-store/routing-forms/types/types";
+import { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository";
+import { PrismaAttributeToUserRepository } from "@calcom/features/attributes/repositories/PrismaAttributeToUserRepository";
import logger from "@calcom/lib/logger";
import { safeStringify } from "@calcom/lib/safeStringify";
import prisma from "@calcom/prisma";
import type { AttributeToUser } from "@calcom/prisma/client";
import type { AttributeType } from "@calcom/prisma/enums";
-import { PrismaAttributeRepository } from "../../../server/repository/PrismaAttributeRepository";
-import { PrismaAttributeToUserRepository } from "../../../server/repository/PrismaAttributeToUserRepository";
-import type { AttributeId } from "../types";
-
type UserId = number;
type OrgMembershipId = number;
type AttributeOptionId = string;
@@ -28,18 +28,6 @@ type AssignmentForTheTeam = {
};
};
-export type Attribute = {
- name: string;
- slug: string;
- type: AttributeType;
- id: string;
- options: {
- id: string;
- value: string;
- slug: string;
- }[];
-};
-
type FullAttribute = {
name: string;
slug: string;
@@ -54,21 +42,6 @@ type FullAttribute = {
}[];
};
-export type AttributeOptionValue = {
- value: string;
- isGroup: boolean;
- contains: {
- id: string;
- slug: string;
- value: string;
- }[];
-};
-
-export type AttributeOptionValueWithType = {
- type: Attribute["type"];
- attributeOption: AttributeOptionValue | AttributeOptionValue[];
-};
-
async function _findMembershipsForBothOrgAndTeam({ orgId, teamId }: { orgId: number; teamId: number }) {
const memberships = await prisma.membership.findMany({
where: {
@@ -80,7 +53,10 @@ async function _findMembershipsForBothOrgAndTeam({ orgId, teamId }: { orgId: num
type Membership = (typeof memberships)[number];
- const { teamMemberships, orgMemberships } = memberships.reduce(
+ const { teamMemberships, orgMemberships } = memberships.reduce<{
+ teamMemberships: Membership[];
+ orgMemberships: Membership[];
+ }>(
(acc, membership) => {
if (membership.teamId === teamId) {
acc.teamMemberships.push(membership);
@@ -89,7 +65,7 @@ async function _findMembershipsForBothOrgAndTeam({ orgId, teamId }: { orgId: num
}
return acc;
},
- { teamMemberships: [] as Membership[], orgMemberships: [] as Membership[] }
+ { teamMemberships: [], orgMemberships: [] }
);
return {
diff --git a/packages/lib/service/attribute/server/utils.ts b/packages/features/attributes/lib/utils.ts
similarity index 84%
rename from packages/lib/service/attribute/server/utils.ts
rename to packages/features/attributes/lib/utils.ts
index 36cb0baf2eb..11699701e38 100644
--- a/packages/lib/service/attribute/server/utils.ts
+++ b/packages/features/attributes/lib/utils.ts
@@ -1,4 +1,4 @@
-import { PrismaAttributeToUserRepository } from "../../../server/repository/PrismaAttributeToUserRepository";
+import { PrismaAttributeToUserRepository } from "@calcom/features/attributes/repositories/PrismaAttributeToUserRepository";
export const getWhereClauseForAttributeOptionsManagedByCalcom = () => {
// Neither created nor updated by DSync
diff --git a/packages/lib/server/repository/PrismaAttributeOptionRepository.ts b/packages/features/attributes/repositories/PrismaAttributeOptionRepository.ts
similarity index 94%
rename from packages/lib/server/repository/PrismaAttributeOptionRepository.ts
rename to packages/features/attributes/repositories/PrismaAttributeOptionRepository.ts
index 0a2dd142219..f9667dcbf46 100644
--- a/packages/lib/server/repository/PrismaAttributeOptionRepository.ts
+++ b/packages/features/attributes/repositories/PrismaAttributeOptionRepository.ts
@@ -1,4 +1,4 @@
-import prisma from "@calcom/prisma";
+import { prisma } from "@calcom/prisma";
import type { Prisma } from "@calcom/prisma/client";
export class PrismaAttributeOptionRepository {
diff --git a/packages/lib/server/repository/PrismaAttributeRepository.ts b/packages/features/attributes/repositories/PrismaAttributeRepository.ts
similarity index 100%
rename from packages/lib/server/repository/PrismaAttributeRepository.ts
rename to packages/features/attributes/repositories/PrismaAttributeRepository.ts
diff --git a/packages/lib/server/repository/PrismaAttributeToUserRepository.ts b/packages/features/attributes/repositories/PrismaAttributeToUserRepository.ts
similarity index 96%
rename from packages/lib/server/repository/PrismaAttributeToUserRepository.ts
rename to packages/features/attributes/repositories/PrismaAttributeToUserRepository.ts
index 72785f870fe..d798a86d390 100644
--- a/packages/lib/server/repository/PrismaAttributeToUserRepository.ts
+++ b/packages/features/attributes/repositories/PrismaAttributeToUserRepository.ts
@@ -1,4 +1,4 @@
-import prisma from "@calcom/prisma";
+import { prisma } from "@calcom/prisma";
import type { Prisma } from "@calcom/prisma/client";
export class PrismaAttributeToUserRepository {
diff --git a/packages/features/bookings/lib/getLuckyUser.ts b/packages/features/bookings/lib/getLuckyUser.ts
index 1ccd66a2bca..4fcdcbc20e3 100644
--- a/packages/features/bookings/lib/getLuckyUser.ts
+++ b/packages/features/bookings/lib/getLuckyUser.ts
@@ -2,6 +2,7 @@ import { acrossQueryValueCompatiblity } from "@calcom/app-store/_utils/raqb/raqb
import type { FormResponse, Fields } from "@calcom/app-store/routing-forms/types/types";
import { zodRoutes } from "@calcom/app-store/routing-forms/zod";
import dayjs from "@calcom/dayjs";
+import type { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository";
import type { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
import { getBusyCalendarTimes } from "@calcom/features/calendars/lib/CalendarManager";
import type { HostRepository } from "@calcom/features/host/repositories/HostRepository";
@@ -11,7 +12,6 @@ import type { UserRepository } from "@calcom/features/users/repositories/UserRep
import logger from "@calcom/lib/logger";
import { raqbQueryValueSchema } from "@calcom/lib/raqb/zod";
import { safeStringify } from "@calcom/lib/safeStringify";
-import type { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
import type { Prisma } from "@calcom/prisma/client";
import type { User, Booking, SelectedCalendar } from "@calcom/prisma/client";
import type { AttributeType } from "@calcom/prisma/enums";
diff --git a/packages/features/di/modules/Attribute.ts b/packages/features/di/modules/Attribute.ts
index 7dc7f0f9ff4..a8fcac1a373 100644
--- a/packages/features/di/modules/Attribute.ts
+++ b/packages/features/di/modules/Attribute.ts
@@ -1,6 +1,6 @@
-import { DI_TOKENS } from "@calcom/features/di/tokens";
-import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
+import { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository";
import { moduleLoader as prismaModuleLoader } from "@calcom/features/di/modules/Prisma";
+import { DI_TOKENS } from "@calcom/features/di/tokens";
import { createModule, bindModuleToClassOnToken, type ModuleLoader } from "../di";
diff --git a/packages/features/ee/dsync/lib/assignValueToUser.ts b/packages/features/ee/dsync/lib/assignValueToUser.ts
index 53b6563f6e8..5120212f4de 100644
--- a/packages/features/ee/dsync/lib/assignValueToUser.ts
+++ b/packages/features/ee/dsync/lib/assignValueToUser.ts
@@ -1,15 +1,17 @@
-import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
-import logger from "@calcom/lib/logger";
-import { safeStringify } from "@calcom/lib/safeStringify";
-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";
+} from "@calcom/app-store/routing-forms/types/types";
+import { findAssignmentsForMember } from "@calcom/features/attributes/lib/utils";
+import { PrismaAttributeOptionRepository } from "@calcom/features/attributes/repositories/PrismaAttributeOptionRepository";
+import { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository";
+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 {
doesSupportMultipleValues,
isAssignmentForLockedAttribute,
@@ -17,8 +19,7 @@ import {
isAssignmentSame,
buildSlugFromValue,
canSetValueBeyondOptions,
-} from "@calcom/lib/service/attribute/utils";
-import prisma from "@calcom/prisma";
+} from "./assignValueToUserUtils";
const log = logger.getSubLogger({ prefix: ["entity/attribute"] });
diff --git a/packages/lib/service/attribute/utils.ts b/packages/features/ee/dsync/lib/assignValueToUserUtils.ts
similarity index 94%
rename from packages/lib/service/attribute/utils.ts
rename to packages/features/ee/dsync/lib/assignValueToUserUtils.ts
index 789bc4b0e78..1e4b73aaff5 100644
--- a/packages/lib/service/attribute/utils.ts
+++ b/packages/features/ee/dsync/lib/assignValueToUserUtils.ts
@@ -1,11 +1,13 @@
/**
* Utility functions for attribute service. Shared across server and client.
*/
+import type {
+ AttributeOptionAssignment,
+ BulkAttributeAssigner,
+} from "@calcom/app-store/routing-forms/types/types";
import slugify from "@calcom/lib/slugify";
import { AttributeType } from "@calcom/prisma/enums";
-import type { AttributeOptionAssignment, BulkAttributeAssigner } from "./types";
-
/**
* What is a pool?
* There can be two pools:
diff --git a/packages/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder.ts b/packages/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder.ts
index fe1752e2d17..04be0603ec9 100644
--- a/packages/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder.ts
+++ b/packages/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder.ts
@@ -1,8 +1,8 @@
import { acrossQueryValueCompatiblity } from "@calcom/app-store/_utils/raqb/raqbUtils.server";
import type { FormResponse, Fields } from "@calcom/app-store/routing-forms/types/types";
import { zodRoutes } from "@calcom/app-store/routing-forms/zod";
+import { getUsersAttributes } from "@calcom/features/attributes/lib/getAttributes";
import { withReporting } from "@calcom/lib/sentryWrapper";
-import { getUsersAttributes } from "@calcom/lib/service/attribute/server/getAttributes";
import prisma from "@calcom/prisma";
import { AssignmentReasonEnum } from "@calcom/prisma/enums";
diff --git a/packages/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic.test.ts b/packages/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic.test.ts
similarity index 99%
rename from packages/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic.test.ts
rename to packages/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic.test.ts
index 8d04bd7faa4..2185821a9b8 100644
--- a/packages/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic.test.ts
+++ b/packages/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic.test.ts
@@ -1,18 +1,19 @@
import type { BaseWidget } from "react-awesome-query-builder";
import { describe, it, expect, vi, beforeEach } from "vitest";
-import {
- findTeamMembersMatchingAttributeLogic,
- TroubleshooterCase,
-} from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
import { RouteActionType } from "@calcom/app-store/routing-forms/zod";
+import * as getAttributesModule from "@calcom/features/attributes/lib/getAttributes";
import { RaqbLogicResult } from "@calcom/lib/raqb/evaluateRaqbLogic";
-import * as getAttributesModule from "@calcom/lib/service/attribute/server/getAttributes";
import type { AttributeType } from "@calcom/prisma/enums";
import { RoutingFormFieldType } from "@calcom/routing-forms/lib/FieldTypes";
import type { AttributesQueryValue, FormFieldsQueryValue } from "@calcom/routing-forms/types/types";
-vi.mock("@calcom/lib/service/attribute/server/getAttributes", () => {
+import {
+ findTeamMembersMatchingAttributeLogic,
+ TroubleshooterCase,
+} from "./findTeamMembersMatchingAttributeLogic";
+
+vi.mock("@calcom/features/attributes/lib/getAttributes", () => {
return {
getAttributesAssignmentData: vi.fn(),
};
diff --git a/packages/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic.ts b/packages/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic.ts
similarity index 98%
rename from packages/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic.ts
rename to packages/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic.ts
index c306b305803..d62fecf35aa 100644
--- a/packages/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic.ts
+++ b/packages/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic.ts
@@ -3,13 +3,12 @@ import type { ImmutableTree, JsonLogicResult, JsonTree } from "react-awesome-que
import type { Config } from "react-awesome-query-builder/lib";
import { Utils as QbUtils } from "react-awesome-query-builder/lib";
+import { acrossQueryValueCompatiblity, raqbQueryValueUtils } from "@calcom/app-store/_utils/raqb/raqbUtils";
+import type { Attribute } from "@calcom/app-store/routing-forms/types/types";
+import { getAttributesAssignmentData } from "@calcom/features/attributes/lib/getAttributes";
import { RaqbLogicResult } from "@calcom/lib/raqb/evaluateRaqbLogic";
import jsonLogic from "@calcom/lib/raqb/jsonLogic";
import type { dynamicFieldValueOperands, AttributesQueryValue } from "@calcom/lib/raqb/types";
-import { getAttributesAssignmentData } from "@calcom/lib/service/attribute/server/getAttributes";
-import type { Attribute } from "@calcom/lib/service/attribute/server/getAttributes";
-
-import { acrossQueryValueCompatiblity, raqbQueryValueUtils } from "./raqbUtils";
const {
getAttributesData: getAttributes,
diff --git a/packages/features/routing-forms/lib/getRoutedUrl.test.ts b/packages/features/routing-forms/lib/getRoutedUrl.test.ts
index c5404910f85..5cbf829534d 100644
--- a/packages/features/routing-forms/lib/getRoutedUrl.test.ts
+++ b/packages/features/routing-forms/lib/getRoutedUrl.test.ts
@@ -7,7 +7,6 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import { getAbsoluteEventTypeRedirectUrlWithEmbedSupport } from "@calcom/app-store/routing-forms/getEventTypeRedirectUrl";
import { getResponseToStore } from "@calcom/app-store/routing-forms/lib/getResponseToStore";
import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";
-import { handleResponse } from "@calcom/app-store/routing-forms/lib/handleResponse";
import { findMatchingRoute } from "@calcom/app-store/routing-forms/lib/processRoute";
import { substituteVariables } from "@calcom/app-store/routing-forms/lib/substituteVariables";
import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
@@ -18,11 +17,12 @@ import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowE
import { getRoutedUrl } from "./getRoutedUrl";
import { getUrlSearchParamsToForward } from "./getUrlSearchParamsToForward";
+import { handleResponse } from "./handleResponse";
// Mock dependencies
vi.mock("./getUrlSearchParamsToForward");
+vi.mock("./handleResponse");
vi.mock("@calcom/lib/checkRateLimitAndThrowError");
-vi.mock("@calcom/app-store/routing-forms/lib/handleResponse");
vi.mock("@calcom/features/routing-forms/repositories/PrismaRoutingFormRepository");
vi.mock("@calcom/features/users/repositories/UserRepository", () => {
return {
diff --git a/packages/features/routing-forms/lib/getRoutedUrl.ts b/packages/features/routing-forms/lib/getRoutedUrl.ts
index 3498ded7901..148c562f430 100644
--- a/packages/features/routing-forms/lib/getRoutedUrl.ts
+++ b/packages/features/routing-forms/lib/getRoutedUrl.ts
@@ -10,7 +10,6 @@ import { getAbsoluteEventTypeRedirectUrlWithEmbedSupport } from "@calcom/app-sto
import { getResponseToStore } from "@calcom/app-store/routing-forms/lib/getResponseToStore";
import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";
import { getServerTimingHeader } from "@calcom/app-store/routing-forms/lib/getServerTimingHeader";
-import { handleResponse } from "@calcom/app-store/routing-forms/lib/handleResponse";
import { findMatchingRoute } from "@calcom/app-store/routing-forms/lib/processRoute";
import { substituteVariables } from "@calcom/app-store/routing-forms/lib/substituteVariables";
import type { FormResponse } from "@calcom/app-store/routing-forms/types/types";
@@ -28,6 +27,7 @@ import prisma from "@calcom/prisma";
import { TRPCError } from "@trpc/server";
import { getUrlSearchParamsToForward } from "./getUrlSearchParamsToForward";
+import { handleResponse } from "./handleResponse";
const log = logger.getSubLogger({ prefix: ["[routing-forms]", "[router]"] });
const querySchema = z
diff --git a/packages/app-store/routing-forms/lib/handleResponse.test.ts b/packages/features/routing-forms/lib/handleResponse.test.ts
similarity index 92%
rename from packages/app-store/routing-forms/lib/handleResponse.test.ts
rename to packages/features/routing-forms/lib/handleResponse.test.ts
index 213b7fedd25..0c0023b3a89 100644
--- a/packages/app-store/routing-forms/lib/handleResponse.test.ts
+++ b/packages/features/routing-forms/lib/handleResponse.test.ts
@@ -3,16 +3,16 @@ import { prisma } from "@calcom/prisma/__mocks__/prisma";
import { beforeEach, describe, expect, it, vi } from "vitest";
-import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
+import routerGetCrmContactOwnerEmail from "@calcom/app-store/routing-forms/lib/crmRouting/routerGetCrmContactOwnerEmail";
+import type { TargetRoutingFormForResponse } from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
+import { onSubmissionOfFormResponse } from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
+import isRouter from "@calcom/app-store/routing-forms/lib/isRouter";
import { RoutingFormResponseRepository } from "@calcom/lib/server/repository/formResponse";
-import isRouter from "../lib/isRouter";
-import routerGetCrmContactOwnerEmail from "./crmRouting/routerGetCrmContactOwnerEmail";
-import type { TargetRoutingFormForResponse } from "./formSubmissionUtils";
-import { onSubmissionOfFormResponse } from "./formSubmissionUtils";
+import { findTeamMembersMatchingAttributeLogic } from "./findTeamMembersMatchingAttributeLogic";
import { handleResponse } from "./handleResponse";
-vi.mock("@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic", () => ({
+vi.mock("./findTeamMembersMatchingAttributeLogic", () => ({
findTeamMembersMatchingAttributeLogic: vi.fn(),
}));
@@ -23,15 +23,15 @@ const mockRoutingFormResponseRepository = {
recordFormResponse: vi.fn(),
};
-vi.mock("./crmRouting/routerGetCrmContactOwnerEmail", () => ({
+vi.mock("@calcom/app-store/routing-forms/lib/crmRouting/routerGetCrmContactOwnerEmail", () => ({
default: vi.fn(),
}));
-vi.mock("./formSubmissionUtils", () => ({
+vi.mock("@calcom/app-store/routing-forms/lib/formSubmissionUtils", () => ({
onSubmissionOfFormResponse: vi.fn(),
}));
-vi.mock("../lib/isRouter", () => ({
+vi.mock("@calcom/app-store/routing-forms/lib/isRouter", () => ({
default: vi.fn(),
}));
diff --git a/packages/app-store/routing-forms/lib/handleResponse.ts b/packages/features/routing-forms/lib/handleResponse.ts
similarity index 94%
rename from packages/app-store/routing-forms/lib/handleResponse.ts
rename to packages/features/routing-forms/lib/handleResponse.ts
index b8731e3fb36..c2e54e84281 100644
--- a/packages/app-store/routing-forms/lib/handleResponse.ts
+++ b/packages/features/routing-forms/lib/handleResponse.ts
@@ -1,6 +1,11 @@
import { z } from "zod";
-import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
+import routerGetCrmContactOwnerEmail from "@calcom/app-store/routing-forms/lib/crmRouting/routerGetCrmContactOwnerEmail";
+import {
+ onSubmissionOfFormResponse,
+ type TargetRoutingFormForResponse,
+} from "@calcom/app-store/routing-forms/lib/formSubmissionUtils";
+import isRouter from "@calcom/app-store/routing-forms/lib/isRouter";
import { emailSchema } from "@calcom/lib/emailSchema";
import { HttpError } from "@calcom/lib/http-error";
import logger from "@calcom/lib/logger";
@@ -10,9 +15,7 @@ import { RoutingFormResponseRepository } from "@calcom/lib/server/repository/for
import { prisma } from "@calcom/prisma";
import { Prisma } from "@calcom/prisma/client";
-import isRouter from "../lib/isRouter";
-import routerGetCrmContactOwnerEmail from "./crmRouting/routerGetCrmContactOwnerEmail";
-import { onSubmissionOfFormResponse, type TargetRoutingFormForResponse } from "./formSubmissionUtils";
+import { findTeamMembersMatchingAttributeLogic } from "./findTeamMembersMatchingAttributeLogic";
const moduleLogger = logger.getSubLogger({ prefix: ["routing-forms/lib/handleResponse"] });
diff --git a/packages/features/users/lib/getRoutedUsers.ts b/packages/features/users/lib/getRoutedUsers.ts
index 8e84b282792..7f0efe135b5 100644
--- a/packages/features/users/lib/getRoutedUsers.ts
+++ b/packages/features/users/lib/getRoutedUsers.ts
@@ -1,5 +1,5 @@
-import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
import { enrichHostsWithDelegationCredentials } from "@calcom/app-store/delegationCredential";
+import { findTeamMembersMatchingAttributeLogic } from "@calcom/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic";
import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
import logger from "@calcom/lib/logger";
import type { AttributesQueryValue } from "@calcom/lib/raqb/types";
diff --git a/packages/lib/service/attribute/types.d.ts b/packages/lib/service/attribute/types.d.ts
deleted file mode 100644
index c7be86cf31f..00000000000
--- a/packages/lib/service/attribute/types.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { Attribute, AttributeToUser, AttributeOption } from "@calcom/prisma/client";
-
-export type AttributeName = string;
-export type AttributeId = string;
-export type BulkAttributeAssigner =
- | {
- dsyncId: string;
- }
- | {
- userId: number;
- };
-
-export type AttributeOptionAssignment = AttributeToUser & {
- attributeOption: Omit<AttributeOption, "value" | "isGroup" | "contains" | "id" | "attributeId"> & {
- label: string;
- attribute: Attribute;
- };
-};
diff --git a/packages/platform/libraries/index.ts b/packages/platform/libraries/index.ts
index fd2022a8932..d2e505a2e90 100644
--- a/packages/platform/libraries/index.ts
+++ b/packages/platform/libraries/index.ts
@@ -119,7 +119,7 @@ export { encryptServiceAccountKey } from "@calcom/lib/server/serviceAccountKey";
export { createHandler as createApiKeyHandler } from "@calcom/trpc/server/routers/viewer/apiKeys/create.handler";
export { getCalendarLinks } from "@calcom/features/bookings/lib/getCalendarLinks";
-export { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
+export { findTeamMembersMatchingAttributeLogic } from "@calcom/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic";
export type { TFindTeamMembersMatchingAttributeLogicInputSchema } from "@calcom/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.schema";
export { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
diff --git a/packages/platform/libraries/repositories.ts b/packages/platform/libraries/repositories.ts
index 008760896d7..6e92bed445f 100644
--- a/packages/platform/libraries/repositories.ts
+++ b/packages/platform/libraries/repositories.ts
@@ -1,4 +1,4 @@
-export { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
+export { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository";
export { PrismaOOORepository } from "@calcom/features/ooo/repositories/PrismaOOORepository";
export { PrismaHolidayRepository } from "@calcom/features/holidays/repositories/PrismaHolidayRepository";
export { ScheduleRepository as PrismaScheduleRepository } from "@calcom/features/schedules/repositories/ScheduleRepository";
diff --git a/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.handler.ts b/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.handler.ts
index 2bf921432fd..5e863aabd1b 100644
--- a/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.handler.ts
+++ b/packages/trpc/server/routers/apps/routing-forms/getAttributesForTeam.handler.ts
@@ -1,5 +1,5 @@
+import { getAttributesForTeam } from "@calcom/features/attributes/lib/getAttributes";
import { MembershipRepository } from "@calcom/features/membership/repositories/MembershipRepository";
-import { getAttributesForTeam } from "@calcom/lib/service/attribute/server/getAttributes";
import type { TrpcSessionUser } from "@calcom/trpc/server/types";
import { TRPCError } from "@trpc/server";
diff --git a/packages/trpc/server/routers/viewer/attributes/assignUserToAttribute.handler.ts b/packages/trpc/server/routers/viewer/attributes/assignUserToAttribute.handler.ts
index 69f05f8c669..8a15a2fb6da 100644
--- a/packages/trpc/server/routers/viewer/attributes/assignUserToAttribute.handler.ts
+++ b/packages/trpc/server/routers/viewer/attributes/assignUserToAttribute.handler.ts
@@ -1,4 +1,4 @@
-import { getWhereClauseForAttributeOptionsManagedByCalcom } from "@calcom/lib/service/attribute/server/utils";
+import { getWhereClauseForAttributeOptionsManagedByCalcom } from "@calcom/features/attributes/lib/utils";
import slugify from "@calcom/lib/slugify";
import prisma from "@calcom/prisma";
diff --git a/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.handler.ts b/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.handler.ts
index 026dd06f4a5..c9252496d7e 100644
--- a/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.handler.ts
+++ b/packages/trpc/server/routers/viewer/attributes/findTeamMembersMatchingAttributeLogic.handler.ts
@@ -1,7 +1,7 @@
import type { ServerResponse } from "http";
import type { NextApiResponse } from "next";
-import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
+import { findTeamMembersMatchingAttributeLogic } from "@calcom/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic";
import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
import type { PrismaClient } from "@calcom/prisma";
import type { TrpcSessionUser } from "@calcom/trpc/server/types";
diff --git a/packages/trpc/server/routers/viewer/attributes/list.handler.ts b/packages/trpc/server/routers/viewer/attributes/list.handler.ts
index 377827af243..df4c2d5dea4 100644
--- a/packages/trpc/server/routers/viewer/attributes/list.handler.ts
+++ b/packages/trpc/server/routers/viewer/attributes/list.handler.ts
@@ -1,4 +1,4 @@
-import { PrismaAttributeRepository } from "@calcom/lib/server/repository/PrismaAttributeRepository";
+import { PrismaAttributeRepository } from "@calcom/features/attributes/repositories/PrismaAttributeRepository";
import prisma from "@calcom/prisma";
import { TRPCError } from "@trpc/server";
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 357b89fa38b..e157ee1f356 100644
--- a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts
+++ b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts
@@ -6,12 +6,12 @@
import type { ServerResponse } from "http";
import type { NextApiResponse } from "next";
-import { findTeamMembersMatchingAttributeLogic } from "@calcom/app-store/_utils/raqb/findTeamMembersMatchingAttributeLogic";
import { enrichHostsWithDelegationCredentials } from "@calcom/app-store/delegationCredential";
import { enrichFormWithMigrationData } from "@calcom/app-store/routing-forms/enrichFormWithMigrationData";
import { getLuckyUserService } from "@calcom/features/di/containers/LuckyUser";
import { EventTypeRepository } from "@calcom/features/eventtypes/repositories/eventTypeRepository";
import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
+import { findTeamMembersMatchingAttributeLogic } from "@calcom/features/routing-forms/lib/findTeamMembersMatchingAttributeLogic";
import { getUrlSearchParamsToForwardForTestPreview } from "@calcom/features/routing-forms/lib/getUrlSearchParamsToForward";
import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
import { fromEntriesWithDuplicateKeys } from "@calcom/lib/fromEntriesWithDuplicateKeys";
diff --git a/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts
index a44fb895672..b89c9dfa4c3 100644
--- a/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts
+++ b/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts
@@ -1,5 +1,5 @@
import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm";
-import { handleResponse } from "@calcom/app-store/routing-forms/lib/handleResponse";
+import { handleResponse } from "@calcom/features/routing-forms/lib/handleResponse";
import type { PrismaClient } from "@calcom/prisma";
import { TRPCError } from "@trpc/server";