Skip to content

Commit e91bf53

Browse files
authored
refactor: Remove circular deps between @calcom/lib and @calcom/features [2] (calcom#24438)
* move SystemField to features * migrate workflow service * merge two tests for team repository * update imports and migrate team repository * migrate delegation credential repository * migrate credential repository * migrate entityPermissionUtils * migrate hashedLink service and repository * migrate membership service * update imports * remove file * migrate buildEventUrlFromBooking * migrate getAllUserBookings to features * update imports * update organizationMock * migrate slots * migrate date-ranges to schedules dir * migrate getAggregatedAvailability * fix * refactor * migrate useCreateEventType hook to features * migrate assignValueToUser * migrate validateUsername to auth features * migrate system field back to lib * migrate getLabelValueMapFromResponses back to lib * update imports * use relative path * fix type checks * fix * fix * fix tests * update gh codeowners * fix * fix
1 parent 79b319c commit e91bf53

145 files changed

Lines changed: 412 additions & 405 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
/packages/embeds/**/* @calcom/Foundation
2525
/packages/features/auth/lib/next-auth-options.ts @calcom/Foundation
2626
/packages/features/bookings/lib/**/* @calcom/Foundation
27-
/packages/lib/getAggregatedAvailability.ts @calcom/Foundation
28-
/packages/lib/getUserAvailability.ts @calcom/Foundation
29-
/packages/lib/server/getLuckyUser.ts @calcom/Foundation
30-
/packages/lib/slots.ts @calcom/Foundation
27+
/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts @calcom/Foundation
28+
/packages/features/availability/lib/getUserAvailability.ts @calcom/Foundation
29+
/packages/features/bookings/lib/getLuckyUser.ts @calcom/Foundation
30+
/packages/features/schedules/lib/slots.ts @calcom/Foundation
3131
/packages/platform/atoms/**/*WebWrapper.tsx @calcom/Consumer
3232
/packages/platform/**/* @calcom/Platform @calcom/Foundation
3333
/packages/prisma/**/* @calcom/Foundation

apps/api/v1/pages/api/teams/[teamId]/_patch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { NextApiRequest } from "next";
22

33
import { purchaseTeamOrOrgSubscription } from "@calcom/features/ee/teams/lib/payments";
4+
import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
45
import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
56
import { HttpError } from "@calcom/lib/http-error";
67
import { defaultResponder } from "@calcom/lib/server/defaultResponder";
7-
import { TeamRepository } from "@calcom/lib/server/repository/team";
88
import prisma from "@calcom/prisma";
99
import type { Prisma } from "@calcom/prisma/client";
1010

apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/queries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { getTeamEventType } from "@calcom/features/eventtypes/lib/getTeamEventTy
1313
import { FeaturesRepository } from "@calcom/features/flags/features.repository";
1414
import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";
1515
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
16-
import { TeamRepository } from "@calcom/lib/server/repository/team";
16+
import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
1717
import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
1818
import { prisma } from "@calcom/prisma";
1919
import type { Prisma } from "@calcom/prisma/client";

apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { unstable_cache } from "next/cache";
44

55
import { TeamsListing } from "@calcom/features/ee/teams/components/TeamsListing";
66
import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
7-
import { TeamRepository } from "@calcom/lib/server/repository/team";
7+
import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
88
import { TeamService } from "@calcom/features/ee/teams/services/teamService";
99
import prisma from "@calcom/prisma";
1010
import { MembershipRole } from "@calcom/prisma/enums";

apps/web/app/api/cron/credentials/route.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import type { NextRequest } from "next/server";
77
import { NextResponse } from "next/server";
88

9+
import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
10+
import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
911
import { HttpError } from "@calcom/lib/http-error";
1012
import logger from "@calcom/lib/logger";
1113
import { safeStringify } from "@calcom/lib/safeStringify";
12-
import { CredentialRepository } from "@calcom/lib/server/repository/credential";
13-
import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
1414

1515
import { defaultResponderForAppDir } from "../../defaultResponderForAppDir";
1616

apps/web/app/api/cron/selected-calendars/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { findUniqueDelegationCalendarCredential } from "@calcom/app-store/delega
1212
import { HttpError } from "@calcom/lib/http-error";
1313
import logger from "@calcom/lib/logger";
1414
import { safeStringify } from "@calcom/lib/safeStringify";
15-
import { CredentialRepository } from "@calcom/lib/server/repository/credential";
15+
import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
1616
import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
1717
import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";
1818
import type { Ensure } from "@calcom/types/utils";

apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
88
import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
99
import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";
1010
import { FeaturesRepository } from "@calcom/features/flags/features.repository";
11+
import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";
1112
import {
1213
shouldHideBrandingForTeamEvent,
1314
shouldHideBrandingForUserEvent,
1415
} from "@calcom/features/profile/lib/hideBranding";
1516
import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
16-
import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";
1717
import slugify from "@calcom/lib/slugify";
1818
import prisma from "@calcom/prisma";
1919
import { RedirectType } from "@calcom/prisma/enums";

apps/web/lib/pages/auth/verify-email.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { organizationScenarios } from "@calcom/lib/server/repository/__mocks__/organization";
1+
import { organizationScenarios } from "@calcom/features/ee/organizations/__mocks__/organizationMock";
22

33
import { describe, it, expect, beforeEach, vi } from "vitest";
44

apps/web/lib/reschedule/[uid]/getServerSideProps.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { URLSearchParams } from "url";
44
import { z } from "zod";
55

66
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
7+
import { buildEventUrlFromBooking } from "@calcom/features/bookings/lib/buildEventUrlFromBooking";
78
import { determineReschedulePreventionRedirect } from "@calcom/features/bookings/lib/reschedule/determineReschedulePreventionRedirect";
89
import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";
9-
import { buildEventUrlFromBooking } from "@calcom/lib/bookings/buildEventUrlFromBooking";
10-
import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
1110
import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
11+
import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
1212
import prisma, { bookingMinimalSelect } from "@calcom/prisma";
1313

1414
const querySchema = z.object({

apps/web/modules/bookings/views/bookings-single-view.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ import {
2424
import { Price } from "@calcom/features/bookings/components/event-meta/Price";
2525
import { getCalendarLinks, CalendarLinkType } from "@calcom/features/bookings/lib/getCalendarLinks";
2626
import { RATING_OPTIONS, validateRating } from "@calcom/features/bookings/lib/rating";
27+
import {
28+
SMS_REMINDER_NUMBER_FIELD,
29+
SystemField,
30+
TITLE_FIELD,
31+
} from "@calcom/lib/bookings/SystemField";
2732
import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
2833
import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
29-
import { SMS_REMINDER_NUMBER_FIELD, SystemField, TITLE_FIELD } from "@calcom/lib/SystemField";
3034
import { APP_NAME } from "@calcom/lib/constants";
3135
import { formatToLocalizedDate, formatToLocalizedTime, formatToLocalizedTimezone } from "@calcom/lib/dayjs";
3236
import useGetBrandingColours from "@calcom/lib/getBrandColours";
@@ -767,7 +771,7 @@ export default function Success(props: PageProps) {
767771
<Fragment key={field.name}>
768772
<div
769773
className="text-emphasis mt-4 font-medium"
770-
// eslint-disable-next-line react/no-danger
774+
771775
dangerouslySetInnerHTML={{
772776
__html: markdownToSafeHTML(label),
773777
}}
@@ -1080,7 +1084,7 @@ export default function Success(props: PageProps) {
10801084
<span className="underline">
10811085
<a
10821086
target="_blank"
1083-
href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations">
1087+
href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations" rel="noreferrer">
10841088
{t("resolve")}
10851089
</a>
10861090
</span>

0 commit comments

Comments
 (0)