Skip to content

Commit 0d737fd

Browse files
author
CarinaWolli
committed
Merge branch 'main' into feat/form-submitted-no-event-trigger
2 parents cb8fb6e + ff38d6c commit 0d737fd

350 files changed

Lines changed: 1449 additions & 861 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.

‎apps/api/v1/lib/helpers/rateLimitApiKey.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { NextApiResponse, NextApiRequest } from "next";
44
import { createMocks } from "node-mocks-http";
55
import { describe, it, expect, vi } from "vitest";
66

7-
import { handleAutoLock } from "@calcom/lib/autoLock";
7+
import { handleAutoLock } from "@calcom/features/ee/api-keys/lib/autoLock";
88
import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
99
import { HttpError } from "@calcom/lib/http-error";
1010

@@ -19,7 +19,7 @@ vi.mock("@calcom/lib/checkRateLimitAndThrowError", () => ({
1919
checkRateLimitAndThrowError: vi.fn(),
2020
}));
2121

22-
vi.mock("@calcom/lib/autoLock", () => ({
22+
vi.mock("@calcom/features/ee/api-keys/lib/autoLock", () => ({
2323
handleAutoLock: vi.fn(),
2424
}));
2525

‎apps/api/v1/lib/helpers/rateLimitApiKey.ts‎

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

3-
import { handleAutoLock } from "@calcom/lib/autoLock";
3+
import { handleAutoLock } from "@calcom/features/ee/api-keys/lib/autoLock";
44
import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
55
import { HttpError } from "@calcom/lib/http-error";
66

‎apps/api/v1/lib/validations/user.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { z } from "zod";
22

3+
import { checkUsername } from "@calcom/features/profile/lib/checkUsername";
34
import { emailSchema } from "@calcom/lib/emailSchema";
4-
import { checkUsername } from "@calcom/lib/server/checkUsername";
55
import { iso8601 } from "@calcom/prisma/zod-utils";
66
import { UserSchema } from "@calcom/prisma/zod/modelSchema/UserSchema";
77

‎apps/api/v1/pages/api/connected-calendars/_get.ts‎

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

33
import type { UserWithCalendars } from "@calcom/features/calendars/lib/getConnectedDestinationCalendars";
44
import { getConnectedDestinationCalendarsAndEnsureDefaultsInDb } from "@calcom/features/calendars/lib/getConnectedDestinationCalendars";
5+
import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
56
import { HttpError } from "@calcom/lib/http-error";
67
import { defaultResponder } from "@calcom/lib/server/defaultResponder";
7-
import { UserRepository } from "@calcom/lib/server/repository/user";
88
import prisma from "@calcom/prisma";
99

1010
import { extractUserIdsFromQuery } from "~/lib/utils/extractUserIdsFromQuery";

‎apps/api/v1/pages/api/users/[userId]/_delete.ts‎

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

3-
import { deleteUser } from "@calcom/features/users/lib/userDeletionService";
3+
import { deleteUser } from "@calcom/features/users/lib/deleteUser";
44
import { HttpError } from "@calcom/lib/http-error";
55
import { defaultResponder } from "@calcom/lib/server/defaultResponder";
66
import prisma from "@calcom/prisma";

‎apps/api/v1/pages/api/users/_post.ts‎

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

3+
import { UserCreationService } from "@calcom/features/users/services/userCreationService";
34
import { HttpError } from "@calcom/lib/http-error";
45
import { defaultResponder } from "@calcom/lib/server/defaultResponder";
5-
import { UserCreationService } from "@calcom/lib/server/service/userCreationService";
66
import { CreationSource } from "@calcom/prisma/enums";
77

88
import { schemaUserCreateBodyParams } from "~/lib/validations/user";

‎apps/api/v1/test/lib/bookings/_post.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ vi.mock("@calcom/features/webhooks/lib/sendOrSchedulePayload", () => ({
6666
}));
6767

6868
const mockFindOriginalRescheduledBooking = vi.fn();
69-
vi.mock("@calcom/lib/server/repository/booking", () => ({
69+
vi.mock("@calcom/features/bookings/repositories/BookingRepository", () => ({
7070
BookingRepository: vi.fn().mockImplementation(() => ({
7171
findOriginalRescheduledBooking: mockFindOriginalRescheduledBooking,
7272
})),
@@ -133,7 +133,7 @@ vi.mock("@calcom/features/bookings/lib/handleNewBooking/ensureAvailableUsers", (
133133
}),
134134
}));
135135

136-
vi.mock("@calcom/lib/server/repository/profile", () => ({
136+
vi.mock("@calcom/features/profile/repositories/ProfileRepository", () => ({
137137
ProfileRepository: {
138138
findManyForUser: vi.fn().mockResolvedValue([]),
139139
buildPersonalProfileFromUser: vi.fn().mockReturnValue({

‎apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/pageWithCachedData.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { getBookingForReschedule, type GetBookingType } from "@calcom/features/b
1010
import { getOrgFullOrigin, orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
1111
import { getOrganizationSEOSettings } from "@calcom/features/ee/organizations/lib/orgSettings";
1212
import type { TeamData } from "@calcom/features/ee/teams/lib/getTeamData";
13-
import { shouldHideBrandingForTeamEvent } from "@calcom/lib/hideBranding";
13+
import { shouldHideBrandingForTeamEvent } from "@calcom/features/profile/lib/hideBranding";
1414
import { loadTranslations } from "@calcom/lib/server/i18n";
1515
import slugify from "@calcom/lib/slugify";
1616
import { BookingStatus, RedirectType } from "@calcom/prisma/enums";

‎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
@@ -14,7 +14,7 @@ import { FeaturesRepository } from "@calcom/features/flags/features.repository";
1414
import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";
1515
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
1616
import { TeamRepository } from "@calcom/lib/server/repository/team";
17-
import { UserRepository } from "@calcom/lib/server/repository/user";
17+
import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
1818
import { prisma } from "@calcom/prisma";
1919
import type { Prisma } from "@calcom/prisma/client";
2020
import type { SchedulingType } from "@calcom/prisma/enums";

‎apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import { cookies, headers } from "next/headers";
66
import { redirect } from "next/navigation";
77

88
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
9+
import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
910
import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
1011
import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable";
11-
import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
1212
import { MembershipRole } from "@calcom/prisma/enums";
1313
import { availabilityRouter } from "@calcom/trpc/server/routers/viewer/availability/_router";
1414

0 commit comments

Comments
 (0)