chore: release v4.9.6

* some modifications to logging event detail input

* add descriptive name

.env.example

@@ -112,7 +112,7 @@ NEXT_PUBLIC_POSTHOG_HOST=
 PLAIN_API_KEY=
 PLAIN_API_URL=https://api.plain.com/v1
 PLAIN_HMAC_SECRET_KEY=
-PLAIN_CHAT_ID=
+NEXT_PUBLIC_PLAIN_CHAT_ID=
 PLAIN_CHAT_HMAC_SECRET_KEY=
 NEXT_PUBLIC_PLAIN_CHAT_EXCLUDED_PATHS=
 
@@ -356,21 +356,9 @@ E2E_TEST_OIDC_USER_PASSWORD=
 # provide a value between 0 and 100 to ensure the percentage of traffic
 # redirected from the legacy to the future pages
 AB_TEST_BUCKET_PROBABILITY=50
-APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED=0
-APP_ROUTER_APPS_SLUG_ENABLED=0
 APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
-# whether we redirect to the future/apps/categories from /apps/categories or not
-APP_ROUTER_APPS_CATEGORIES_ENABLED=0
-# whether we redirect to the future/apps/categories/[category] from /apps/categories/[category] or not
-APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
 APP_ROUTER_APPS_ENABLED=0
 APP_ROUTER_TEAM_ENABLED=0
-APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED=0
-APP_ROUTER_AUTH_LOGIN_ENABLED=0
-APP_ROUTER_AUTH_LOGOUT_ENABLED=0
-APP_ROUTER_AUTH_SAML_ENABLED=0
-APP_ROUTER_AUTH_PLATFORM_ENABLED=0
-APP_ROUTER_AUTH_OAUTH2_ENABLED=0
 
 # disable setry server source maps
 SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1

.github/workflows/i18n.yml

@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - uses: replexica/replexica@main
+      - uses: lingodotdev/lingo.dev@main
         env:
           GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
         with:

.yarn/versions/ecf390c8.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

__checks__/organization.spec.ts

@@ -14,7 +14,7 @@ test.describe("Org", () => {
     test("Org User(Rick) Page should be embeddable", async ({ page }) => {
       const response = await page.goto("https://i.cal.com/team-rick/embed");
       expect(response?.status()).toBe(200);
-      await expect(page.locator("text=Rick in i.cal.com")).toBeVisible();
+      await expect(page.locator("text=Used by Checkly")).toBeVisible();
       await expectPageToBeRenderedWithEmbedSsr(page);
     });
 
@@ -58,10 +58,10 @@ test.describe("Org", () => {
       expect(response?.status()).toBe(200);
       expect(await page.locator('[data-testid="event-title"]').textContent()).toBe("Group Meeting");
 
-      expect(await page.locator('[data-testid="event-meta"]').textContent()).toContain(users[0].name);
-      expect(await page.locator('[data-testid="event-meta"]').textContent()).toContain(users[1].name);
-      // 2 users and 1 for the organization(2+1)
-      expect((await page.locator('[data-testid="event-meta"] [data-testid="avatar"]').all()).length).toBe(3);
+      expect(await page.locator('[data-testid="event-meta"]').textContent()).toContain(
+        "Join us for a meeting with multiple people"
+      );
+      expect((await page.locator('[data-testid="event-meta"] [data-testid="avatar"]').all()).length).toBe(2);
     });
   });
 
@@ -75,7 +75,9 @@ test.describe("Org", () => {
 
   test.describe("Browse the Engineering Team", async () => {
     test("By User Navigation", async ({ page }) => {
-      await page.goto("https://i.cal.com");
+      const response = await page.goto("https://i.cal.com");
+      await page.waitForLoadState("networkidle");
+      expect(response?.status()).toBe(200);
       await page.click('text="Engineering"');
       await expect(page.locator("text=Cal.com Engineering")).toBeVisible();
     });

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

@@ -13,6 +13,8 @@ import { rateLimitApiKey } from "~/lib/helpers/rateLimitApiKey";
 type CustomNextApiRequest = NextApiRequest & Request;
 type CustomNextApiResponse = NextApiResponse & Response;
 
+const testUserId = 123;
+
 vi.mock("@calcom/lib/checkRateLimitAndThrowError", () => ({
   checkRateLimitAndThrowError: vi.fn(),
 }));
@@ -26,6 +28,7 @@ describe("rateLimitApiKey middleware", () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
       method: "GET",
       query: {},
+      userId: testUserId,
     });
 
     await rateLimitApiKey(req, res, vi.fn() as any);
@@ -38,6 +41,7 @@ describe("rateLimitApiKey middleware", () => {
     const { req, res } = createMocks({
       method: "GET",
       query: { apiKey: "test-key" },
+      userId: testUserId,
     });
 
     (checkRateLimitAndThrowError as any).mockResolvedValueOnce({
@@ -50,7 +54,7 @@ describe("rateLimitApiKey middleware", () => {
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(checkRateLimitAndThrowError).toHaveBeenCalledWith({
-      identifier: "test-key",
+      identifier: testUserId.toString(),
       rateLimitingType: "api",
       onRateLimiterResponse: expect.any(Function),
     });
@@ -60,6 +64,7 @@ describe("rateLimitApiKey middleware", () => {
     const { req, res } = createMocks({
       method: "GET",
       query: { apiKey: "test-key" },
+      userId: testUserId,
     });
 
     const rateLimiterResponse: RatelimitResponse = {
@@ -89,6 +94,7 @@ describe("rateLimitApiKey middleware", () => {
     const { req, res } = createMocks({
       method: "GET",
       query: { apiKey: "test-key" },
+      userId: testUserId,
     });
 
     (checkRateLimitAndThrowError as any).mockRejectedValue(new Error("Rate limit exceeded"));
@@ -104,6 +110,7 @@ describe("rateLimitApiKey middleware", () => {
     const { req, res } = createMocks({
       method: "GET",
       query: { apiKey: "test-key" },
+      userId: testUserId,
     });
 
     const rateLimiterResponse: RatelimitResponse = {
@@ -127,8 +134,8 @@ describe("rateLimitApiKey middleware", () => {
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(handleAutoLock).toHaveBeenCalledWith({
-      identifier: "test-key",
-      identifierType: "apiKey",
+      identifier: testUserId.toString(),
+      identifierType: "userId",
       rateLimitResponse: rateLimiterResponse,
     });
 
@@ -140,6 +147,7 @@ describe("rateLimitApiKey middleware", () => {
     const { req, res } = createMocks({
       method: "GET",
       query: { apiKey: "test-key" },
+      userId: testUserId,
     });
 
     const rateLimiterResponse: RatelimitResponse = {
@@ -163,8 +171,8 @@ describe("rateLimitApiKey middleware", () => {
     await rateLimitApiKey(req, res, vi.fn() as any);
 
     expect(handleAutoLock).toHaveBeenCalledWith({
-      identifier: "test-key",
-      identifierType: "apiKey",
+      identifier: testUserId.toString(),
+      identifierType: "userId",
       rateLimitResponse: rateLimiterResponse,
     });
 
@@ -176,6 +184,7 @@ describe("rateLimitApiKey middleware", () => {
     const { req, res } = createMocks({
       method: "GET",
       query: { apiKey: "test-key" },
+      userId: testUserId,
     });
 
     const rateLimiterResponse: RatelimitResponse = {
@@ -200,8 +209,8 @@ describe("rateLimitApiKey middleware", () => {
     await rateLimitApiKey(req, res, next);
 
     expect(handleAutoLock).toHaveBeenCalledWith({
-      identifier: "test-key",
-      identifierType: "apiKey",
+      identifier: testUserId.toString(),
+      identifierType: "userId",
       rateLimitResponse: rateLimiterResponse,
     });
 
@@ -214,6 +223,7 @@ describe("rateLimitApiKey middleware", () => {
     const { req, res } = createMocks({
       method: "GET",
       query: { apiKey: "test-key" },
+      userId: testUserId,
     });
 
     // Mock checkRateLimitAndThrowError to throw HttpError

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

@@ -5,12 +5,14 @@ import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowE
 import { HttpError } from "@calcom/lib/http-error";
 
 export const rateLimitApiKey: NextMiddleware = async (req, res, next) => {
+  if (!req.userId) return res.status(401).json({ message: "No userId provided" });
   if (!req.query.apiKey) return res.status(401).json({ message: "No apiKey provided" });
 
   // TODO: Add a way to add trusted api keys
   try {
+    const identifier = req.userId.toString();
     await checkRateLimitAndThrowError({
-      identifier: req.query.apiKey as string,
+      identifier,
       rateLimitingType: "api",
       onRateLimiterResponse: async (response) => {
         res.setHeader("X-RateLimit-Limit", response.limit);
@@ -19,8 +21,8 @@ export const rateLimitApiKey: NextMiddleware = async (req, res, next) => {
 
         try {
           const didLock = await handleAutoLock({
-            identifier: req.query.apiKey as string, // Casting as this is verified in another middleware
-            identifierType: "apiKey",
+            identifier,
+            identifierType: "userId",
             rateLimitResponse: response,
           });
 

apps/api/v1/lib/validations/booking.ts

@@ -38,6 +38,23 @@ export const schemaBookingGetParams = z.object({
 
 export type Status = z.infer<typeof schemaBookingGetParams>["status"];
 
+export const bookingCancelSchema = z.object({
+  id: z.number(),
+  allRemainingBookings: z.boolean().optional(),
+  cancelSubsequentBookings: z.boolean().optional(),
+  cancellationReason: z.string().optional().default("Not Provided"),
+  seatReferenceUid: z.string().optional(),
+  cancelledBy: z.string().email({ message: "Invalid email" }).optional(),
+  internalNote: z
+    .object({
+      id: z.number(),
+      name: z.string(),
+      cancellationReason: z.string().optional().nullable(),
+    })
+    .optional()
+    .nullable(),
+});
+
 const schemaBookingEditParams = z
   .object({
     title: z.string().optional(),

apps/api/v1/pages/api/bookings/[id]/_delete.ts

@@ -2,8 +2,8 @@ import type { NextApiRequest } from "next";
 
 import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import { defaultResponder } from "@calcom/lib/server";
-import { bookingCancelSchema } from "@calcom/prisma/zod-utils";
 
+import { bookingCancelSchema } from "~/lib/validations/booking";
 import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransformParseInt";
 
 /**
@@ -70,6 +70,7 @@ async function handler(req: NextApiRequest) {
       ...req.query,
       allRemainingBookings: req.query.allRemainingBookings === "true",
     });
+
   // Normalizing for universal handler
   req.body = { id, allRemainingBookings, cancellationReason };
   return await handleCancelBooking(req);

apps/api/v1/pages/api/bookings/_post.ts

@@ -5,6 +5,7 @@ import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";
 import { ErrorCode } from "@calcom/lib/errorCodes";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
+import { CreationSource } from "@calcom/prisma/enums";
 
 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
 
@@ -213,6 +214,10 @@ import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
  */
 async function handler(req: NextApiRequest) {
   const { userId, isSystemWideAdmin, isOrganizationOwnerOrAdmin } = req;
+  req.body = {
+    ...req.body,
+    creationSource: CreationSource.API_V1,
+  };
   if (isSystemWideAdmin) req.userId = req.body.userId || userId;
 
   if (isOrganizationOwnerOrAdmin) {

apps/api/v1/pages/api/invites/_post.ts

@@ -3,6 +3,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
 import prisma from "@calcom/prisma";
+import { CreationSource } from "@calcom/prisma/enums";
 import { createContext } from "@calcom/trpc/server/createContext";
 import { viewerTeamsRouter } from "@calcom/trpc/server/routers/viewer/teams/_router";
 import type { TInviteMemberInputSchema } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.schema";
@@ -43,6 +44,7 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
       language: data.language,
       teamId: data.teamId,
       usernameOrEmail: data.usernameOrEmail,
+      creationSource: CreationSource.API_V1,
     });
 
     return { success: true, message: `${data.usernameOrEmail} has been invited.` };

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

@@ -3,6 +3,7 @@ import type { NextApiRequest } from "next";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
 import prisma from "@calcom/prisma";
+import { CreationSource } from "@calcom/prisma/enums";
 
 import { schemaUserCreateBodyParams } from "~/lib/validations/user";
 
@@ -92,7 +93,7 @@ async function postHandler(req: NextApiRequest) {
   // If user is not ADMIN, return unauthorized.
   if (!isSystemWideAdmin) throw new HttpError({ statusCode: 401, message: "You are not authorized" });
   const data = await schemaUserCreateBodyParams.parseAsync(req.body);
-  const user = await prisma.user.create({ data });
+  const user = await prisma.user.create({ data: { ...data, creationSource: CreationSource.API_V1 } });
   req.statusCode = 201;
   return { user };
 }

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

@@ -12,6 +12,7 @@ import { ErrorCode } from "@calcom/lib/errorCodes";
 import { buildBooking, buildEventType, buildWebhook } from "@calcom/lib/test/builder";
 import prisma from "@calcom/prisma";
 import type { Booking } from "@calcom/prisma/client";
+import { CreationSource } from "@calcom/prisma/enums";
 
 import handler from "../../../pages/api/bookings/_post";
 
@@ -220,6 +221,34 @@ describe.skipIf(true)("POST /api/bookings", () => {
         });
         expect(previousBooking?.status).toBe("cancelled");
       });
+
+      test("Creates source as api_v1", async () => {
+        const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+          method: "POST",
+          body: {
+            name: "test",
+            start: dayjs().format(),
+            end: dayjs().add(1, "day").format(),
+            eventTypeId: 2,
+            email: "test@example.com",
+            location: "Cal.com Video",
+            timeZone: "America/Montevideo",
+            language: "en",
+            customInputs: [],
+            metadata: {},
+            userId: 4,
+          },
+          prisma,
+        });
+
+        prismaMock.eventType.findUniqueOrThrow.mockResolvedValue(buildEventType());
+        prismaMock.booking.findMany.mockResolvedValue([]);
+
+        await handler(req, res);
+        createdBooking = JSON.parse(res._getData());
+        expect(createdBooking.creationSource).toEqual(CreationSource.API_V1);
+        expect(prismaMock.booking.create).toHaveBeenCalledTimes(1);
+      });
     });
 
     describe("Recurring event-type", () => {

apps/api/v2/jest-e2e.json

@@ -13,5 +13,5 @@
   "setupFiles": ["<rootDir>/test/setEnvVars.ts", "jest-date-mock"],
   "reporters": ["default", "jest-summarizing-reporter"],
   "workerIdleMemoryLimit": "512MB",
-  "maxWorkers": 2
+  "maxWorkers": 8
 }

apps/api/v2/package.json

@@ -20,6 +20,7 @@
     "test:cov": "yarn dev:build && jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "yarn dev:build && NODE_OPTIONS='--max_old_space_size=8192 --experimental-vm-modules' jest --ci --forceExit --config ./jest-e2e.json",
+    "test:e2e:local": "yarn test:e2e --maxWorkers=4",
     "test:e2e:watch": "yarn dev:build && jest --runInBand --detectOpenHandles --forceExit --config ./jest-e2e.json --watch",
     "prisma": "yarn workspace @calcom/prisma prisma",
     "generate-schemas": "yarn prisma generate && yarn prisma format",
@@ -29,7 +30,7 @@
     "@axiomhq/winston": "^1.2.0",
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.86",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.93",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",

apps/api/v2/src/app.e2e-spec.ts

@@ -14,6 +14,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { RateLimitRepositoryFixture } from "test/fixtures/repository/rate-limit.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 
 import { X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
 import { User, PlatformOAuthClient, Team, RateLimit } from "@calcom/prisma/client";
@@ -24,7 +25,7 @@ describe("AppController", () => {
     let userRepositoryFixture: UserRepositoryFixture;
     let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
     let rateLimitRepositoryFixture: RateLimitRepositoryFixture;
-    const userEmail = "app-rate-limits-e2e@api.com";
+    const userEmail = `app-rate-limits-user-${randomString()}@api.com`;
     let user: User;
 
     let organization: Team;
@@ -94,7 +95,9 @@ describe("AppController", () => {
       );
 
       organizationsRepositoryFixture = new OrganizationRepositoryFixture(moduleRef);
-      organization = await organizationsRepositoryFixture.create({ name: "ecorp" });
+      organization = await organizationsRepositoryFixture.create({
+        name: `app-rate-limits-organization-${randomString()}`,
+      });
       oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
       oAuthClient = await createOAuthClient(organization.id);
       profilesRepositoryFixture = new ProfileRepositoryFixture(moduleRef);

apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts

@@ -8,6 +8,7 @@ import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/
 import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
 import { INestApplication } from "@nestjs/common";
 import { NestExpressApplication } from "@nestjs/platform-express";
@@ -18,6 +19,7 @@ import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repo
 import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
 import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
@@ -35,7 +37,7 @@ describe("Bookings Endpoints 2024-04-15", () => {
     let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
     let apiKeyString: string;
 
-    const userEmail = "bookings-controller-e2e@api.com";
+    const userEmail = `bookings-2024-04-15-user-${randomString()}@api.com`;
     let user: User;
 
     let eventTypeId: number;
@@ -67,13 +69,17 @@ describe("Bookings Endpoints 2024-04-15", () => {
       const { keyString } = await apiKeysRepositoryFixture.createApiKey(user.id, null);
       apiKeyString = keyString;
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `bookings-2024-04-15-schedule-${randomString()}-${describe.name}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
       const event = await eventTypesRepositoryFixture.create(
-        { title: "peer coding", slug: "peer-coding", length: 60 },
+        {
+          title: `bookings-2024-04-15-event-type-${randomString()}-${describe.name}`,
+          slug: `bookings-2024-04-15-event-type-${randomString()}-${describe.name}`,
+          length: 60,
+        },
         user.id
       );
       eventTypeId = event.id;
@@ -343,94 +349,6 @@ describe("Bookings Endpoints 2024-04-15", () => {
         });
     });
 
-    // note(Lauris) : found this test broken here - first thing to fix is that recurring endpoint accepts an array not 1 object.
-    // it("should create a recurring booking", async () => {
-    //   const bookingStart = "2040-05-25T09:30:00.000Z";
-    //   const bookingEnd = "2040-05-25T10:30:00.000Z";
-    //   const bookingEventTypeId = 7;
-    //   const bookingTimeZone = "Europe/London";
-    //   const bookingLanguage = "en";
-    //   const bookingHashedLink = "";
-    //   const bookingRecurringCount = 5;
-    //   const currentBookingRecurringIndex = 0;
-
-    //   const body = {
-    //     start: bookingStart,
-    //     end: bookingEnd,
-    //     eventTypeId: bookingEventTypeId,
-    //     timeZone: bookingTimeZone,
-    //     language: bookingLanguage,
-    //     metadata: {},
-    //     hashedLink: bookingHashedLink,
-    //     recurringCount: bookingRecurringCount,
-    //     currentRecurringIndex: currentBookingRecurringIndex,
-    //   };
-
-    //   return request(app.getHttpServer())
-    //     .post("/v2/bookings/recurring")
-    //     .send(body)
-    //     .expect(201)
-    //     .then((response) => {
-    //       const responseBody: ApiResponse<Awaited<ReturnType<typeof handleNewRecurringBooking>>> =
-    //         response.body;
-
-    //       expect(responseBody.status).toEqual("recurring");
-    //     });
-    // });
-
-    // note(Lauris) : found this test broken here - first thing to fix is that the eventTypeId must be team event type, because
-    // instant bookings only work for teams.
-    // it("should create an instant booking", async () => {
-    //   const bookingStart = "2040-05-25T09:30:00.000Z";
-    //   const bookingEnd = "2040-25T10:30:00.000Z";
-    //   const bookingEventTypeId = 7;
-    //   const bookingTimeZone = "Europe/London";
-    //   const bookingLanguage = "en";
-    //   const bookingHashedLink = "";
-
-    //   const body = {
-    //     start: bookingStart,
-    //     end: bookingEnd,
-    //     eventTypeId: bookingEventTypeId,
-    //     timeZone: bookingTimeZone,
-    //     language: bookingLanguage,
-    //     metadata: {},
-    //     hashedLink: bookingHashedLink,
-    //   };
-
-    //   return request(app.getHttpServer())
-    //     .post("/v2/bookings/instant")
-    //     .send(body)
-    //     .expect(201)
-    //     .then((response) => {
-    //       const responseBody: ApiResponse<Awaited<ReturnType<typeof handleInstantMeeting>>> = response.body;
-
-    //       expect(responseBody.status).toEqual("instant");
-    //     });
-    // });
-
-    // cancelling a booking hangs the test for some reason
-    it.skip("should cancel a booking", async () => {
-      const bookingId = createdBooking.id;
-
-      const body = {
-        allRemainingBookings: false,
-        cancellationReason: "Was fighting some unforseen rescheduling demons",
-      };
-
-      return request(app.getHttpServer())
-        .post(`/v2/bookings/${bookingId}/cancel`)
-        .send(body)
-        .expect(201)
-        .then((response) => {
-          const responseBody: ApiResponse<{ status: typeof SUCCESS_STATUS | typeof ERROR_STATUS }> =
-            response.body;
-
-          expect(bookingId).toBeDefined();
-          expect(responseBody.status).toEqual(SUCCESS_STATUS);
-        });
-    });
-
     afterAll(async () => {
       await userRepositoryFixture.deleteByEmail(user.email);
       await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);

apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts

@@ -33,6 +33,7 @@ import {
 import { ConfigService } from "@nestjs/config";
 import { ApiQuery, ApiExcludeController as DocsExcludeController } from "@nestjs/swagger";
 import { User } from "@prisma/client";
+import { CreationSource } from "@prisma/client";
 import { Request } from "express";
 import { NextApiRequest } from "next/types";
 import { v4 as uuidv4 } from "uuid";
@@ -383,7 +384,11 @@ export class BookingsController_2024_04_15 {
       ...oAuthParams,
     });
     Object.assign(clone, { userId, ...oAuthParams, platformBookingLocation });
-    clone.body = { ...clone.body, noEmail: !oAuthParams.arePlatformEmailsEnabled };
+    clone.body = {
+      ...clone.body,
+      noEmail: !oAuthParams.arePlatformEmailsEnabled,
+      creationSource: CreationSource.API_V2,
+    };
     return clone as unknown as NextApiRequest & { userId?: number } & OAuthRequestParams;
   }
 
@@ -411,6 +416,7 @@ export class BookingsController_2024_04_15 {
       ...oAuthParams,
       platformBookingLocation,
       noEmail: !oAuthParams.arePlatformEmailsEnabled,
+      creationSource: CreationSource.API_V2,
     });
     return clone as unknown as NextApiRequest & { userId?: number } & OAuthRequestParams;
   }

apps/api/v2/src/ee/bookings/2024-04-15/inputs/create-booking.input.ts

@@ -1,4 +1,4 @@
-import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional, ApiHideProperty } from "@nestjs/swagger";
 import { Transform, Type } from "class-transformer";
 import {
   IsBoolean,
@@ -126,4 +126,47 @@ export class CreateBookingInput_2024_04_15 {
   @IsOptional()
   @ApiPropertyOptional()
   locationUrl?: string;
+
+  // note(rajiv): after going through getUrlSearchParamsToForward.ts we found out
+  // that the below properties were not being included inside of handleNewBooking :- cc @morgan
+  // cal.salesforce.rrSkipToAccountLookupField, cal.rerouting & cal.isTestPreviewLink
+  // hence no input values have been setup for them in CreateBookingInput_2024_04_15
+  @IsArray()
+  @Type(() => Number)
+  @IsOptional()
+  @ApiHideProperty()
+  routedTeamMemberIds?: number[];
+
+  @IsNumber()
+  @IsOptional()
+  @ApiHideProperty()
+  routingFormResponseId?: number;
+
+  @IsBoolean()
+  @IsOptional()
+  @ApiHideProperty()
+  skipContactOwner?: boolean;
+
+  @IsBoolean()
+  @IsOptional()
+  @ApiHideProperty()
+  _shouldServeCache?: boolean;
+
+  @IsBoolean()
+  @IsOptional()
+  @ApiHideProperty()
+  _isDryRun?: boolean;
+
+  // reroutingFormResponses is similar to rescheduling which can only be done by the organiser
+  // won't really be necessary here in our usecase though :- cc @Hariom
+  @IsObject()
+  @IsOptional()
+  @ApiHideProperty()
+  reroutingFormResponses?: Record<
+    string,
+    {
+      value: (string | number | string[]) & (string | number | string[] | undefined);
+      label?: string | undefined;
+    }
+  >;
 }

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/api-key-bookings.e2e-spec.ts

@@ -19,6 +19,7 @@ import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.rep
 import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -72,10 +73,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
     let apiKeyString: string;
 
-    const userEmail = "bookings-controller-e2e@api.com";
+    const userEmail = `api-key-bookings-2024-08-13-user-${randomString()}@api.com`;
     let user: User;
 
     let eventTypeId: number;
+    const eventTypeSlug = `api-key-bookings-2024-08-13-event-type-${randomString()}`;
 
     let createdBooking: BookingOutput_2024_08_13;
     let rescheduledBooking: BookingOutput_2024_08_13;
@@ -100,7 +102,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
       apiKeysRepositoryFixture = new ApiKeysRepositoryFixture(moduleRef);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `api-key-bookings-organization-${randomString()}`,
+      });
 
       user = await userRepositoryFixture.create({
         email: userEmail,
@@ -110,13 +114,17 @@ describe("Bookings Endpoints 2024-08-13", () => {
       apiKeyString = keyString;
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `api-key-bookings-e2e-api-key-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
       const event = await eventTypesRepositoryFixture.create(
-        { title: "peer coding", slug: "peer-coding", length: 60 },
+        {
+          title: `api-key-bookings-e2e-api-key-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: eventTypeSlug,
+          length: 60,
+        },
         user.id
       );
       eventTypeId = event.id;

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-fields.e2e-spec.ts

@@ -16,7 +16,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
-import { randomNumber } from "test/utils/randomNumber";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -26,9 +26,7 @@ import {
   GetSeatedBookingOutput_2024_08_13,
 } from "@calcom/platform-types";
 import { BookingOutput_2024_08_13 } from "@calcom/platform-types";
-import { Booking, PlatformOAuthClient, Team, User } from "@calcom/prisma/client";
-
-const suffix = randomNumber();
+import { Booking, PlatformOAuthClient, Team, User, EventType } from "@calcom/prisma/client";
 
 describe("Bookings Endpoints 2024-08-13", () => {
   describe("Booking fields", () => {
@@ -43,7 +41,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = `alice-${suffix}@api.com`;
+    const userEmail = `booking-fields-2024-08-13-user-${randomString()}@api.com`;
     let user: User;
 
     let bookingWithSplitName: Booking;
@@ -54,7 +52,12 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
     let seatedBookingWithSplitName: Booking;
 
-    let eventTypeWithBookingFieldsId: number;
+    let eventTypeId: number;
+    let seatedEvent: EventType;
+    let eventTypeWithBookingFields: EventType;
+    const eventTypeSlug = `booking-fields-2024-08-13-event-type-${randomString()}`;
+    const eventTypeWithBookingFieldsSlug = `booking-fields-2024-08-13-event-type-${randomString()}`;
+    const seatedEventTypeSlug = `booking-fields-2024-08-13-event-type-${randomString()}`;
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
@@ -76,7 +79,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: `booking fields ${suffix}` });
+      organization = await teamRepositoryFixture.create({
+        name: `booking-fields-2024-08-13-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
@@ -89,109 +94,36 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `booking-fields-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
       const event = await eventTypesRepositoryFixture.create(
-        { title: "peer coding", slug: `normal-booking-${randomNumber()}`, length: 60 },
-        user.id
-      );
-
-      bookingWithSplitName = await bookingsRepositoryFixture.create({
-        user: {
-          connect: {
-            id: user.id,
-          },
-        },
-        startTime: new Date(Date.UTC(2020, 0, 8, 12, 0, 0)),
-        endTime: new Date(Date.UTC(2020, 0, 8, 13, 0, 0)),
-        title: "peer coding lets goo",
-        uid: "booking",
-        eventType: {
-          connect: {
-            id: event.id,
-          },
-        },
-        location: "integrations:daily",
-        customInputs: {},
-        metadata: {},
-        responses: {
-          name: splitName,
-          email: "oldie@gmail.com",
-        },
-        attendees: {
-          create: {
-            email: "oldie@gmail.com",
-            name: "Oldie Goldie",
-            locale: "lv",
-            timeZone: "Europe/Rome",
-          },
-        },
-      });
-
-      const seatedEvent = await eventTypesRepositoryFixture.create(
-        { title: "peer coding", slug: `seated-${randomNumber()}`, length: 60, seatsPerTimeSlot: 3 },
-        user.id
-      );
-
-      seatedBookingWithSplitName = await bookingsRepositoryFixture.create({
-        user: {
-          connect: {
-            id: user.id,
-          },
-        },
-        startTime: new Date(Date.UTC(2020, 0, 8, 14, 0, 0)),
-        endTime: new Date(Date.UTC(2020, 0, 8, 15, 0, 0)),
-        title: "peer coding lets goo",
-        uid: "seated-booking",
-        eventType: {
-          connect: {
-            id: seatedEvent.id,
-          },
-        },
-        location: "integrations:daily",
-        customInputs: {},
-        metadata: {},
-        responses: {
-          name: splitName,
-          email: "oldie@gmail.com",
-        },
-        attendees: {
-          create: {
-            email: "oldie@gmail.com",
-            name: "Oldie Goldie",
-            locale: "lv",
-            timeZone: "Europe/Rome",
-            bookingSeat: {
-              create: {
-                referenceUid: "unique-seat-uid",
-                data: {
-                  responses: {
-                    email: "oldie@gmail.com",
-                    name: {
-                      firstName: "Oldie",
-                      lastName: "Goldie",
-                    },
-                  },
-                },
-                metadata: {},
-                booking: {
-                  connect: {
-                    uid: "seated-booking",
-                  },
-                },
-              },
-            },
-          },
-        },
-      });
-
-      const eventTypeWithBookingFields = await eventTypesRepositoryFixture.create(
         {
-          title: "peer coding with booking fields",
-          slug: `with-custom-booking-fields-${randomNumber()}`,
+          title: `booking-fields-2024-08-13-event-type-${randomString()}`,
+          slug: eventTypeSlug,
+          length: 60,
+        },
+        user.id
+      );
+
+      eventTypeId = event.id;
+
+      seatedEvent = await eventTypesRepositoryFixture.create(
+        {
+          title: `booking-fields-2024-08-13-event-type-${randomString()}`,
+          slug: seatedEventTypeSlug,
+          length: 60,
+          seatsPerTimeSlot: 3,
+        },
+        user.id
+      );
+
+      eventTypeWithBookingFields = await eventTypesRepositoryFixture.create(
+        {
+          title: `booking-fields-2024-08-13-event-type-${randomString()}`,
+          slug: eventTypeWithBookingFieldsSlug,
           length: 60,
           bookingFields: [
             {
@@ -381,11 +313,93 @@ describe("Bookings Endpoints 2024-08-13", () => {
         },
         user.id
       );
-      eventTypeWithBookingFieldsId = eventTypeWithBookingFields.id;
+
+      bookingWithSplitName = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2020, 0, 8, 12, 0, 0)),
+        endTime: new Date(Date.UTC(2020, 0, 8, 13, 0, 0)),
+        title: "peer coding lets goo",
+        uid: "booking",
+        eventType: {
+          connect: {
+            id: eventTypeId,
+          },
+        },
+        location: "integrations:daily",
+        customInputs: {},
+        metadata: {},
+        responses: {
+          name: splitName,
+          email: "oldie@gmail.com",
+        },
+        attendees: {
+          create: {
+            email: "oldie@gmail.com",
+            name: "Oldie Goldie",
+            locale: "lv",
+            timeZone: "Europe/Rome",
+          },
+        },
+      });
+
+      seatedBookingWithSplitName = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2020, 0, 8, 14, 0, 0)),
+        endTime: new Date(Date.UTC(2020, 0, 8, 15, 0, 0)),
+        title: "peer coding lets goo",
+        uid: "seated-booking",
+        eventType: {
+          connect: {
+            id: seatedEvent.id,
+          },
+        },
+        location: "integrations:daily",
+        customInputs: {},
+        metadata: {},
+        responses: {
+          name: splitName,
+          email: "oldie@gmail.com",
+        },
+        attendees: {
+          create: {
+            email: "oldie@gmail.com",
+            name: "Oldie Goldie",
+            locale: "lv",
+            timeZone: "Europe/Rome",
+            bookingSeat: {
+              create: {
+                referenceUid: "unique-seat-uid",
+                data: {
+                  responses: {
+                    email: "oldie@gmail.com",
+                    name: {
+                      firstName: "Oldie",
+                      lastName: "Goldie",
+                    },
+                  },
+                },
+                metadata: {},
+                booking: {
+                  connect: {
+                    uid: "seated-booking",
+                  },
+                },
+              },
+            },
+          },
+        },
+      });
 
       app = moduleRef.createNestApplication();
       bootstrap(app as NestExpressApplication);
-
       await app.init();
     });
 
@@ -457,7 +471,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
       it("should not be able to book an event type with custom required booking fields if they are missing in bookingFieldsResponses", async () => {
         const body: CreateBookingInput_2024_08_13 = {
           start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
-          eventTypeId: eventTypeWithBookingFieldsId,
+          eventTypeId: eventTypeWithBookingFields.id,
           attendee: {
             name: "Mr Proper",
             email: "mr_proper@gmail.com",
@@ -476,7 +490,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
       it("should be able to book an event type with custom required booking fields", async () => {
         const body: CreateBookingInput_2024_08_13 = {
           start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
-          eventTypeId: eventTypeWithBookingFieldsId,
+          eventTypeId: eventTypeWithBookingFields.id,
           attendee: {
             name: "Mr Proper",
             email: "mr_proper@gmail.com",

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/confirm-bookings.e2e-spec.ts

@@ -16,6 +16,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -35,11 +36,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = "bookings-controller-e2e@api.com";
+    const userEmail = `confirm-bookings-2024-08-13-user-${randomString()}@api.com`;
     let user: User;
 
     let eventTypeId: number;
-    const eventTypeSlug = "peer-coding";
+    const eventTypeSlug = `confirm-bookings-2024-08-13-event-type-${randomString()}`;
 
     let createdBooking1: Booking;
     let createdBooking2: Booking;
@@ -64,7 +65,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `confirm-bookings-2024-08-13-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
@@ -77,13 +80,17 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `confirm-bookings-2024-08-13-${randomString()}-schedule`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
       const event = await eventTypesRepositoryFixture.create(
-        { title: "peer coding", slug: eventTypeSlug, length: 60 },
+        {
+          title: `confirm-bookings-2024-08-13-${randomString()}-event-type`,
+          slug: `confirm-bookings-2024-08-13-${randomString()}-event-type-slug`,
+          length: 60,
+        },
         user.id
       );
       eventTypeId = event.id;

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/confirm-emails.e2e-spec.ts

@@ -20,6 +20,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -92,7 +93,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
   let emailsEnabledSetup: EmailSetup;
   let emailsDisabledSetup: EmailSetup;
 
-  const authEmail = `admin-${Math.floor(Math.random() * 1000)}@example.com`;
+  const authEmail = `confirm-emails-2024-08-13-admin-${randomString()}@api.com`;
 
   beforeAll(async () => {
     const moduleRef = await withApiAuth(
@@ -114,7 +115,9 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
     teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
     schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-    organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+    organization = await teamRepositoryFixture.create({
+      name: `confirm-emails-2024-08-13-organization-${randomString()}`,
+    });
 
     await setupEnabledEmails();
     await setupDisabledEmails();
@@ -139,7 +142,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
     const oAuthClientEmailsEnabled = await createOAuthClient(organization.id, true);
 
     const user = await userRepositoryFixture.create({
-      email: `alice-${Math.floor(Math.random() * 1000)}@gmail.com`,
+      email: `confirm-emails-2024-08-13-user-${randomString()}@api.com`,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsEnabled.id,
@@ -148,14 +151,19 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
     });
 
     const userSchedule: CreateScheduleInput_2024_04_15 = {
-      name: "working time",
+      name: `confirm-emails-2024-08-13-schedule-${randomString()}`,
       timeZone: "Europe/Rome",
       isDefault: true,
     };
     await schedulesService.createUserSchedule(user.id, userSchedule);
 
     const event = await eventTypesRepositoryFixture.create(
-      { title: "peer coding", slug: "peer-coding", length: 60, requiresConfirmation: true },
+      {
+        title: "peer coding",
+        slug: `confirm-emails-2024-08-13-event-type-${randomString()}`,
+        length: 60,
+        requiresConfirmation: true,
+      },
       user.id
     );
 
@@ -171,7 +179,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
     const oAuthClientEmailsDisabled = await createOAuthClient(organization.id, false);
 
     const user = await userRepositoryFixture.create({
-      email: `bob-${Math.floor(Math.random() * 1000)}@gmail.com`,
+      email: `confirm-emails-2024-08-13-user-${randomString()}@api.com`,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsDisabled.id,
@@ -179,13 +187,18 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
       },
     });
     const userSchedule: CreateScheduleInput_2024_04_15 = {
-      name: "working time",
+      name: `confirm-emails-2024-08-13-schedule-${randomString()}`,
       timeZone: "Europe/Rome",
       isDefault: true,
     };
     await schedulesService.createUserSchedule(user.id, userSchedule);
     const event = await eventTypesRepositoryFixture.create(
-      { title: "peer coding", slug: "peer-coding", length: 60, requiresConfirmation: true },
+      {
+        title: "peer coding",
+        slug: `confirm-emails-2024-08-13-event-type-${randomString()}`,
+        length: 60,
+        requiresConfirmation: true,
+      },
       user.id
     );
 

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/team-emails.e2e-spec.ts

@@ -23,6 +23,7 @@ import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-cli
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -103,7 +104,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
   let emailsEnabledSetup: EmailSetup;
   let emailsDisabledSetup: EmailSetup;
 
-  const authEmail = "admin@example.com";
+  const authEmail = "team-emails-2024-08-13-user-admin@example.com";
 
   beforeAll(async () => {
     const moduleRef = await withApiAuth(
@@ -128,7 +129,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     hostsRepositoryFixture = new HostsRepositoryFixture(moduleRef);
     schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-    organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+    organization = await teamRepositoryFixture.create({ name: `team-emails-organization-${randomString()}` });
 
     await setupEnabledEmails();
     await setupDisabledEmails();
@@ -152,7 +153,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     const oAuthClientEmailsEnabled = await createOAuthClient(organization.id, true);
 
     const team = await teamRepositoryFixture.create({
-      name: "team 1",
+      name: `team-emails-team-${randomString()}`,
       isOrganization: false,
       parent: { connect: { id: organization.id } },
       createdByOAuthClient: {
@@ -163,7 +164,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     });
 
     const member1 = await userRepositoryFixture.create({
-      email: "alice@gmail.com",
+      email: `team-emails-2024-08-13-member1-${randomString()}@api.com`,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsEnabled.id,
@@ -172,7 +173,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     });
 
     const member2 = await userRepositoryFixture.create({
-      email: "bob@gmail.com",
+      email: `team-emails-2024-08-13-member2-${randomString()}@api.com`,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsEnabled.id,
@@ -181,7 +182,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     });
 
     const userSchedule: CreateScheduleInput_2024_04_15 = {
-      name: "working time",
+      name: `team-emails-2024-08-13-schedule-${randomString()}`,
       timeZone: "Europe/Rome",
       isDefault: true,
     };
@@ -237,8 +238,8 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
       team: {
         connect: { id: team.id },
       },
-      title: "Collective Event Type",
-      slug: "collective-event-type",
+      title: `team-emails-2024-08-13-event-type-${randomString()}`,
+      slug: `team-emails-2024-08-13-event-type-${randomString()}`,
       length: 60,
       assignAllTeamMembers: true,
       bookingFields: [],
@@ -278,8 +279,8 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
       team: {
         connect: { id: team.id },
       },
-      title: "Round Robin Event Type",
-      slug: "round-robin-event-type",
+      title: `team-emails-2024-08-13-event-type-${randomString()}`,
+      slug: `team-emails-2024-08-13-event-type-${randomString()}`,
       length: 60,
       assignAllTeamMembers: false,
       bookingFields: [],
@@ -336,7 +337,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     const oAuthClientEmailsDisabled = await createOAuthClient(organization.id, false);
 
     const team = await teamRepositoryFixture.create({
-      name: "team 2",
+      name: `team-emails-2024-08-13-team-${randomString()}`,
       isOrganization: false,
       parent: { connect: { id: organization.id } },
       createdByOAuthClient: {
@@ -347,7 +348,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     });
 
     const member1 = await userRepositoryFixture.create({
-      email: "charlie@gmail.com",
+      email: `team-emails-2024-08-13-member1-${randomString()}@api.com`,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsDisabled.id,
@@ -356,7 +357,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     });
 
     const member2 = await userRepositoryFixture.create({
-      email: "dean@gmail.com",
+      email: `team-emails-2024-08-13-member2-${randomString()}@api.com`,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsDisabled.id,
@@ -365,7 +366,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
     });
 
     const userSchedule: CreateScheduleInput_2024_04_15 = {
-      name: "working time",
+      name: `team-emails-2024-08-13-schedule-${randomString()}`,
       timeZone: "Europe/Rome",
       isDefault: true,
     };
@@ -421,8 +422,8 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
       team: {
         connect: { id: team.id },
       },
-      title: "Collective Event Type",
-      slug: "collective-event-type",
+      title: `team-emails-2024-08-13-event-type-${randomString()}`,
+      slug: `team-emails-2024-08-13-event-type-${randomString()}`,
       length: 60,
       assignAllTeamMembers: true,
       bookingFields: [],
@@ -462,8 +463,8 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
       team: {
         connect: { id: team.id },
       },
-      title: "Round Robin Event Type",
-      slug: "round-robin-event-type",
+      title: `team-emails-2024-08-13-event-type-${randomString()}`,
+      slug: `team-emails-2024-08-13-event-type-${randomString()}`,
       length: 60,
       assignAllTeamMembers: false,
       bookingFields: [],
@@ -965,17 +966,19 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
       });
     });
   });
+
   afterAll(async () => {
     await teamRepositoryFixture.delete(organization.id);
+    await userRepositoryFixture.deleteByEmail(authEmail);
     await userRepositoryFixture.deleteByEmail(emailsEnabledSetup.member1.email);
-    await userRepositoryFixture.deleteByEmail(emailsDisabledSetup.member1.email);
+    await userRepositoryFixture.deleteByEmail(emailsDisabledSetup.member2.email);
     await bookingsRepositoryFixture.deleteAllBookings(
       emailsEnabledSetup.member1.id,
       emailsEnabledSetup.member1.email
     );
     await bookingsRepositoryFixture.deleteAllBookings(
       emailsDisabledSetup.member1.id,
-      emailsDisabledSetup.member1.email
+      emailsDisabledSetup.member2.email
     );
     await app.close();
   });

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/user-emails.e2e-spec.ts

@@ -20,6 +20,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
 import {
@@ -101,7 +102,9 @@ describe("Bookings Endpoints 2024-08-13 user emails", () => {
     teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
     schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-    organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+    organization = await teamRepositoryFixture.create({
+      name: `user-emails-2024-08-13-organization-${randomString()}`,
+    });
 
     await setupEnabledEmails();
     await setupDisabledEmails();
@@ -116,7 +119,7 @@ describe("Bookings Endpoints 2024-08-13 user emails", () => {
     const oAuthClientEmailsEnabled = await createOAuthClient(organization.id, true);
 
     const user = await userRepositoryFixture.create({
-      email: `alice-${Math.floor(Math.random() * 1000)}@gmail.com`,
+      email: `user-emails-2024-08-13-user-${randomString()}@api.com`,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsEnabled.id,
@@ -125,22 +128,26 @@ describe("Bookings Endpoints 2024-08-13 user emails", () => {
     });
 
     const userSchedule: CreateScheduleInput_2024_04_15 = {
-      name: "working time",
+      name: `user-emails-2024-08-13-schedule-${randomString()}`,
       timeZone: "Europe/Rome",
       isDefault: true,
     };
     await schedulesService.createUserSchedule(user.id, userSchedule);
 
     const event = await eventTypesRepositoryFixture.create(
-      { title: "peer coding", slug: "peer-coding", length: 60 },
+      {
+        title: `user-emails-2024-08-13-event-type-${randomString()}`,
+        slug: `user-emails-2024-08-13-event-type-${randomString()}`,
+        length: 60,
+      },
       user.id
     );
 
     const recurringEvent = await eventTypesRepositoryFixture.create(
       // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
       {
-        title: "peer coding recurring",
-        slug: "peer-coding-recurring",
+        title: `user-emails-2024-08-13-recurring-event-type-${randomString()}`,
+        slug: `user-emails-2024-08-13-recurring-event-type-${randomString()}`,
         length: 60,
         recurringEvent: { freq: 2, count: 3, interval: 1 },
       },
@@ -160,7 +167,7 @@ describe("Bookings Endpoints 2024-08-13 user emails", () => {
     const oAuthClientEmailsDisabled = await createOAuthClient(organization.id, false);
 
     const user = await userRepositoryFixture.create({
-      email: `bob-${Math.floor(Math.random() * 1000)}@gmail.com`,
+      email: `user-emails-2024-08-13-user-${randomString()}@api.com`,
       platformOAuthClients: {
         connect: {
           id: oAuthClientEmailsDisabled.id,
@@ -168,21 +175,25 @@ describe("Bookings Endpoints 2024-08-13 user emails", () => {
       },
     });
     const userSchedule: CreateScheduleInput_2024_04_15 = {
-      name: "working time",
+      name: `user-emails-2024-08-13-schedule-${randomString()}`,
       timeZone: "Europe/Rome",
       isDefault: true,
     };
     await schedulesService.createUserSchedule(user.id, userSchedule);
     const event = await eventTypesRepositoryFixture.create(
-      { title: "peer coding", slug: "peer-coding", length: 60 },
+      {
+        title: `user-emails-2024-08-13-event-type-${randomString()}`,
+        slug: `user-emails-2024-08-13-event-type-${randomString()}`,
+        length: 60,
+      },
       user.id
     );
 
     const recurringEvent = await eventTypesRepositoryFixture.create(
       // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
       {
-        title: "peer coding recurring",
-        slug: "peer-coding-recurring",
+        title: `user-emails-2024-08-13-recurring-event-type-${randomString()}`,
+        slug: `user-emails-2024-08-13-recurring-event-type-${randomString()}`,
         length: 60,
         recurringEvent: { freq: 2, count: 3, interval: 1 },
       },

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reassign-bookings.e2e-spec.ts

@@ -21,6 +21,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -45,8 +46,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let organizationsRepositoryFixture: OrganizationRepositoryFixture;
     let profileRepositoryFixture: ProfileRepositoryFixture;
 
-    const teamUserEmail = "orgUser1team1@api.com";
-    const teamUserEmail2 = "orgUser2team1@api.com";
+    const teamUserEmail = `reassign-bookings-2024-08-13-user1-${randomString()}@api.com`;
+    const teamUserEmail2 = `reassign-bookings-2024-08-13-user2-${randomString()}@api.com`;
     let teamUser1: User;
     let teamUser2: User;
 
@@ -78,11 +79,13 @@ describe("Bookings Endpoints 2024-08-13", () => {
       hostsRepositoryFixture = new HostsRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await organizationsRepositoryFixture.create({ name: "organization team bookings" });
+      organization = await organizationsRepositoryFixture.create({
+        name: `reassign-bookings-2024-08-13-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       team = await teamRepositoryFixture.create({
-        name: "team 1",
+        name: `reassign-bookings-2024-08-13-team-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: organization.id } },
         createdByOAuthClient: {
@@ -95,17 +98,17 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamUser1 = await userRepositoryFixture.create({
         email: teamUserEmail,
         locale: "it",
-        name: "orgUser1team1",
+        name: `reassign-bookings-2024-08-13-user1-${randomString()}`,
       });
 
       teamUser2 = await userRepositoryFixture.create({
         email: teamUserEmail2,
         locale: "it",
-        name: "orgUser2team1",
+        name: `reassign-bookings-2024-08-13-user2-${randomString()}`,
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `reassign-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
@@ -164,8 +167,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
         users: {
           connect: [{ id: teamUser1.id }, { id: teamUser2.id }],
         },
-        title: "Round Robin Event Type",
-        slug: "round-robin-event-type",
+        title: `reassign-bookings-2024-08-13-event-type-${randomString()}`,
+        slug: `reassign-bookings-2024-08-13-event-type-${randomString()}`,
         length: 60,
         assignAllTeamMembers: false,
         bookingFields: [],

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/recurring-bookings.e2e-spec.ts

@@ -17,6 +17,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -41,11 +42,13 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = "bookings-controller-e2e@api.com";
+    const userEmail = `recurring-bookings-2024-08-13-user-${randomString()}@api.com`;
     let user: User;
 
     const maxRecurrenceCount = 3;
     let recurringEventTypeId: number;
+    const recurringEventSlug = `recurring-bookings-2024-08-13-event-type-${randomString()}`;
+    let createdRecurringBooking: RecurringBookingOutput_2024_08_13[];
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
@@ -67,7 +70,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `recurring-bookings-2024-08-13-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
@@ -80,7 +85,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `recurring-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
@@ -89,8 +94,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
       const recurringEvent = await eventTypesRepositoryFixture.create(
         // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
         {
-          title: "peer coding recurring",
-          slug: "peer-coding-recurring",
+          title: `recurring-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: recurringEventSlug,
           length: 60,
           recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
         },
@@ -344,7 +349,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = "bookings-controller-e2e@api.com";
+    const userEmail = `recurring-bookings-2024-08-13-user-${randomString()}@api.com`;
     let user: User;
 
     const maxRecurrenceCount = 4;
@@ -380,7 +385,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `recurring-bookings-2024-08-13-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
@@ -393,17 +400,18 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `recurring-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
 
+      const recurringEventSlug = `recurring-bookings-2024-08-13-event-type-${randomString()}`;
       const recurringEvent = await eventTypesRepositoryFixture.create(
         // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
         {
-          title: "peer coding recurring",
-          slug: "peer-coding-recurring",
+          title: `recurring-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: recurringEventSlug,
           length: 60,
           recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
         },
@@ -551,7 +559,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = "bookings-controller-e2e@api.com";
+    const userEmail = `recurring-bookings-2024-08-13-user-${randomString()}@api.com`;
     let user: User;
 
     const maxRecurrenceCount = 4;
@@ -587,7 +595,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `recurring-bookings-2024-08-13-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
@@ -600,17 +610,18 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `recurring-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
 
+      const recurringEventSlug = `recurring-bookings-2024-08-13-event-type-${randomString()}`;
       const recurringEvent = await eventTypesRepositoryFixture.create(
         // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
         {
-          title: "peer coding recurring",
-          slug: "peer-coding-recurring",
+          title: `recurring-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: recurringEventSlug,
           length: 60,
           recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
         },

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/seated-bookings.e2e-spec.ts

@@ -19,6 +19,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -51,22 +52,23 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = "seated-bookings-controller-e2e@api.com";
+    const userEmail = `seated-bookings-user-${randomString()}@api.com`;
     let user: User;
 
-    const seatedTventTypeSlug = "peer-coding-seated";
-    const recurringSeatedTventTypeSlug = "peer-coding-recurring-seated";
     let seatedEventTypeId: number;
     let recurringSeatedEventTypeId: number;
     const maxRecurrenceCount = 3;
 
+    const seatedEventSlug = `seated-bookings-event-type-${randomString()}`;
+    const recurringSeatedEventSlug = `seated-bookings-event-type-${randomString()}`;
+
     let createdSeatedBooking: CreateSeatedBookingOutput_2024_08_13;
     let createdRecurringSeatedBooking: CreateRecurringSeatedBookingOutput_2024_08_13[];
 
-    const emailAttendeeOne = "mr_proper_seated@gmail.com";
-    const nameAttendeeOne = "Mr Proper Seated";
-    const emailAttendeeTwo = "mr_proper_friend_seated@gmail.com";
-    const nameAttendeeTwo = "Mr Proper Friend Seated";
+    const emailAttendeeOne = `seated-bookings-attendee1-${randomString()}@api.com`;
+    const nameAttendeeOne = `Attendee One ${randomString()}`;
+    const emailAttendeeTwo = `seated-bookings-attendee2-${randomString()}@api.com`;
+    const nameAttendeeTwo = `Attendee Two ${randomString()}`;
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
@@ -88,7 +90,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `seated-bookings-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
@@ -101,15 +105,15 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `seated-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
       const seatedEvent = await eventTypesRepositoryFixture.create(
         {
-          title: "peer coding",
-          slug: seatedTventTypeSlug,
+          title: `seated-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: seatedEventSlug,
           length: 60,
           seatsPerTimeSlot: 5,
           seatsShowAttendees: true,
@@ -123,8 +127,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
       const recurringSeatedEvent = await eventTypesRepositoryFixture.create(
         // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
         {
-          title: "peer coding recurring",
-          slug: recurringSeatedTventTypeSlug,
+          title: `seated-bookings-2024-08-13-recurring-event-type-${randomString()}`,
+          slug: recurringSeatedEventSlug,
           length: 60,
           recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
           seatsPerTimeSlot: 5,
@@ -200,7 +204,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.eventTypeId).toEqual(seatedEventTypeId);
             expect(data.eventType).toEqual({
               id: seatedEventTypeId,
-              slug: seatedTventTypeSlug,
+              slug: seatedEventSlug,
             });
             expect(data.attendees.length).toEqual(1);
             expect(data.attendees[0]).toEqual({
@@ -272,7 +276,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.eventTypeId).toEqual(seatedEventTypeId);
             expect(data.eventType).toEqual({
               id: seatedEventTypeId,
-              slug: seatedTventTypeSlug,
+              slug: seatedEventSlug,
             });
             expect(data.attendees.length).toEqual(2);
             // note(Lauris): first attendee is from previous test request
@@ -366,7 +370,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(firstBooking.eventTypeId).toEqual(recurringSeatedEventTypeId);
             expect(firstBooking.eventType).toEqual({
               id: recurringSeatedEventTypeId,
-              slug: recurringSeatedTventTypeSlug,
+              slug: recurringSeatedEventSlug,
             });
             expect(firstBooking.attendees.length).toEqual(1);
             expect(firstBooking.attendees[0]).toEqual({
@@ -401,7 +405,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(secondBooking.eventTypeId).toEqual(recurringSeatedEventTypeId);
             expect(secondBooking.eventType).toEqual({
               id: recurringSeatedEventTypeId,
-              slug: recurringSeatedTventTypeSlug,
+              slug: recurringSeatedEventSlug,
             });
             expect(secondBooking.attendees.length).toEqual(1);
             expect(secondBooking.attendees[0]).toEqual({
@@ -575,7 +579,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.eventTypeId).toEqual(seatedEventTypeId);
             expect(data.eventType).toEqual({
               id: seatedEventTypeId,
-              slug: seatedTventTypeSlug,
+              slug: seatedEventSlug,
             });
             expect(data.attendees.length).toEqual(1);
             const attendee = createdSeatedBooking.attendees.find((a) => a.seatUid === body.seatUid);
@@ -629,7 +633,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.eventTypeId).toEqual(seatedEventTypeId);
             expect(data.eventType).toEqual({
               id: seatedEventTypeId,
-              slug: seatedTventTypeSlug,
+              slug: seatedEventSlug,
             });
             expect(data.attendees.length).toEqual(0);
             expect(data.location).toBeDefined();
@@ -681,22 +685,23 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = "seated-bookings-controller-e2e@api.com";
+    const userEmail = `seated-bookings-user-${randomString()}@api.com`;
     let user: User;
 
-    const seatedTventTypeSlug = "peer-coding-seated";
-    const recurringSeatedTventTypeSlug = "peer-coding-recurring-seated";
     let seatedEventTypeId: number;
     let recurringSeatedEventTypeId: number;
     const maxRecurrenceCount = 3;
 
+    const seatedEventSlug = `seated-bookings-event-type-${randomString()}`;
+    const recurringSeatedEventSlug = `seated-bookings-event-type-${randomString()}`;
+
     let createdSeatedBooking: CreateSeatedBookingOutput_2024_08_13;
     let createdRecurringSeatedBooking: CreateRecurringSeatedBookingOutput_2024_08_13[];
 
-    const emailAttendeeOne = "mr_proper_first@gmail.com";
-    const nameAttendeeOne = "Mr Proper First";
-    const emailAttendeeTwo = "mr_proper_second@gmail.com";
-    const nameAttendeeTwo = "Mr Proper Second";
+    const emailAttendeeOne = `seated-bookings-attendee1-${randomString()}@api.com`;
+    const nameAttendeeOne = `Attendee One ${randomString()}`;
+    const emailAttendeeTwo = `seated-bookings-attendee2-${randomString()}@api.com`;
+    const nameAttendeeTwo = `Attendee Two ${randomString()}`;
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
@@ -718,7 +723,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `seated-bookings-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
@@ -731,20 +738,17 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `seated-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
       const seatedEvent = await eventTypesRepositoryFixture.create(
         {
-          title: "peer coding",
-          slug: seatedTventTypeSlug,
+          title: `seated-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: seatedEventSlug,
           length: 60,
-          seatsPerTimeSlot: 5,
-          seatsShowAttendees: true,
-          seatsShowAvailabilityCount: true,
-          locations: [{ type: "inPerson", address: "via 10, rome, italy" }],
+          seatsPerTimeSlot: 3,
         },
         user.id
       );
@@ -753,14 +757,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
       const recurringSeatedEvent = await eventTypesRepositoryFixture.create(
         // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
         {
-          title: "peer coding recurring",
-          slug: recurringSeatedTventTypeSlug,
+          title: `seated-bookings-2024-08-13-recurring-event-type-${randomString()}`,
+          slug: recurringSeatedEventSlug,
           length: 60,
+          seatsPerTimeSlot: 3,
           recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
-          seatsPerTimeSlot: 5,
-          seatsShowAttendees: true,
-          seatsShowAvailabilityCount: true,
-          locations: [{ type: "inPerson", address: "via 10, rome, italy" }],
         },
         user.id
       );
@@ -836,7 +837,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(firstBooking.eventTypeId).toEqual(recurringSeatedEventTypeId);
             expect(firstBooking.eventType).toEqual({
               id: recurringSeatedEventTypeId,
-              slug: recurringSeatedTventTypeSlug,
+              slug: recurringSeatedEventSlug,
             });
             expect(firstBooking.attendees.length).toEqual(1);
             expect(firstBooking.attendees[0]).toEqual({
@@ -871,7 +872,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(secondBooking.eventTypeId).toEqual(recurringSeatedEventTypeId);
             expect(secondBooking.eventType).toEqual({
               id: recurringSeatedEventTypeId,
-              slug: recurringSeatedTventTypeSlug,
+              slug: recurringSeatedEventSlug,
             });
             expect(secondBooking.attendees.length).toEqual(1);
             expect(secondBooking.attendees[0]).toEqual({
@@ -949,7 +950,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(firstBooking.eventTypeId).toEqual(recurringSeatedEventTypeId);
             expect(firstBooking.eventType).toEqual({
               id: recurringSeatedEventTypeId,
-              slug: recurringSeatedTventTypeSlug,
+              slug: recurringSeatedEventSlug,
             });
             expect(firstBooking.attendees.length).toEqual(2);
             const firstAttendee = firstBooking.attendees.find(
@@ -1003,7 +1004,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(secondBooking.eventTypeId).toEqual(recurringSeatedEventTypeId);
             expect(secondBooking.eventType).toEqual({
               id: recurringSeatedEventTypeId,
-              slug: recurringSeatedTventTypeSlug,
+              slug: recurringSeatedEventSlug,
             });
             expect(secondBooking.attendees.length).toEqual(2);
             expect(secondBooking.attendees[0]).toEqual({

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/team-bookings.e2e-spec.ts

@@ -21,6 +21,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -52,8 +53,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let organizationsRepositoryFixture: OrganizationRepositoryFixture;
     let profileRepositoryFixture: ProfileRepositoryFixture;
 
-    const teamUserEmail = "orgUser1team1@api.com";
-    const teamUserEmail2 = "orgUser2team1@api.com";
+    const teamUserEmail = `team-bookings-user1-${randomString()}@api.com`;
+    const teamUserEmail2 = `team-bookings-user2-${randomString()}@api.com`;
     let teamUser: User;
     let teamUser2: User;
 
@@ -61,6 +62,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let team2EventTypeId: number;
     let phoneOnlyEventTypeId: number;
 
+    const team1EventTypeSlug = `team-bookings-event-type-${randomString()}`;
+    const team2EventTypeSlug = `team-bookings-event-type-${randomString()}`;
+    const phoneOnlyEventTypeSlug = `team-bookings-event-type-${randomString()}`;
+
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
         teamUserEmail,
@@ -85,11 +90,13 @@ describe("Bookings Endpoints 2024-08-13", () => {
       hostsRepositoryFixture = new HostsRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await organizationsRepositoryFixture.create({ name: "organization team bookings" });
+      organization = await organizationsRepositoryFixture.create({
+        name: `team-bookings-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       team1 = await teamRepositoryFixture.create({
-        name: "team 1",
+        name: `team-bookings-team1-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: organization.id } },
         createdByOAuthClient: {
@@ -100,7 +107,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       team2 = await teamRepositoryFixture.create({
-        name: "team 2",
+        name: `team-bookings-team2-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: organization.id } },
         createdByOAuthClient: {
@@ -133,7 +140,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `team-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
@@ -196,8 +203,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
         team: {
           connect: { id: team1.id },
         },
-        title: "Collective Event Type",
-        slug: "collective-event-type",
+        title: `team-bookings-2024-08-13-event-type-${randomString()}`,
+        slug: team1EventTypeSlug,
         length: 60,
         assignAllTeamMembers: true,
         bookingFields: [],
@@ -211,8 +218,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
         team: {
           connect: { id: team1.id },
         },
-        title: "Phone Only Event Type",
-        slug: "phone-only-event-type",
+        title: `team-bookings-2024-08-13-event-type-${randomString()}`,
+        slug: phoneOnlyEventTypeSlug,
         length: 15,
         assignAllTeamMembers: false,
         hosts: {
@@ -288,8 +295,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
         team: {
           connect: { id: team2.id },
         },
-        title: "Collective Event Type 2",
-        slug: "collective-event-type-2",
+        title: `team-bookings-2024-08-13-event-type-${randomString()}`,
+        slug: team2EventTypeSlug,
         length: 60,
         assignAllTeamMembers: true,
         bookingFields: [],

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts

@@ -21,6 +21,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import {
@@ -58,12 +59,13 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = "bookings-controller-e2e@api.com";
+    const userEmail = `user-bookings-user-${randomString()}@api.com`;
     let user: User;
 
     let eventTypeId: number;
-    const eventTypeSlug = "peer-coding";
+    const eventTypeSlug = `user-bookings-event-type-${randomString()}`;
     let recurringEventTypeId: number;
+    const recurringEventTypeSlug = `user-bookings-event-type-${randomString()}`;
 
     let createdBooking: BookingOutput_2024_08_13;
     let rescheduledBooking: BookingOutput_2024_08_13;
@@ -91,12 +93,14 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `user-bookings-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
         email: userEmail,
-        username: `bob-${Math.floor(Math.random() * 1000)}@gmail.com`,
+        username: userEmail,
         platformOAuthClients: {
           connect: {
             id: oAuthClient.id,
@@ -105,13 +109,18 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `user-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
       await schedulesService.createUserSchedule(user.id, userSchedule);
+
       const event = await eventTypesRepositoryFixture.create(
-        { title: "peer coding", slug: eventTypeSlug, length: 60 },
+        {
+          title: `user-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: eventTypeSlug,
+          length: 60,
+        },
         user.id
       );
       eventTypeId = event.id;
@@ -120,7 +129,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
         // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
         {
           title: "peer coding recurring",
-          slug: "peer-coding-recurring",
+          slug: recurringEventTypeSlug,
           length: 60,
           recurringEvent: { freq: 2, count: 3, interval: 1 },
         },
@@ -354,6 +363,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.uid).toBeDefined();
               expect(data.hosts[0].id).toEqual(user.id);
               expect(data.hosts[0].username).toEqual(user.username);
+              expect(data.hosts[0].email).toEqual(user.email);
               expect(data.status).toEqual("accepted");
               expect(data.start).toEqual(body.start);
               expect(data.end).toEqual(new Date(Date.UTC(2030, 0, 8, 14, 0, 0)).toISOString());
@@ -518,6 +528,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.uid).toEqual(createdBooking.uid);
               expect(data.hosts[0].id).toEqual(user.id);
               expect(data.hosts[0].username).toEqual(user.username);
+              expect(data.hosts[0].email).toEqual(user.email);
               expect(data.status).toEqual(createdBooking.status);
               expect(data.start).toEqual(createdBooking.start);
               expect(data.end).toEqual(createdBooking.end);
@@ -552,6 +563,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.id).toEqual(createdRecurringBooking[0].id);
               expect(data.uid).toEqual(createdRecurringBooking[0].uid);
               expect(data.hosts[0].id).toEqual(user.id);
+              expect(data.hosts[0].username).toEqual(user.username);
+              expect(data.hosts[0].email).toEqual(user.email);
               expect(data.status).toEqual(createdRecurringBooking[0].status);
               expect(data.start).toEqual(createdRecurringBooking[0].start);
               expect(data.end).toEqual(createdRecurringBooking[0].end);
@@ -1021,6 +1034,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.id).toBeDefined();
             expect(data.uid).toBeDefined();
             expect(data.hosts[0].id).toEqual(user.id);
+            expect(data.hosts[0].username).toEqual(user.username);
+            expect(data.hosts[0].email).toEqual(user.email);
             expect(data.status).toEqual(createdBooking.status);
             expect(data.duration).toEqual(createdBooking.duration);
             expect(data.eventTypeId).toEqual(createdBooking.eventTypeId);
@@ -1078,6 +1093,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.id).toBeDefined();
             expect(data.uid).toBeDefined();
             expect(data.hosts[0].id).toEqual(user.id);
+            expect(data.hosts[0].username).toEqual(user.username);
+            expect(data.hosts[0].email).toEqual(user.email);
             expect(data.status).toEqual(createdRecurringBooking[0].status);
             expect(data.start).toEqual(body.start);
             expect(data.end).toEqual(new Date(Date.UTC(2035, 0, 9, 15, 0, 0)).toISOString());
@@ -1158,6 +1175,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.id).toEqual(booking.id);
             expect(data.uid).toEqual(booking.uid);
             expect(data.hosts[0].id).toEqual(user.id);
+            expect(data.hosts[0].username).toEqual(user.username);
+            expect(data.hosts[0].email).toEqual(user.email);
             expect(data.status).toEqual(booking.status);
             expect(data.start).toEqual(booking.start);
             expect(data.end).toEqual(booking.end);
@@ -1190,6 +1209,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.id).toEqual(booking.id);
             expect(data.uid).toEqual(booking.uid);
             expect(data.hosts[0].id).toEqual(user.id);
+            expect(data.hosts[0].username).toEqual(user.username);
+            expect(data.hosts[0].email).toEqual(user.email);
             expect(data.status).toEqual(booking.status);
             expect(data.start).toEqual(booking.start);
             expect(data.end).toEqual(booking.end);
@@ -1228,6 +1249,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.id).toBeDefined();
             expect(data.uid).toBeDefined();
             expect(data.hosts[0].id).toEqual(user.id);
+            expect(data.hosts[0].username).toEqual(user.username);
+            expect(data.hosts[0].email).toEqual(user.email);
             expect(data.status).toEqual("cancelled");
             expect(data.cancellationReason).toEqual(body.cancellationReason);
             expect(data.start).toEqual(rescheduledBooking.start);

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/variable-length-bookings.e2e-spec.ts

@@ -17,6 +17,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
@@ -36,12 +37,13 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let oAuthClient: PlatformOAuthClient;
     let teamRepositoryFixture: TeamRepositoryFixture;
 
-    const userEmail = "bookings-controller-e2e@api.com";
+    const userEmail = `variable-length-bookings-2024-08-13-user-${randomString()}@api.com`;
     let user: User;
 
     let variableLengthEventType: EventType;
-    const variableLengthEventTypeSlug = "variable-length-event";
+    const VARIABLE_LENGTH_EVENT_TYPE_SLUG = `variable-length-bookings-2024-08-13-event-type-${randomString()}`;
     let normalEventType: EventType;
+    const NORMAL_EVENT_TYPE_SLUG = `variable-length-bookings-2024-08-13-event-type-${randomString()}`;
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
@@ -63,7 +65,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      organization = await teamRepositoryFixture.create({
+        name: `variable-length-bookings-2024-08-13-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       user = await userRepositoryFixture.create({
@@ -76,7 +80,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
+        name: `variable-length-bookings-2024-08-13-schedule-${randomString()}`,
         timeZone: "Europe/Rome",
         isDefault: true,
       };
@@ -84,8 +88,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       variableLengthEventType = await eventTypesRepositoryFixture.create(
         {
-          title: "variable length event",
-          slug: variableLengthEventTypeSlug,
+          title: `variable-length-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: VARIABLE_LENGTH_EVENT_TYPE_SLUG,
           length: 15,
           metadata: { multipleDuration: [15, 30, 60] },
         },
@@ -93,7 +97,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
       );
 
       normalEventType = await eventTypesRepositoryFixture.create(
-        { title: "normal event", slug: "normal-event", length: 15 },
+        {
+          title: `variable-length-bookings-2024-08-13-event-type-${randomString()}`,
+          slug: NORMAL_EVENT_TYPE_SLUG,
+          length: 15,
+        },
         user.id
       );
 

apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts

@@ -12,6 +12,7 @@ import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.se
 import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
 import { Logger } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
+import { CreationSource } from "@prisma/client";
 import { Request } from "express";
 import { DateTime } from "luxon";
 import { NextApiRequest } from "next/types";
@@ -97,10 +98,14 @@ export class InputBookingsService_2024_08_13 {
 
     if (oAuthClientParams) {
       Object.assign(newRequest, { userId, ...oAuthClientParams, platformBookingLocation: location });
-      newRequest.body = { ...bodyTransformed, noEmail: !oAuthClientParams.arePlatformEmailsEnabled };
+      newRequest.body = {
+        ...bodyTransformed,
+        noEmail: !oAuthClientParams.arePlatformEmailsEnabled,
+        creationSource: CreationSource.API_V2,
+      };
     } else {
       Object.assign(newRequest, { userId, platformBookingLocation: location });
-      newRequest.body = { ...bodyTransformed, noEmail: false };
+      newRequest.body = { ...bodyTransformed, noEmail: false, creationSource: CreationSource.API_V2 };
     }
 
     return newRequest as unknown as BookingRequest;
@@ -220,6 +225,7 @@ export class InputBookingsService_2024_08_13 {
 
     newRequest.body = bodyTransformed.map((event) => ({
       ...event,
+      creationSource: CreationSource.API_V2,
     }));
 
     return newRequest as unknown as BookingRequest;
@@ -317,10 +323,14 @@ export class InputBookingsService_2024_08_13 {
     const location = await this.getRescheduleBookingLocation(bookingUid);
     if (oAuthClientParams) {
       Object.assign(newRequest, { userId, ...oAuthClientParams, platformBookingLocation: location });
-      newRequest.body = { ...bodyTransformed, noEmail: !oAuthClientParams.arePlatformEmailsEnabled };
+      newRequest.body = {
+        ...bodyTransformed,
+        noEmail: !oAuthClientParams.arePlatformEmailsEnabled,
+        creationSource: CreationSource.API_V2,
+      };
     } else {
       Object.assign(newRequest, { userId, platformBookingLocation: location });
-      newRequest.body = { ...bodyTransformed, noEmail: false };
+      newRequest.body = { ...bodyTransformed, noEmail: false, creationSource: CreationSource.API_V2 };
     }
 
     return newRequest as unknown as BookingRequest;

apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts

@@ -20,6 +20,7 @@ import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.reposit
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { CalendarsServiceMock } from "test/mocks/calendars-service-mock";
 import { IcsCalendarServiceMock } from "test/mocks/ics-calendar-service-mock";
+import { randomString } from "test/utils/randomString";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import {
@@ -71,9 +72,12 @@ describe("Platform Calendars Endpoints", () => {
     teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
     tokensRepositoryFixture = new TokensRepositoryFixture(moduleRef);
     credentialsRepositoryFixture = new CredentialsRepositoryFixture(moduleRef);
-    organization = await teamRepositoryFixture.create({ name: "organization" });
+    organization = await teamRepositoryFixture.create({ name: `calendars-organization-${randomString()}` });
     oAuthClient = await createOAuthClient(organization.id);
-    user = await userRepositoryFixture.createOAuthManagedUser("office365-connect@gmail.com", oAuthClient.id);
+    user = await userRepositoryFixture.createOAuthManagedUser(
+      `calendars-user-${randomString()}@api.com`,
+      oAuthClient.id
+    );
     const tokens = await tokensRepositoryFixture.createTokens(user.id, oAuthClient.id);
     accessTokenSecret = tokens.accessToken;
     refreshTokenSecret = tokens.refreshToken;

apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.e2e-spec.ts

@@ -22,6 +22,7 @@ import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-type
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import {
@@ -77,8 +78,8 @@ describe("Event types Endpoints", () => {
     let teamRepositoryFixture: TeamRepositoryFixture;
     let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
 
-    const userEmail = "event-types-test-e2e@api.com";
-    const name = "bob-the-builder";
+    const userEmail = `event-types-2024-04-15-user-${randomString()}@api.com`;
+    const name = `event-types-2024-04-15-user-${randomString()}`;
     const username = name;
     let eventType: EventType;
     let user: User;
@@ -105,7 +106,9 @@ describe("Event types Endpoints", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
 
-      organization = await teamRepositoryFixture.create({ name: "organization" });
+      organization = await teamRepositoryFixture.create({
+        name: `event-types-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
       user = await userRepositoryFixture.create({
         email: userEmail,
@@ -139,7 +142,7 @@ describe("Event types Endpoints", () => {
     it("should create an event type", async () => {
       const body: CreateEventTypeInput_2024_04_15 = {
         title: "Test Event Type",
-        slug: "test-event-type",
+        slug: `event-types-event-type-${randomString()}`,
         description: "A description of the test event type.",
         length: 60,
         hidden: false,

apps/api/v2/src/ee/event-types/event-types_2024_04_15/outputs/get-event-type-public.output.ts

@@ -399,8 +399,8 @@ class PublicEventTypeOutput {
   workflows!: any[];
 
   @IsArray()
-  @ApiProperty()
-  hosts!: any[];
+  @ApiPropertyOptional()
+  hosts?: any[];
 
   @ValidateNested()
   @Type(() => Owner)
@@ -427,8 +427,8 @@ class PublicEventTypeOutput {
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => User)
-  @ApiProperty({ type: [User] })
-  users!: User[];
+  @ApiPropertyOptional({ type: [User] })
+  users?: User[];
 
   @IsObject()
   @ApiProperty({ type: Object })

apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts

@@ -19,6 +19,7 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo
 import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants";
@@ -86,9 +87,9 @@ describe("Event types Endpoints", () => {
     let schedulesRepostoryFixture: SchedulesRepositoryFixture;
     let profileRepositoryFixture: ProfileRepositoryFixture;
     let membershipsRepositoryFixture: MembershipRepositoryFixture;
-    const userEmail = "event-types-test-e2e@api.com";
-    const falseTestEmail = "false-event-types@api.com";
-    const name = "bob-the-builder";
+    const userEmail = `event-types-2024-06-14-user-${randomString()}@api.com`;
+    const falseTestEmail = `event-types-2024-06-14-false-user-${randomString()}@api.com`;
+    const name = `event-types-2024-06-14-user-${randomString()}`;
     const username = name;
     let eventType: EventTypeOutput_2024_06_14;
     let user: User;
@@ -186,8 +187,8 @@ describe("Event types Endpoints", () => {
       profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
       membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
       organization = await teamRepositoryFixture.create({
-        name: "organization",
-        slug: "event-type-2024-06-14-org-slug",
+        name: `event-types-2024-06-14-organization-${randomString()}`,
+        slug: `event-type-2024-06-14-org-slug-${randomString()}`,
       });
       oAuthClient = await createOAuthClient(organization.id);
       user = await userRepositoryFixture.create({
@@ -197,9 +198,9 @@ describe("Event types Endpoints", () => {
       });
 
       orgUser = await userRepositoryFixture.create({
-        email: "event-types-2024-06-14-org-user@example.com",
-        name: "event-types-2024-06-14-org-user",
-        username: "event-types-2024-06-14-org-user",
+        email: `event-types-2024-06-14-org-user-${randomString()}@example.com`,
+        name: `event-types-2024-06-14-org-user-${randomString()}`,
+        username: `event-types-2024-06-14-org-user-${randomString()}`,
       });
 
       profileRepositoryFixture.create({
@@ -218,17 +219,32 @@ describe("Event types Endpoints", () => {
       });
 
       orgUserEventType1 = await eventTypesRepositoryFixture.create(
-        { title: "orgUserEventType1", slug: "org-event-type-1", length: 60, locations: [] },
+        {
+          title: `event-types-2024-06-14-event-type-${randomString()}`,
+          slug: `event-types-2024-06-14-event-type-${randomString()}`,
+          length: 60,
+          locations: [],
+        },
         orgUser.id
       );
 
       orgUserEventType2 = await eventTypesRepositoryFixture.create(
-        { title: "orgUserEventType2", slug: "org-event-type-2", length: 60, locations: [] },
+        {
+          title: `event-types-2024-06-14-event-type-${randomString()}`,
+          slug: `event-types-2024-06-14-event-type-${randomString()}`,
+          length: 60,
+          locations: [],
+        },
         orgUser.id
       );
 
       orgUserEventType3 = await eventTypesRepositoryFixture.create(
-        { title: "orgUserEventType3", slug: "org-event-type-3", length: 60, locations: [] },
+        {
+          title: `event-types-2024-06-14-event-type-${randomString()}`,
+          slug: `event-types-2024-06-14-event-type-${randomString()}`,
+          length: 60,
+          locations: [],
+        },
         orgUser.id
       );
 
@@ -241,25 +257,25 @@ describe("Event types Endpoints", () => {
 
       falseTestUser = await userRepositoryFixture.create({
         email: falseTestEmail,
-        name: "false-test",
+        name: `event-types-2024-06-14-false-test-user-${randomString()}`,
         username: falseTestEmail,
       });
 
       firstSchedule = await schedulesRepostoryFixture.create({
         userId: user.id,
-        name: "work",
+        name: `event-types-2024-06-14-schedule-work-${randomString()}`,
         timeZone: "Europe/Rome",
       });
 
       secondSchedule = await schedulesRepostoryFixture.create({
         userId: user.id,
-        name: "chill",
+        name: `event-types-2024-06-14-schedule-chill-${randomString()}`,
         timeZone: "Europe/Rome",
       });
 
       falseTestSchedule = await schedulesRepostoryFixture.create({
         userId: falseTestUser.id,
-        name: "work",
+        name: `event-types-2024-06-14-schedule-work-${randomString()}`,
         timeZone: "Europe/Rome",
       });
 
@@ -1221,7 +1237,9 @@ describe("Event types Endpoints", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
 
-      organization = await teamRepositoryFixture.create({ name: "organization" });
+      organization = await teamRepositoryFixture.create({
+        name: `event-types-2024-06-14-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
       user = await userRepositoryFixture.create({
         email: userEmail,
@@ -1708,7 +1726,9 @@ describe("Event types Endpoints", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
 
-      organization = await teamRepositoryFixture.create({ name: "organization" });
+      organization = await teamRepositoryFixture.create({
+        name: `event-types-2024-06-14-organization-${randomString()}`,
+      });
       oAuthClient = await createOAuthClient(organization.id);
       user = await userRepositoryFixture.create({
         email: userEmail,

apps/api/v2/src/ee/me/me.controller.e2e-spec.ts

@@ -15,6 +15,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -29,7 +30,7 @@ describe("Me Endpoints", () => {
     let schedulesRepositoryFixture: SchedulesRepositoryFixture;
     let profilesRepositoryFixture: ProfileRepositoryFixture;
     let organizationsRepositoryFixture: OrganizationRepositoryFixture;
-    const userEmail = "me-controller-e2e@api.com";
+    const userEmail = `me-controller-user-${randomString()}@api.com`;
     let user: User;
     let org: Team;
 
@@ -58,7 +59,7 @@ describe("Me Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test org team",
+        name: `me-controller-organization-${randomString()}`,
         isOrganization: true,
         isPlatform: true,
       });

apps/api/v2/src/ee/schedules/schedules_2024_04_15/controllers/schedules.controller.e2e-spec.ts

@@ -16,6 +16,7 @@ import { User } from "@prisma/client";
 import * as request from "supertest";
 import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_04_15 } from "@calcom/platform-constants";
@@ -28,10 +29,11 @@ describe("Schedules Endpoints", () => {
     let userRepositoryFixture: UserRepositoryFixture;
     let scheduleRepositoryFixture: SchedulesRepositoryFixture;
 
-    const userEmail = "schedules-controller-e2e@api.com";
+    const userEmail = `schedules-2024-04-15-user-${randomString()}@api.com`;
     let user: User;
 
     let createdSchedule: CreateScheduleOutput_2024_04_15["data"];
+    const scheduleName = `schedules-2024-04-15-schedule-${randomString()}`;
     const defaultAvailabilityDays = [1, 2, 3, 4, 5];
     const defaultAvailabilityStartTime = "1970-01-01T09:00:00.000Z";
     const defaultAvailabilityEndTime = "1970-01-01T17:00:00.000Z";
@@ -67,7 +69,6 @@ describe("Schedules Endpoints", () => {
     });
 
     it("should not create an invalid schedule", async () => {
-      const scheduleName = "schedule-name";
       const scheduleTimeZone = "Europe/Rome";
       const isDefault = true;
 
@@ -98,13 +99,11 @@ describe("Schedules Endpoints", () => {
     });
 
     it("should create a default schedule", async () => {
-      const scheduleName = "schedule-name";
-      const scheduleTimeZone = "Europe/Rome";
       const isDefault = true;
 
       const body: CreateScheduleInput_2024_04_15 = {
         name: scheduleName,
-        timeZone: scheduleTimeZone,
+        timeZone: "Europe/Rome",
         isDefault,
       };
 
@@ -118,7 +117,7 @@ describe("Schedules Endpoints", () => {
           expect(responseData.status).toEqual(SUCCESS_STATUS);
           expect(responseData.data).toBeDefined();
           expect(responseData.data.isDefault).toEqual(isDefault);
-          expect(responseData.data.timeZone).toEqual(scheduleTimeZone);
+          expect(responseData.data.timeZone).toEqual("Europe/Rome");
           expect(responseData.data.name).toEqual(scheduleName);
 
           const schedule = responseData.data.schedule;
@@ -177,7 +176,7 @@ describe("Schedules Endpoints", () => {
     });
 
     it("should update schedule name", async () => {
-      const newScheduleName = "new-schedule-name";
+      const newScheduleName = `schedules-2024-04-15-schedule-${randomString()}`;
 
       const body: UpdateScheduleInput_2024_04_15 = {
         name: newScheduleName,

apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.e2e-spec.ts

@@ -32,11 +32,11 @@ describe("Schedules Endpoints", () => {
     let userRepositoryFixture: UserRepositoryFixture;
     let scheduleRepositoryFixture: SchedulesRepositoryFixture;
 
-    const userEmail = "schedules-controller-e2e@api.com";
+    const userEmail = `schedules-2024-06-11-user@api.com`;
     let user: User;
 
     const createScheduleInput: CreateScheduleInput_2024_06_11 = {
-      name: "work",
+      name: `schedules-2024-06-11-work`,
       timeZone: "Europe/Rome",
       isDefault: true,
     };

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.e2e-spec.ts

@@ -23,6 +23,7 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.
 import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { MockedRedisService } from "test/mocks/mock-redis-service";
+import { randomString } from "test/utils/randomString";
 
 import { X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
 
@@ -39,9 +40,9 @@ describe("ApiAuthStrategy", () => {
   let oAuthClientRepositoryFixture: OAuthClientRepositoryFixture;
   let profilesRepositoryFixture: ProfileRepositoryFixture;
 
-  const validApiKeyEmail = "api-key-user-email@example.com";
-  const validAccessTokenEmail = "access-token-user-email@example.com";
-  const validOAuthEmail = "oauth-user@example.com";
+  const validApiKeyEmail = `api-auth-api-key-user-${randomString()}@api.com`;
+  const validAccessTokenEmail = `api-auth-access-token-user-${randomString()}@api.com`;
+  const validOAuthEmail = `api-auth-oauth-user-${randomString()}@api.com`;
 
   let validApiKeyUser: User;
   let validAccessTokenUser: User;
@@ -83,7 +84,7 @@ describe("ApiAuthStrategy", () => {
     teamRepositoryFixture = new TeamRepositoryFixture(module);
     oAuthClientRepositoryFixture = new OAuthClientRepositoryFixture(module);
     profilesRepositoryFixture = new ProfileRepositoryFixture(module);
-    organization = await teamRepositoryFixture.create({ name: "organization" });
+    organization = await teamRepositoryFixture.create({ name: `api-auth-organization-${randomString()}` });
     validApiKeyUser = await userRepositoryFixture.create({
       email: validApiKeyEmail,
     });

apps/api/v2/src/modules/billing/controllers/billing.controller.e2e-spec.ts

@@ -16,13 +16,14 @@ import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-cli
 import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { Team, PlatformOAuthClient, PlatformBilling } from "@calcom/prisma/client";
 
 describe("Platform Billing Controller (e2e)", () => {
   let app: INestApplication;
-  const userEmail = "platform-billing-controller-e2e@api.com";
+  const userEmail = `billing-user-${randomString()}@api.com`;
   let user: UserWithProfile;
   let billing: PlatformBilling;
   let userRepositoryFixture: UserRepositoryFixture;
@@ -47,7 +48,9 @@ describe("Platform Billing Controller (e2e)", () => {
     oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
     membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
     platformBillingRepositoryFixture = new PlatformBillingRepositoryFixture(moduleRef);
-    organization = await organizationsRepositoryFixture.create({ name: "platform billing" });
+    organization = await organizationsRepositoryFixture.create({
+      name: `billing-organization-${randomString()}`,
+    });
 
     user = await userRepositoryFixture.create({
       email: userEmail,

apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.e2e-spec.ts

@@ -11,6 +11,7 @@ import { User } from "@prisma/client";
 import * as request from "supertest";
 import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import {
@@ -30,7 +31,7 @@ describe("Conferencing Endpoints", () => {
     let userRepositoryFixture: UserRepositoryFixture;
     let credentialsRepositoryFixture: CredentialsRepositoryFixture;
 
-    const userEmail = "conferencing-controller-user-e2e@api.com";
+    const userEmail = `conferencing-user-${randomString()}@api.com`;
     let user: User;
 
     beforeAll(async () => {

apps/api/v2/src/modules/destination-calendars/controllers/destination-calendars.controller.e2e-spec.ts

@@ -17,6 +17,7 @@ import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-cli
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 
 import { APPLE_CALENDAR_TYPE, APPLE_CALENDAR_ID } from "@calcom/platform-constants";
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -55,9 +56,14 @@ describe("Platform Destination Calendar Endpoints", () => {
     teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
     tokensRepositoryFixture = new TokensRepositoryFixture(moduleRef);
     credentialsRepositoryFixture = new CredentialsRepositoryFixture(moduleRef);
-    organization = await teamRepositoryFixture.create({ name: "organization" });
+    organization = await teamRepositoryFixture.create({
+      name: `destination-calendars-organization-${randomString()}`,
+    });
     oAuthClient = await createOAuthClient(organization.id);
-    user = await userRepositoryFixture.createOAuthManagedUser("office365-connect@gmail.com", oAuthClient.id);
+    user = await userRepositoryFixture.createOAuthManagedUser(
+      `destination-calendars-user-${randomString()}@api.com`,
+      oAuthClient.id
+    );
     const tokens = await tokensRepositoryFixture.createTokens(user.id, oAuthClient.id);
     accessTokenSecret = tokens.accessToken;
     refreshTokenSecret = tokens.refreshToken;

apps/api/v2/src/modules/endpoints.module.ts

@@ -4,6 +4,7 @@ import { BillingModule } from "@/modules/billing/billing.module";
 import { ConferencingModule } from "@/modules/conferencing/conferencing.module";
 import { DestinationCalendarsModule } from "@/modules/destination-calendars/destination-calendars.module";
 import { OAuthClientModule } from "@/modules/oauth-clients/oauth-client.module";
+import { RouterModule } from "@/modules/router/router.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
 import { TimezoneModule } from "@/modules/timezones/timezones.module";
 import type { MiddlewareConsumer, NestModule } from "@nestjs/common";
@@ -24,6 +25,7 @@ import { WebhooksModule } from "./webhooks/webhooks.module";
     AtomsModule,
     StripeModule,
     ConferencingModule,
+    RouterModule,
   ],
 })
 export class EndpointsModule implements NestModule {

apps/api/v2/src/modules/event-types/controllers/event-types-webhooks.controller.e2e-spec.ts

@@ -17,13 +17,14 @@ import * as request from "supertest";
 import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { EventType, Webhook } from "@calcom/prisma/client";
 
 describe("EventTypes WebhooksController (e2e)", () => {
   let app: INestApplication;
-  const userEmail = "event-types-webhook-controller-e2e@api.com";
+  const userEmail = `event-types-webhooks-user-${randomString()}@api.com`;
   let user: UserWithProfile;
   let otherUser: UserWithProfile;
   let eventType: EventType;
@@ -55,14 +56,14 @@ describe("EventTypes WebhooksController (e2e)", () => {
     });
 
     otherUser = await userRepositoryFixture.create({
-      email: "other-user-webhook-controller@api.com",
-      username: "other-user-webhook-controller@api.com",
+      email: `event-types-webhooks-other-user-${randomString()}@api.com`,
+      username: `event-types-webhooks-other-user-${randomString()}@api.com`,
     });
 
     eventType = await eventTypeRepositoryFixture.create(
       {
         title: "Event Type 1",
-        slug: "webhook-event-type-1",
+        slug: `event-types-webhooks-event-type-${randomString()}`,
         length: 60,
       },
       user.id
@@ -71,7 +72,7 @@ describe("EventTypes WebhooksController (e2e)", () => {
     eventType2 = await eventTypeRepositoryFixture.create(
       {
         title: "Event Type 2",
-        slug: "webhook-event-type-2",
+        slug: `event-types-webhooks-event-type-${randomString()}`,
         length: 60,
       },
       user.id
@@ -80,7 +81,7 @@ describe("EventTypes WebhooksController (e2e)", () => {
     otherEventType = await eventTypeRepositoryFixture.create(
       {
         title: "Other Event Type ",
-        slug: "other-webhook-event-type",
+        slug: `event-types-webhooks-other-event-type-${randomString()}`,
         length: 60,
       },
       otherUser.id

apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts

@@ -22,6 +22,7 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo
 import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import { ApiSuccessResponse } from "@calcom/platform-types";
@@ -84,10 +85,10 @@ describe("OAuth Client Users Endpoints", () => {
 
     let postResponseData: CreateManagedUserOutput["data"];
 
-    const platformAdminEmail = "platform-sensei@mail.com";
+    const platformAdminEmail = `oauth-client-users-admin-${randomString()}@api.com`;
     let platformAdmin: User;
 
-    const userEmail = "oauth-client-user@gmail.com";
+    const userEmail = `oauth-client-users-user-${randomString()}@api.com`;
     const userTimeZone = "Europe/Rome";
 
     beforeAll(async () => {
@@ -110,7 +111,7 @@ describe("OAuth Client Users Endpoints", () => {
       platformAdmin = await userRepositoryFixture.create({ email: platformAdminEmail });
 
       organization = await teamRepositoryFixture.create({
-        name: "organization",
+        name: `oauth-client-users-organization-${randomString()}`,
         isPlatform: true,
         isOrganization: true,
       });
@@ -392,7 +393,7 @@ describe("OAuth Client Users Endpoints", () => {
     let membershipsRepositoryFixture: MembershipRepositoryFixture;
     let postResponseData: CreateManagedUserOutput["data"];
 
-    const userEmail = "oauth-client-users-user@gmail.com";
+    const userEmail = `oauth-client-users-user-${randomString()}@api.com`;
     const userTimeZone = "Europe/Rome";
 
     beforeAll(async () => {
@@ -411,20 +412,20 @@ describe("OAuth Client Users Endpoints", () => {
       profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
       membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
       organization = await teamRepositoryFixture.create({
-        name: "Testy Organization",
-        isOrganization: true,
+        name: `oauth-client-users-organization-${randomString()}`,
         isPlatform: true,
+        isOrganization: true,
       });
 
       owner = await userRepositoryFixture.create({
-        email: userEmail,
-        username: userEmail,
+        email: `oauth-client-users-admin-${randomString()}@api.com`,
+        username: `oauth-client-users-admin-${randomString()}@api.com`,
         organization: { connect: { id: organization.id } },
       });
 
       await profileRepositoryFixture.create({
         uid: `usr-${owner.id}`,
-        username: userEmail,
+        username: `oauth-client-users-admin-${randomString()}@api.com`,
         organization: {
           connect: {
             id: organization.id,

apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts

@@ -20,14 +20,15 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withNextAuth } from "test/utils/withNextAuth";
 
 import { PlatformOAuthClient, Team, Webhook } from "@calcom/prisma/client";
 
 describe("OAuth client WebhooksController (e2e)", () => {
   let app: INestApplication;
-  const userEmail = "oauth-client-webhook-controller-e2e@api.com";
-  const otherUserEmail = "other-oauth-client-webhook-controller-e2e@api.com";
+  const userEmail = `oauth-client-webhooks-user-${randomString()}@api.com`;
+  const otherUserEmail = `oauth-client-webhooks-other-user-${randomString()}@api.com`;
   let user: UserWithProfile;
   let otherUser: UserWithProfile;
   let oAuthClient: PlatformOAuthClient;
@@ -69,7 +70,7 @@ describe("OAuth client WebhooksController (e2e)", () => {
     });
 
     org = await orgRepositoryFixture.create({
-      name: "apiOrg",
+      name: `oauth-client-webhooks-organization-${randomString()}`,
       isOrganization: true,
       metadata: {
         isOrganization: true,
@@ -80,7 +81,7 @@ describe("OAuth client WebhooksController (e2e)", () => {
       isPlatform: true,
     });
     otherOrg = await orgRepositoryFixture.create({
-      name: "otherOrg",
+      name: `oauth-client-webhooks-other-organization-${randomString()}`,
       isOrganization: true,
       metadata: {
         isOrganization: true,

apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts

@@ -18,6 +18,7 @@ import { MembershipRepositoryFixture } from "test/fixtures/repository/membership
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { NextAuthMockStrategy } from "test/mocks/next-auth-mock.strategy";
+import { randomString } from "test/utils/randomString";
 import { withNextAuth } from "test/utils/withNextAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -68,7 +69,7 @@ describe("OAuth Clients Endpoints", () => {
     let user: User;
     let org: Team;
     let app: INestApplication;
-    const userEmail = "oauth-clients-test-e2e@api.com";
+    const userEmail = `oauth-clients-user-${randomString()}@api.com`;
 
     beforeAll(async () => {
       const moduleRef = await withNextAuth(
@@ -89,7 +90,7 @@ describe("OAuth Clients Endpoints", () => {
         email: userEmail,
       });
       org = await teamFixtures.create({
-        name: "apiOrg",
+        name: `oauth-clients-organization-${randomString()}`,
         isOrganization: true,
         metadata: {
           isOrganization: true,
@@ -126,7 +127,7 @@ describe("OAuth Clients Endpoints", () => {
     let user: User;
     let org: Team;
     let app: INestApplication;
-    const userEmail = "test-e2e@api.com";
+    const userEmail = `oauth-clients-user-${randomString()}@api.com`;
 
     beforeAll(async () => {
       const moduleRef = await withNextAuth(
@@ -147,7 +148,7 @@ describe("OAuth Clients Endpoints", () => {
         email: userEmail,
       });
       org = await teamFixtures.create({
-        name: "apiOrg",
+        name: `oauth-clients-organization-${randomString()}`,
         isOrganization: true,
         metadata: {
           isOrganization: true,
@@ -211,7 +212,7 @@ describe("OAuth Clients Endpoints", () => {
     describe("User is part of an organization as Admin", () => {
       let membership: Membership;
       let client: { clientId: string; clientSecret: string };
-      const oAuthClientName = "test-oauth-client-admin";
+      const oAuthClientName = `oauth-clients-admin-${randomString()}`;
 
       beforeAll(async () => {
         membership = await membershipFixtures.addUserToOrg(user, org, "ADMIN", true);
@@ -264,7 +265,7 @@ describe("OAuth Clients Endpoints", () => {
           });
       });
       it(`/PUT/:id`, () => {
-        const clientUpdatedName = "test-oauth-client-updated";
+        const clientUpdatedName = `oauth-clients-admin-updated-${randomString()}`;
         const body: UpdateOAuthClientInput = { name: clientUpdatedName };
         return request(app.getHttpServer())
           .patch(`/api/v2/oauth-clients/${client.clientId}`)
@@ -289,7 +290,7 @@ describe("OAuth Clients Endpoints", () => {
     describe("User is part of an organization as Owner", () => {
       let membership: Membership;
       let client: { clientId: string; clientSecret: string };
-      const oAuthClientName = "test-oauth-client-owner";
+      const oAuthClientName = `oauth-clients-owner-${randomString()}`;
       const oAuthClientPermissions = 32;
 
       beforeAll(async () => {
@@ -346,7 +347,7 @@ describe("OAuth Clients Endpoints", () => {
           });
       });
       it(`/PUT/:id`, () => {
-        const clientUpdatedName = "test-oauth-client-updated";
+        const clientUpdatedName = `oauth-clients-owner-updated-${randomString()}`;
         const body: UpdateOAuthClientInput = { name: clientUpdatedName };
         return request(app.getHttpServer())
           .patch(`/api/v2/oauth-clients/${client.clientId}`)

apps/api/v2/src/modules/oauth-clients/controllers/oauth-flow/oauth-flow.controller.e2e-spec.ts

@@ -19,6 +19,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withNextAuth } from "test/utils/withNextAuth";
 
 import { X_CAL_SECRET_KEY } from "@calcom/platform-constants";
@@ -70,7 +71,7 @@ describe("OAuthFlow Endpoints", () => {
     let refreshToken: string;
 
     beforeAll(async () => {
-      const userEmail = "developer@platform.com";
+      const userEmail = `oauth-flow-user-${randomString()}@api.com`;
 
       const moduleRef: TestingModule = await withNextAuth(
         userEmail,
@@ -92,7 +93,9 @@ describe("OAuthFlow Endpoints", () => {
         email: userEmail,
       });
 
-      organization = await organizationsRepositoryFixture.create({ name: "organization" });
+      organization = await organizationsRepositoryFixture.create({
+        name: `oauth-flow-organization-${randomString()}`,
+      });
       await profilesRepositoryFixture.create({
         uid: "asd-asd",
         username: userEmail,

apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts

@@ -6,7 +6,7 @@ import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-us
 import { UpdateManagedUserInput } from "@/modules/users/inputs/update-managed-user.input";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, ConflictException, Injectable } from "@nestjs/common";
-import { User } from "@prisma/client";
+import { User, CreationSource } from "@prisma/client";
 
 import { createNewUsersConnectToOrgIfExists, slugify } from "@calcom/platform-libraries";
 
@@ -46,6 +46,7 @@ export class OAuthClientUsersService {
               role: "MEMBER",
             },
           ],
+          creationSource: CreationSource.API_V2,
           teamId: organizationId,
           isOrg: true,
           parentId: null,

apps/api/v2/src/modules/organizations/controllers/attributes/organization-attributes-options.e2e-spec.ts

@@ -14,6 +14,7 @@ import { AttributeRepositoryFixture } from "test/fixtures/repository/attributes.
 import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
 import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -26,7 +27,7 @@ describe("Organizations Attributes Options Endpoints", () => {
     let organizationsRepositoryFixture: OrganizationRepositoryFixture;
     let membershipFixtures: MembershipRepositoryFixture;
 
-    const userEmail = "member@attributes-options-api.com";
+    const userEmail = `organization-attributes-options-member-${randomString()}@api.com`;
     let user: User;
     let org: Team;
     let membership: Membership;
@@ -45,7 +46,7 @@ describe("Organizations Attributes Options Endpoints", () => {
       membershipFixtures = new MembershipRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "AttributesOptionsCorp",
+        name: `organization-attributes-options-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -97,7 +98,7 @@ describe("Organizations Attributes Options Endpoints", () => {
     let membershipFixtures: MembershipRepositoryFixture;
     let attributeRepositoryFixture: AttributeRepositoryFixture;
 
-    const userEmail = "admin@attributes-options-api.com";
+    const userEmail = `organization-attributes-options-admin-${randomString()}@api.com`;
     let user: User;
     let org: Team;
     let membership: Membership;
@@ -123,7 +124,7 @@ describe("Organizations Attributes Options Endpoints", () => {
       attributeRepositoryFixture = new AttributeRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "AttributesOptionsCorp",
+        name: `organization-attributes-options-admin-organization-${randomString()}`,
         isOrganization: true,
       });
 

apps/api/v2/src/modules/organizations/controllers/attributes/organization-attributes.e2e-spec.ts

@@ -12,6 +12,7 @@ import * as request from "supertest";
 import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
 import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -24,7 +25,7 @@ describe("Organizations Attributes Endpoints", () => {
     let organizationsRepositoryFixture: OrganizationRepositoryFixture;
     let membershipFixtures: MembershipRepositoryFixture;
 
-    const userEmail = "member@attributes-api.com";
+    const userEmail = `organization-attributes-member-${randomString()}@api.com`;
     let user: User;
     let org: Team;
     let membership: Membership;
@@ -42,7 +43,7 @@ describe("Organizations Attributes Endpoints", () => {
       membershipFixtures = new MembershipRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "AttributesCorp",
+        name: `organization-attributes-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -88,7 +89,7 @@ describe("Organizations Attributes Endpoints", () => {
     let organizationsRepositoryFixture: OrganizationRepositoryFixture;
     let membershipFixtures: MembershipRepositoryFixture;
 
-    const userEmail = "admin@attributes-api.com";
+    const userEmail = `organization-attributes-admin-${randomString()}@api.com`;
     let user: User;
     let org: Team;
     let membership: Membership;
@@ -116,7 +117,7 @@ describe("Organizations Attributes Endpoints", () => {
       membershipFixtures = new MembershipRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "AttributesCorp",
+        name: `organization-attributes-admin-organization-${randomString()}`,
         isOrganization: true,
       });
 

apps/api/v2/src/modules/organizations/controllers/event-types/organizations-event-types.controller.ts

@@ -149,10 +149,14 @@ export class OrganizationsEventTypesController {
     @Param("teamId", ParseIntPipe) teamId: number,
     @Query() queryParams: GetTeamEventTypesQuery_2024_06_14
   ): Promise<GetTeamEventTypesOutput> {
-    const { eventSlug } = queryParams;
+    const { eventSlug, hostsLimit } = queryParams;
 
     if (eventSlug) {
-      const eventType = await this.organizationsEventTypesService.getTeamEventTypeBySlug(teamId, eventSlug);
+      const eventType = await this.organizationsEventTypesService.getTeamEventTypeBySlug(
+        teamId,
+        eventSlug,
+        hostsLimit
+      );
 
       return {
         status: SUCCESS_STATUS,

apps/api/v2/src/modules/organizations/controllers/event-types/organizations-event-types.e2e-spec.ts

@@ -14,6 +14,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -48,12 +49,12 @@ describe("Organizations Event Types Endpoints", () => {
     let falseTestOrg: Team;
     let falseTestTeam: Team;
 
-    const userEmail = "org-admin-event-types-controller-e222e@api.com";
+    const userEmail = `organizations-event-types-admin-${randomString()}@api.com`;
     let userAdmin: User;
 
-    const teammate1Email = "teammate111@team.com";
-    const teammate2Email = "teammate221@team.com";
-    const falseTestUserEmail = "false-user@false-team.com";
+    const teammate1Email = `organizations-event-types-teammate1-${randomString()}@api.com`;
+    const teammate2Email = `organizations-event-types-teammate2-${randomString()}@api.com`;
+    const falseTestUserEmail = `organizations-event-types-false-user-${randomString()}@api.com`;
     let teammate1: User;
     let teammate2: User;
     let falseTestUser: User;
@@ -98,23 +99,23 @@ describe("Organizations Event Types Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization",
+        name: `organizations-event-types-organization-${randomString()}`,
         isOrganization: true,
       });
 
       falseTestOrg = await organizationsRepositoryFixture.create({
-        name: "False test org",
+        name: `organizations-event-types-false-org-${randomString()}`,
         isOrganization: true,
       });
 
       team = await teamsRepositoryFixture.create({
-        name: "Test org team",
+        name: `organizations-event-types-team-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
 
       falseTestTeam = await teamsRepositoryFixture.create({
-        name: "Outside org team",
+        name: `organizations-event-types-false-team-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: falseTestOrg.id } },
       });
@@ -237,7 +238,7 @@ describe("Organizations Event Types Endpoints", () => {
       const body: CreateTeamEventTypeInput_2024_06_14 = {
         successRedirectUrl: "https://masterchief.com/argentina/flan/video/1234",
         title: "Coding consultation collective",
-        slug: "coding-consultation collective",
+        slug: `organizations-event-types-collective-${randomString()}`,
         description: "Our team will review your codebase.",
         lengthInMinutes: 60,
         locations: [
@@ -343,7 +344,7 @@ describe("Organizations Event Types Endpoints", () => {
     it("should create a managed team event-type", async () => {
       const body: CreateTeamEventTypeInput_2024_06_14 = {
         title: "Coding consultation managed",
-        slug: "coding-consultation-managed",
+        slug: `organizations-event-types-managed-${randomString()}`,
         description: "Our team will review your codebase.",
         lengthInMinutes: 60,
         locations: [
@@ -751,10 +752,10 @@ describe("Organizations Event Types Endpoints", () => {
     it("should return event type with default bookingFields if they are not defined", async () => {
       const eventTypeInput = {
         title: "unknown field event type two",
+        slug: `organizations-event-types-unknown-${randomString()}`,
         description: "unknown field event type description two",
         length: 40,
         hidden: false,
-        slug: "unknown-field-type-two",
         locations: [],
         schedulingType: SchedulingType.ROUND_ROBIN,
       };

apps/api/v2/src/modules/organizations/controllers/memberships/organizations-membership.controller.e2e-spec.ts

@@ -14,6 +14,7 @@ import { MembershipRepositoryFixture } from "test/fixtures/repository/membership
 import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -33,10 +34,9 @@ describe("Organizations Memberships Endpoints", () => {
     let membership2: Membership;
     let membershipCreatedViaApi: Membership;
 
-    const userEmail = "org-admin-membership-controller-e2e@api.com";
-    const userEmail2 = "org-member-membership-controller-e2e@api.com";
-
-    const invitedUserEmail = "org-member-invited-membership-controller-e2e@api.com";
+    const userEmail = `organizations-memberships-admin-${randomString()}@api.com`;
+    const userEmail2 = `organizations-memberships-member-${randomString()}@api.com`;
+    const invitedUserEmail = `organizations-memberships-invited-${randomString()}@api.com`;
 
     let user: User;
     let user2: User;
@@ -70,7 +70,7 @@ describe("Organizations Memberships Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization",
+        name: `organizations-memberships-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -217,7 +217,7 @@ describe("Organizations Memberships Endpoints", () => {
     let org: Team;
     let membership: Membership;
 
-    const userEmail = "org-member-memberships-controller-e2e@api.com";
+    const userEmail = `organizations-memberships-member-${randomString()}@api.com`;
     let user: User;
 
     beforeAll(async () => {
@@ -238,7 +238,7 @@ describe("Organizations Memberships Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization",
+        name: `organizations-memberships-organization-${randomString()}`,
         isOrganization: true,
       });
 

apps/api/v2/src/modules/organizations/controllers/schedules/organizations-schedules.e2e-spec.ts

@@ -12,6 +12,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -35,7 +36,7 @@ describe("Organizations Schedules Endpoints", () => {
     let organizationsRepositoryFixture: OrganizationRepositoryFixture;
     let membershipFixtures: MembershipRepositoryFixture;
 
-    const userEmail = "mr-robot@schedules-api.com";
+    const userEmail = `organizations-schedules-member-${randomString()}@api.com`;
     let user: User;
     let org: Team;
     let membership: Membership;
@@ -53,7 +54,7 @@ describe("Organizations Schedules Endpoints", () => {
       membershipFixtures = new MembershipRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "Ecorp",
+        name: `organizations-schedules-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -115,12 +116,15 @@ describe("Organizations Schedules Endpoints", () => {
     let membershipFixtures: MembershipRepositoryFixture;
     let profileRepositoryFixture: ProfileRepositoryFixture;
 
-    const userEmail = "mr-robot@schedules-api.com";
-    const username = "mr-robot";
+    const userEmail = `organizations-schedules-admin-${randomString()}@api.com`;
+    const userEmail2 = `organizations-schedules-member-${randomString()}@api.com`;
     let user: User;
+    let user2: User;
     let org: Team;
-    let profile: Profile;
     let membership: Membership;
+    let membership2: Membership;
+    let profile: Profile;
+    let profile2: Profile;
 
     let createdSchedule: ScheduleOutput_2024_06_11;
 
@@ -152,7 +156,7 @@ describe("Organizations Schedules Endpoints", () => {
       profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "Ecorp",
+        name: `organizations-schedules-admin-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -164,7 +168,7 @@ describe("Organizations Schedules Endpoints", () => {
 
       profile = await profileRepositoryFixture.create({
         uid: `usr-${user.id}`,
-        username: username,
+        username: userEmail,
         organization: {
           connect: {
             id: org.id,

apps/api/v2/src/modules/organizations/controllers/teams/memberships/organizations-teams-memberships.controller.e2e-spec.ts

@@ -17,6 +17,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -44,11 +45,10 @@ describe("Organizations Teams Memberships Endpoints", () => {
     let membership2: Membership;
     let membershipCreatedViaApi: OrgTeamMembershipOutputDto;
 
-    const userEmail = "org-admin-membership-teams-controller-e2e@api.com";
-    const userEmail2 = "org-member-membership-teams-controller-e2e@api.com";
-    const nonOrgUserEmail = "non-org-member-membership-teams-controller-e2e@api.com";
-
-    const invitedUserEmail = "org-member-invited-membership-teams-controller-e2e@api.com";
+    const userEmail = `organizations-teams-memberships-admin-${randomString()}@api.com`;
+    const userEmail2 = `organizations-teams-memberships-member-${randomString()}@api.com`;
+    const nonOrgUserEmail = `organizations-teams-memberships-non-org-${randomString()}@api.com`;
+    const invitedUserEmail = `organizations-teams-memberships-invited-${randomString()}@api.com`;
 
     let user: User;
     let user2: User;
@@ -92,12 +92,12 @@ describe("Organizations Teams Memberships Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization",
+        name: `organizations-teams-memberships-organization-${randomString()}`,
         isOrganization: true,
       });
 
       orgTeam = await teamsRepositoryFixture.create({
-        name: "Org Team",
+        name: `organizations-teams-memberships-team-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
@@ -129,7 +129,7 @@ describe("Organizations Teams Memberships Endpoints", () => {
       });
 
       nonOrgTeam = await teamsRepositoryFixture.create({
-        name: "Non Org Team",
+        name: `organizations-teams-memberships-non-org-team-${randomString()}`,
         isOrganization: false,
       });
 

apps/api/v2/src/modules/organizations/controllers/teams/organizations-teams.controller.e2e-spec.ts

@@ -15,6 +15,7 @@ import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-cli
 import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
@@ -36,7 +37,7 @@ describe("Organizations Team Endpoints", () => {
     let teamCreatedViaApi: Team;
     let teamCreatedViaApi2: Team;
 
-    const userEmail = "org-admin-teams-controller-e2e@api.com";
+    const userEmail = `organizations-teams-admin-${randomString()}@api.com`;
     let user: User;
 
     beforeAll(async () => {
@@ -58,7 +59,7 @@ describe("Organizations Team Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization",
+        name: `organizations-teams-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -69,13 +70,13 @@ describe("Organizations Team Endpoints", () => {
       });
 
       team = await teamsRepositoryFixture.create({
-        name: "Test org team",
+        name: `organizations-teams-team1-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
 
       team2 = await teamsRepositoryFixture.create({
-        name: "Test org team 2",
+        name: `organizations-teams-team2-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
@@ -133,10 +134,11 @@ describe("Organizations Team Endpoints", () => {
     });
 
     it("should create the team of the org", async () => {
+      const teamName = `organizations-teams-api-team1-${randomString()}`;
       return request(app.getHttpServer())
         .post(`/v2/organizations/${org.id}/teams`)
         .send({
-          name: "Team created via API",
+          name: teamName,
           slug: "team-created-via-api",
           bio: "This is our test team created via API",
         } satisfies CreateOrgTeamDto)
@@ -145,7 +147,7 @@ describe("Organizations Team Endpoints", () => {
           const responseBody: ApiSuccessResponse<Team> = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           teamCreatedViaApi = responseBody.data;
-          expect(teamCreatedViaApi.name).toEqual("Team created via API");
+          expect(teamCreatedViaApi.name).toEqual(teamName);
           expect(teamCreatedViaApi.slug).toEqual("team-created-via-api");
           expect(teamCreatedViaApi.bio).toEqual("This is our test team created via API");
           expect(teamCreatedViaApi.parentId).toEqual(org.id);
@@ -171,10 +173,11 @@ describe("Organizations Team Endpoints", () => {
     });
 
     it("should update the team of the org", async () => {
+      const updatedTeamName = `organizations-teams-api-team1-${randomString()}-updated`;
       return request(app.getHttpServer())
         .patch(`/v2/organizations/${org.id}/teams/${teamCreatedViaApi.id}`)
         .send({
-          name: "Team created via API Updated",
+          name: updatedTeamName,
           weekStart: "Monday",
           logoUrl: "https://i.cal.com/api/avatar/b0b58752-68ad-4c0d-8024-4fa382a77752.png",
           bannerUrl: "https://i.cal.com/api/avatar/949be534-7a88-4185-967c-c020b0c0bef3.png",
@@ -184,7 +187,7 @@ describe("Organizations Team Endpoints", () => {
           const responseBody: ApiSuccessResponse<Team> = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           teamCreatedViaApi = responseBody.data;
-          expect(teamCreatedViaApi.name).toEqual("Team created via API Updated");
+          expect(teamCreatedViaApi.name).toEqual(updatedTeamName);
           expect(teamCreatedViaApi.weekStart).toEqual("Monday");
           expect(teamCreatedViaApi.logoUrl).toEqual(
             "https://i.cal.com/api/avatar/b0b58752-68ad-4c0d-8024-4fa382a77752.png"
@@ -219,10 +222,11 @@ describe("Organizations Team Endpoints", () => {
     });
 
     it("should create the team of the org without auto-accepting creator", async () => {
+      const teamName = `organizations-teams-api-team2-${randomString()}`;
       return request(app.getHttpServer())
         .post(`/v2/organizations/${org.id}/teams`)
         .send({
-          name: "Team II created via API",
+          name: teamName,
           autoAcceptCreator: false,
         } satisfies CreateOrgTeamDto)
         .expect(201)
@@ -230,7 +234,7 @@ describe("Organizations Team Endpoints", () => {
           const responseBody: ApiSuccessResponse<Team> = response.body;
           expect(responseBody.status).toEqual(SUCCESS_STATUS);
           teamCreatedViaApi2 = responseBody.data;
-          expect(teamCreatedViaApi2.name).toEqual("Team II created via API");
+          expect(teamCreatedViaApi2.name).toEqual(teamName);
           expect(teamCreatedViaApi2.parentId).toEqual(org.id);
           const membership = await membershipsRepositoryFixture.getUserMembershipByTeamId(
             user.id,
@@ -265,7 +269,7 @@ describe("Organizations Team Endpoints", () => {
     let team: Team;
     let team2: Team;
 
-    const userEmail = "org-member-teams-controller-e2e@api.com";
+    const userEmail = `organizations-teams-member-${randomString()}@api.com`;
     let user: User;
 
     beforeAll(async () => {
@@ -287,7 +291,7 @@ describe("Organizations Team Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization",
+        name: `organizations-teams-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -298,13 +302,13 @@ describe("Organizations Team Endpoints", () => {
       });
 
       team = await teamsRepositoryFixture.create({
-        name: "Test org team",
+        name: `organizations-teams-team1-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
 
       team2 = await teamsRepositoryFixture.create({
-        name: "Test org team 2",
+        name: `organizations-teams-team2-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
@@ -338,7 +342,7 @@ describe("Organizations Team Endpoints", () => {
       return request(app.getHttpServer())
         .post(`/v2/organizations/${org.id}/teams`)
         .send({
-          name: "Team created via API",
+          name: `organizations-teams-api-team1-${randomString()}`,
         } satisfies CreateOrgTeamDto)
         .expect(403);
     });
@@ -347,7 +351,7 @@ describe("Organizations Team Endpoints", () => {
       return request(app.getHttpServer())
         .patch(`/v2/organizations/${org.id}/teams/${team.id}`)
         .send({
-          name: "Team created via API Updated",
+          name: `organizations-teams-api-team1-${randomString()}-updated`,
         } satisfies CreateOrgTeamDto)
         .expect(403);
     });
@@ -379,7 +383,7 @@ describe("Organizations Team Endpoints", () => {
     let team: Team;
     let team2: Team;
 
-    const userEmail = "org-member-teams-owner-controller-e2e@api.com";
+    const userEmail = `organizations-teams-owner-${randomString()}@api.com`;
     let user: User;
 
     beforeAll(async () => {
@@ -401,7 +405,7 @@ describe("Organizations Team Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization",
+        name: `organizations-teams-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -412,13 +416,13 @@ describe("Organizations Team Endpoints", () => {
       });
 
       team = await teamsRepositoryFixture.create({
-        name: "Test org team",
+        name: `organizations-teams-team1-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
 
       team2 = await teamsRepositoryFixture.create({
-        name: "Test org team 2",
+        name: `organizations-teams-team2-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
@@ -464,7 +468,7 @@ describe("Organizations Team Endpoints", () => {
       return request(app.getHttpServer())
         .post(`/v2/organizations/${org.id}/teams`)
         .send({
-          name: "Team created via API",
+          name: `organizations-teams-api-team1-${randomString()}`,
         } satisfies CreateOrgTeamDto)
         .expect(403);
     });
@@ -473,7 +477,7 @@ describe("Organizations Team Endpoints", () => {
       return request(app.getHttpServer())
         .patch(`/v2/organizations/${org.id}/teams/${team.id}`)
         .send({
-          name: "Team created via API Updated",
+          name: `organizations-teams-api-team1-${randomString()}-updated`,
         } satisfies CreateOrgTeamDto)
         .expect(403);
     });
@@ -509,7 +513,7 @@ describe("Organizations Team Endpoints", () => {
     let team1: Team;
     let team2: Team;
 
-    const userEmail = "platform-org-member-teams-owner-controller-e2e@api.com";
+    const userEmail = `organizations-teams-platform-owner-${randomString()}@api.com`;
     let user: User;
 
     beforeAll(async () => {
@@ -531,7 +535,7 @@ describe("Organizations Team Endpoints", () => {
       });
 
       org = await orgRepositoryFixture.create({
-        name: "Platform Test Organization",
+        name: `organizations-teams-platform-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -570,7 +574,7 @@ describe("Organizations Team Endpoints", () => {
     });
 
     it("should create first oAuth client team", async () => {
-      const teamName = "Platform team created via API";
+      const teamName = `organizations-teams-platform-api-team1-${randomString()}`;
       return request(app.getHttpServer())
         .post(`/v2/organizations/${org.id}/teams`)
         .set(X_CAL_CLIENT_ID, oAuthClient1.id)
@@ -593,7 +597,7 @@ describe("Organizations Team Endpoints", () => {
     });
 
     it("should create second oAuth client team", async () => {
-      const teamName = "Platform team II created via API";
+      const teamName = `organizations-teams-platform-api-team2-${randomString()}`;
       return request(app.getHttpServer())
         .post(`/v2/organizations/${org.id}/teams`)
         .set(X_CAL_CLIENT_ID, oAuthClient2.id)

apps/api/v2/src/modules/organizations/controllers/teams/schedules/organizations-teams-schedules.e2e-spec.ts

@@ -14,6 +14,7 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo
 import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -37,11 +38,10 @@ describe("Organizations Teams Schedules Endpoints", () => {
     let nonOrgTeam: Team;
     let user2Schedule: Schedule;
 
-    const userEmail = "org-admin-schedules-teams-controller-e2e@api.com";
-    const userEmail2 = "org-member-schedules-teams-controller-e2e@api.com";
-    const nonOrgUserEmail = "non-org-member-schedules-teams-controller-e2e@api.com";
-
-    const invitedUserEmail = "org-member-invited-schedules-teams-controller-e2e@api.com";
+    const userEmail = `organizations-teams-schedules-admin-${randomString()}@api.com`;
+    const userEmail2 = `organizations-teams-schedules-member-${randomString()}@api.com`;
+    const nonOrgUserEmail = `organizations-teams-schedules-non-org-${randomString()}@api.com`;
+    const invitedUserEmail = `organizations-teams-schedules-invited-${randomString()}@api.com`;
 
     let user: User;
     let user2: User;
@@ -79,7 +79,7 @@ describe("Organizations Teams Schedules Endpoints", () => {
             id: user2.id,
           },
         },
-        name: "User 2 schedule",
+        name: `organizations-teams-schedules-user2-schedule-${randomString()}`,
         timeZone: "America/New_York",
       });
 
@@ -94,18 +94,18 @@ describe("Organizations Teams Schedules Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization",
+        name: `organizations-teams-schedules-organization-${randomString()}`,
         isOrganization: true,
       });
 
       orgTeam = await teamsRepositoryFixture.create({
-        name: "Org Team",
+        name: `organizations-teams-schedules-team-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
 
       nonOrgTeam = await teamsRepositoryFixture.create({
-        name: "Non Org Team",
+        name: `organizations-teams-schedules-non-org-team-${randomString()}`,
         isOrganization: false,
       });
 

apps/api/v2/src/modules/organizations/controllers/users/ooo/organizations-users-ooo.e2e-spec.ts

@@ -14,6 +14,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -34,12 +35,12 @@ describe("Organizations User OOO Endpoints", () => {
     let falseTestOrg: Team;
     let falseTestTeam: Team;
 
-    const userEmail = "org-admin-ooo-controller-e222e@api.com";
+    const userEmail = `organizations-users-ooo-admin-${randomString()}@api.com`;
     let userAdmin: User;
 
-    const teammate1Email = "teammate111ooo@team.com";
-    const teammate2Email = "teammate221ooo@team.com";
-    const falseTestUserEmail = "false-user-ooo@false-team.com";
+    const teammate1Email = `organizations-users-ooo-member1-${randomString()}@api.com`;
+    const teammate2Email = `organizations-users-ooo-member2-${randomString()}@api.com`;
+    const falseTestUserEmail = `organizations-users-ooo-false-user-${randomString()}@api.com`;
     let teammate1: User;
     let teammate2: User;
     let falseTestUser: User;
@@ -80,23 +81,23 @@ describe("Organizations User OOO Endpoints", () => {
       });
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test Organization ooo",
+        name: `organizations-users-ooo-organization-${randomString()}`,
         isOrganization: true,
       });
 
       falseTestOrg = await organizationsRepositoryFixture.create({
-        name: "False test org ooo",
+        name: `organizations-users-ooo-false-org-${randomString()}`,
         isOrganization: true,
       });
 
       team = await teamsRepositoryFixture.create({
-        name: "Test org team ooo",
+        name: `organizations-users-ooo-team-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
 
       falseTestTeam = await teamsRepositoryFixture.create({
-        name: "Outside org team ooo",
+        name: `organizations-users-ooo-false-team-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: falseTestOrg.id } },
       });

apps/api/v2/src/modules/organizations/controllers/users/organizations-users.e2e-spec.ts

@@ -15,6 +15,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -29,7 +30,7 @@ describe("Organizations Users Endpoints", () => {
     let membershipFixtures: MembershipRepositoryFixture;
     let profileRepositoryFixture: ProfileRepositoryFixture;
 
-    const userEmail = "member1@org.com";
+    const userEmail = `organizations-users-member-${randomString()}@api.com`;
     let user: User;
     let org: Team;
 
@@ -47,7 +48,7 @@ describe("Organizations Users Endpoints", () => {
       profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test org 3",
+        name: `organizations-users-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -118,24 +119,24 @@ describe("Organizations Users Endpoints", () => {
     let organizationsRepositoryFixture: OrganizationRepositoryFixture;
     let membershipFixtures: MembershipRepositoryFixture;
 
-    const userEmail = "admin1@org.com";
-    const nonMemberEmail = "non-member@test.com";
+    const userEmail = `organizations-users-admin-${randomString()}@api.com`;
+    const nonMemberEmail = `organizations-users-non-member-${randomString()}@api.com`;
     let user: User;
     let org: Team;
     let createdUser: User;
 
     const orgMembersData = [
       {
-        email: "member1@org.com",
-        username: "member1@org.com",
+        email: `organizations-users-member1-${randomString()}@api.com`,
+        username: `organizations-users-member1-${randomString()}@api.com`,
       },
       {
-        email: "member2@org.com",
-        username: "member2@org.com",
+        email: `organizations-users-member2-${randomString()}@api.com`,
+        username: `organizations-users-member2-${randomString()}@api.com`,
       },
       {
-        email: "member3@org.com",
-        username: "member3@org.com",
+        email: `organizations-users-member3-${randomString()}@api.com`,
+        username: `organizations-users-member3-${randomString()}@api.com`,
       },
     ];
 
@@ -154,7 +155,7 @@ describe("Organizations Users Endpoints", () => {
       membershipFixtures = new MembershipRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test org 2",
+        name: `organizations-users-admin-organization-${randomString()}`,
         isOrganization: true,
       });
 
@@ -243,9 +244,9 @@ describe("Organizations Users Endpoints", () => {
         { userData },
         userData.map((u) => u.profile)
       );
-      expect(userData.find((u) => u.profile.username === "member1@org.com")).toBeDefined();
-      expect(userData.find((u) => u.profile.username === "member2@org.com")).toBeDefined();
-      expect(userData.find((u) => u.profile.username === "member3@org.com")).toBeDefined();
+      expect(userData.find((u) => u.profile.username === orgMembersData[0].username)).toBeDefined();
+      expect(userData.find((u) => u.profile.username === orgMembersData[1].username)).toBeDefined();
+      expect(userData.find((u) => u.profile.username === orgMembersData[2].username)).toBeDefined();
 
       expect(userData.filter((user: { email: string }) => user.email === nonMemberEmail).length).toBe(0);
     });
@@ -304,7 +305,7 @@ describe("Organizations Users Endpoints", () => {
 
     it("should create a new org user", async () => {
       const newOrgUser = {
-        email: "new-org-member-b@org.com",
+        email: `organizations-users-new-member-${randomString()}@api.com`,
         organizationRole: "MEMBER",
         autoAccept: true,
       };
@@ -327,7 +328,7 @@ describe("Organizations Users Endpoints", () => {
         usernameOrEmail: newOrgUser.email,
         orgName: org.name,
         orgId: org.id,
-        inviterName: "admin1@org.com",
+        inviterName: userEmail,
         locale: null,
       });
       createdUser = userData;
@@ -366,7 +367,7 @@ describe("Organizations Users Endpoints", () => {
     let membershipFixtures: MembershipRepositoryFixture;
     let profileRepositoryFixture: ProfileRepositoryFixture;
 
-    const authEmail = "auth@org.com";
+    const authEmail = `organizations-users-auth-${randomString()}@api.com`;
     let user: User;
     let org: Team;
     let team: Team;
@@ -390,12 +391,12 @@ describe("Organizations Users Endpoints", () => {
       profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
 
       org = await organizationsRepositoryFixture.create({
-        name: "Test org 4",
+        name: `organizations-users-organization-${randomString()}`,
         isOrganization: true,
       });
 
       team = await teamsRepositoryFixture.create({
-        name: "Test org 4 team",
+        name: `organizations-users-team-${randomString()}`,
         isOrganization: false,
         parent: { connect: { id: org.id } },
       });
@@ -464,7 +465,7 @@ describe("Organizations Users Endpoints", () => {
 
     it("should create a new org user with team event-types", async () => {
       const newOrgUser = {
-        email: "new-org-member-d@org.com",
+        email: `organizations-users-new-member-${randomString()}@api.com`,
         organizationRole: "MEMBER",
         autoAccept: true,
       };

apps/api/v2/src/modules/organizations/controllers/webhooks/organizations-webhooks.e2e-spec.ts

@@ -17,13 +17,14 @@ import { MembershipRepositoryFixture } from "test/fixtures/repository/membership
 import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { Team, Webhook } from "@calcom/prisma/client";
 
 describe("WebhooksController (e2e)", () => {
   let app: INestApplication;
-  const userEmail = "webhook-controller-e2e@api.com";
+  const userEmail = `organizations-webhooks-admin-${randomString()}@api.com`;
   let org: Team;
 
   let organizationsRepositoryFixture: OrganizationRepositoryFixture;
@@ -53,7 +54,7 @@ describe("WebhooksController (e2e)", () => {
     });
 
     org = await organizationsRepositoryFixture.create({
-      name: "Test Organization",
+      name: `organizations-webhooks-organization-${randomString()}`,
       isOrganization: true,
     });
 

apps/api/v2/src/modules/organizations/repositories/organizations-users.repository.ts

@@ -3,6 +3,7 @@ import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/upda
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
+import { CreationSource } from "@prisma/client";
 
 @Injectable()
 export class OrganizationsUsersRepository {
@@ -70,7 +71,7 @@ export class OrganizationsUsersRepository {
 
   async createOrganizationUser(orgId: number, createUserBody: CreateOrganizationUserInput) {
     const createdUser = await this.dbWrite.prisma.user.create({
-      data: createUserBody,
+      data: { ...createUserBody, creationSource: CreationSource.API_V2 },
     });
 
     return createdUser;

apps/api/v2/src/modules/organizations/services/event-types/organizations-event-types.service.ts

@@ -64,8 +64,12 @@ export class OrganizationsEventTypesService {
     return this.teamsEventTypesService.getTeamEventType(teamId, eventTypeId);
   }
 
-  async getTeamEventTypeBySlug(teamId: number, eventTypeSlug: string): Promise<DatabaseTeamEventType | null> {
-    return this.teamsEventTypesService.getTeamEventTypeBySlug(teamId, eventTypeSlug);
+  async getTeamEventTypeBySlug(
+    teamId: number,
+    eventTypeSlug: string,
+    hostsLimit?: number
+  ): Promise<DatabaseTeamEventType | null> {
+    return this.teamsEventTypesService.getTeamEventTypeBySlug(teamId, eventTypeSlug, hostsLimit);
   }
 
   async getTeamEventTypes(teamId: number): Promise<DatabaseTeamEventType[]> {

apps/api/v2/src/modules/organizations/services/organizations-users-service.ts

@@ -5,10 +5,10 @@ import { OrganizationsUsersRepository } from "@/modules/organizations/repositori
 import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
 import { CreateUserInput } from "@/modules/users/inputs/create-user.input";
 import { Injectable, ConflictException } from "@nestjs/common";
+import { Team, CreationSource } from "@prisma/client";
 import { plainToInstance } from "class-transformer";
 
 import { createNewUsersConnectToOrgIfExists } from "@calcom/platform-libraries";
-import { Team } from "@calcom/prisma/client";
 
 @Injectable()
 export class OrganizationsUsersService {
@@ -56,6 +56,7 @@ export class OrganizationsUsersService {
         },
       ],
       teamId: org.id,
+      creationSource: CreationSource.API_V2,
       isOrg: true,
       parentId: null,
       autoAcceptEmailDomain: "not-required-for-this-endpoint",

apps/api/v2/src/modules/router/controllers/router.controller.ts

@@ -0,0 +1,39 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { Controller, Req, NotFoundException, Param, Post, Body } from "@nestjs/common";
+import { ApiTags as DocsTags, ApiExcludeController as DocsExcludeController } from "@nestjs/swagger";
+import { Request } from "express";
+
+import { getRoutedUrl } from "@calcom/platform-libraries";
+import { ApiResponse } from "@calcom/platform-types";
+
+@Controller({
+  path: "/v2/router",
+  version: API_VERSIONS_VALUES,
+})
+@DocsTags("Router controller")
+@DocsExcludeController(true)
+export class RouterController {
+  @Post("/forms/:formId/submit")
+  async getRoutingFormResponse(
+    @Req() request: Request,
+    @Param("formId") formId: string,
+    @Body() body?: Record<string, string>
+  ): Promise<void | (ApiResponse<unknown> & { redirect: boolean })> {
+    const params = Object.fromEntries(new URLSearchParams(body ?? {}));
+    const routedUrlData = await getRoutedUrl({ req: request, query: { ...params, form: formId } });
+
+    if (routedUrlData?.notFound) {
+      throw new NotFoundException("Route not found. Please check the provided form parameter.");
+    }
+
+    if (routedUrlData?.redirect?.destination) {
+      return { status: "success", data: routedUrlData?.redirect?.destination, redirect: true };
+    }
+
+    if (routedUrlData?.props) {
+      return { status: "success", data: { message: routedUrlData?.props?.message ?? "" }, redirect: false };
+    }
+
+    return { status: "success", data: { message: "No Route nor custom message found." }, redirect: false };
+  }
+}

apps/api/v2/src/modules/router/router.module.ts

@@ -0,0 +1,11 @@
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { RouterController } from "@/modules/router/controllers/router.controller";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule],
+  providers: [],
+  exports: [],
+  controllers: [RouterController],
+})
+export class RouterModule {}

apps/api/v2/src/modules/slots/controllers/slots.controller.e2e-spec.ts

@@ -16,7 +16,7 @@ import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.rep
 import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
 import { SelectedSlotsRepositoryFixture } from "test/fixtures/repository/selected-slots.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
-import { randomNumber } from "test/utils/randomNumber";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -251,7 +251,7 @@ describe("Slots Endpoints", () => {
     let selectedSlotsRepositoryFixture: SelectedSlotsRepositoryFixture;
     let bookingsRepositoryFixture: BookingsRepositoryFixture;
 
-    const userEmail = `slots-${randomNumber()}-controller-e2e@api.com`;
+    const userEmail = `slots-${randomString()}-controller-e2e@api.com`;
     const userName = "bob";
     let user: User;
     let eventTypeId: number;
@@ -291,14 +291,23 @@ describe("Slots Endpoints", () => {
       });
 
       // nxte(Lauris): this creates default schedule monday to friday from 9AM to 5PM in Europe/Rome timezone
-      await schedulesService.createUserDefaultSchedule(user.id, "Europe/Rome");
+      const userSchedule = await schedulesService.createUserSchedule(user.id, {
+        name: `slots-schedule-${randomString()}-slots.controller.e2e-spec`,
+        timeZone: "Europe/Rome",
+        isDefault: true,
+      });
 
-      const event = await eventTypesRepositoryFixture.create(
-        { title: "frisbee match", slug: "frisbee-match", length: 60 },
+      const eventType = await eventTypesRepositoryFixture.create(
+        {
+          title: `slots-event-type-${randomString()}-slots.controller.e2e-spec`,
+          slug: `slots-event-type-${randomString()}-slots.controller.e2e-spec`,
+          length: 60,
+          locations: [],
+        },
         user.id
       );
-      eventTypeId = event.id;
-      eventTypeSlug = event.slug;
+      eventTypeId = eventType.id;
+      eventTypeSlug = eventType.slug;
 
       app = moduleRef.createNestApplication();
       bootstrap(app as NestExpressApplication);

apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types.controller.e2e-spec.ts

@@ -14,7 +14,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
-import { randomNumber } from "test/utils/randomNumber";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -47,12 +47,12 @@ describe("Organizations Event Types Endpoints", () => {
     let team: Team;
     let falseTestTeam: Team;
 
-    const userEmail = `auth-${randomNumber()}@api.com`;
+    const userEmail = `teams-event-types-user-${randomString()}@api.com`;
     let userAdmin: User;
 
-    const teammate1Email = "teammate111@team.com";
-    const teammate2Email = "teammate221@team.com";
-    const falseTestUserEmail = "false-user@false-team.com";
+    const teammate1Email = `teams-event-types-teammate1-${randomString()}@api.com`;
+    const teammate2Email = `teams-event-types-teammate2-${randomString()}@api.com`;
+    const falseTestUserEmail = `teams-event-types-false-user-${randomString()}@api.com`;
     let teamMember1: User;
     let teamMember2: User;
     let falseTestUser: User;
@@ -97,12 +97,12 @@ describe("Organizations Event Types Endpoints", () => {
       });
 
       team = await teamsRepositoryFixture.create({
-        name: "Test org team",
+        name: `teams-event-types-team-${randomString()}`,
         isOrganization: false,
       });
 
       falseTestTeam = await teamsRepositoryFixture.create({
-        name: "Outside org team",
+        name: `teams-event-types-false-team-${randomString()}`,
         isOrganization: false,
       });
 
@@ -169,8 +169,8 @@ describe("Organizations Event Types Endpoints", () => {
 
     it("should create a collective team event-type", async () => {
       const body: CreateTeamEventTypeInput_2024_06_14 = {
-        title: "Coding consultation collective",
-        slug: "coding-consultation collective",
+        title: `teams-event-types-collective-${randomString()}`,
+        slug: `teams-event-types-collective-${randomString()}`,
         description: "Our team will review your codebase.",
         lengthInMinutes: 60,
         locations: [
@@ -275,8 +275,8 @@ describe("Organizations Event Types Endpoints", () => {
 
     it("should create a managed team event-type", async () => {
       const body: CreateTeamEventTypeInput_2024_06_14 = {
-        title: "Coding consultation managed",
-        slug: "coding-consultation-managed",
+        title: `teams-event-types-managed-${randomString()}`,
+        slug: `teams-event-types-managed-${randomString()}`,
         description: "Our team will review your codebase.",
         lengthInMinutes: 60,
         locations: [
@@ -316,6 +316,7 @@ describe("Organizations Event Types Endpoints", () => {
           const teamEventTypes = await eventTypesRepositoryFixture.getAllTeamEventTypes(team.id);
 
           expect(teammate1EventTypes.length).toEqual(1);
+          expect(teammate1EventTypes[0].title).toEqual(body.title);
           expect(teammate2EventTypes.length).toEqual(1);
           expect(teamEventTypes.filter((eventType) => eventType.schedulingType === "MANAGED").length).toEqual(
             1
@@ -423,7 +424,7 @@ describe("Organizations Event Types Endpoints", () => {
     });
 
     it("should update managed event-type", async () => {
-      const newTitle = "Coding consultation managed updated";
+      const newTitle = `teams-event-types-managed-updated-${randomString()}`;
       const newHosts: UpdateTeamEventTypeInput_2024_06_14["hosts"] = [
         {
           userId: teamMember1.id,

apps/api/v2/src/modules/teams/event-types/services/teams-event-types.service.ts

@@ -75,8 +75,16 @@ export class TeamsEventTypesService {
     return eventType;
   }
 
-  async getTeamEventTypeBySlug(teamId: number, eventTypeSlug: string): Promise<DatabaseTeamEventType | null> {
-    const eventType = await this.teamsEventTypesRepository.getTeamEventTypeBySlug(teamId, eventTypeSlug);
+  async getTeamEventTypeBySlug(
+    teamId: number,
+    eventTypeSlug: string,
+    hostsLimit?: number
+  ): Promise<DatabaseTeamEventType | null> {
+    const eventType = await this.teamsEventTypesRepository.getTeamEventTypeBySlug(
+      teamId,
+      eventTypeSlug,
+      hostsLimit
+    );
 
     if (!eventType) {
       return null;

apps/api/v2/src/modules/teams/event-types/teams-event-types.repository.ts

@@ -16,7 +16,7 @@ export class TeamsEventTypesRepository {
     });
   }
 
-  async getTeamEventTypeBySlug(teamId: number, eventTypeSlug: string) {
+  async getTeamEventTypeBySlug(teamId: number, eventTypeSlug: string, hostsLimit?: number) {
     return this.dbRead.prisma.eventType.findUnique({
       where: {
         teamId_slug: {
@@ -27,7 +27,11 @@ export class TeamsEventTypesRepository {
       include: {
         users: true,
         schedule: true,
-        hosts: true,
+        hosts: hostsLimit
+          ? {
+              take: hostsLimit,
+            }
+          : true,
         destinationCalendar: true,
         team: {
           select: {

apps/api/v2/src/modules/teams/memberships/controllers/teams-memberships.controller.e2e-spec.ts

@@ -24,7 +24,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
-import { randomNumber } from "test/utils/randomNumber";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { api } from "@calcom/app-store/alby";
@@ -51,11 +51,11 @@ describe("Teams Memberships Endpoints", () => {
     let teamMemberMembership: Membership;
     let membershipCreatedViaApi: TeamMembershipOutput;
 
-    const teamAdminEmail = `alice-admin-${randomNumber()}@api.com`;
-    const teamMemberEmail = `bob-member-${randomNumber()}@api.com`;
-    const nonTeamUserEmail = `charlie-outsider-${randomNumber()}@api`;
+    const teamAdminEmail = `alice-admin-${randomString()}@api.com`;
+    const teamMemberEmail = `bob-member-${randomString()}@api.com`;
+    const nonTeamUserEmail = `charlie-outsider-${randomString()}@api`;
 
-    const invitedUserEmail = `david-invited-${randomNumber()}@api.com`;
+    const invitedUserEmail = `david-invited-${randomString()}@api.com`;
 
     let teamAdmin: User;
     let teamMember: User;
@@ -97,7 +97,7 @@ describe("Teams Memberships Endpoints", () => {
       });
 
       team = await teamsRepositoryFixture.create({
-        name: `Team-${randomNumber()}`,
+        name: `Team-${randomString()}`,
         isOrganization: false,
       });
 

apps/api/v2/src/modules/teams/teams/controllers/teams.controller.e2e-spec.ts

@@ -17,7 +17,7 @@ import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repo
 import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
-import { randomNumber } from "test/utils/randomNumber";
+import { randomString } from "test/utils/randomString";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import { TeamOutputDto } from "@calcom/platform-types";
@@ -29,11 +29,11 @@ describe("Teams endpoint", () => {
   let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
   let membershipRepositoryFixture: MembershipRepositoryFixture;
 
-  const aliceEmail = `alice-${randomNumber()}@api.com`;
+  const aliceEmail = `alice-${randomString()}@api.com`;
   let alice: User;
   let aliceApiKey: string;
 
-  const bobEmail = `bob-${randomNumber()}@api.com`;
+  const bobEmail = `bob-${randomString()}@api.com`;
   let bob: User;
   let bobApiKey: string;
 
@@ -75,7 +75,7 @@ describe("Teams endpoint", () => {
   describe("User has membership in created team", () => {
     it("should create a team", async () => {
       const body: CreateTeamInput = {
-        name: "Team dog",
+        name: `teams-dog-${randomString()}`,
       };
 
       return request(app.getHttpServer())
@@ -96,7 +96,7 @@ describe("Teams endpoint", () => {
 
     it("should create a team", async () => {
       const body: CreateTeamInput = {
-        name: "Team cats",
+        name: `teams-cats-${randomString()}`,
       };
 
       return request(app.getHttpServer())
@@ -148,7 +148,7 @@ describe("Teams endpoint", () => {
 
     it("should update a team", async () => {
       const body: UpdateTeamDto = {
-        name: "Team dogs shepherds",
+        name: `teams-dogs-shepherds-${randomString()}`,
       };
 
       return request(app.getHttpServer())
@@ -223,6 +223,7 @@ describe("Teams endpoint", () => {
 
   afterAll(async () => {
     await userRepositoryFixture.deleteByEmail(aliceEmail);
+    await userRepositoryFixture.deleteByEmail(bobEmail);
     await teamRepositoryFixture.delete(team1.id);
     await teamRepositoryFixture.delete(team2.id);
     await app.close();

apps/api/v2/src/modules/users/users.repository.ts

@@ -4,6 +4,7 @@ import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-us
 import { UpdateManagedUserInput } from "@/modules/users/inputs/update-managed-user.input";
 import { Injectable, NotFoundException } from "@nestjs/common";
 import type { Profile, User, Team, Prisma } from "@prisma/client";
+import { CreationSource } from "@prisma/client";
 
 export type UserWithProfile = User & {
   movedToProfile?: (Profile & { organization: Pick<Team, "isPlatform" | "id" | "slug" | "name"> }) | null;
@@ -30,6 +31,7 @@ export class UsersRepository {
           connect: { id: oAuthClientId },
         },
         isPlatformManaged,
+        creationSource: CreationSource.API_V2,
       },
     });
   }

apps/api/v2/src/modules/webhooks/controllers/webhooks.controller.e2e-spec.ts

@@ -15,13 +15,14 @@ import { Test } from "@nestjs/testing";
 import * as request from "supertest";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture";
+import { randomString } from "test/utils/randomString";
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { Webhook } from "@calcom/prisma/client";
 
 describe("WebhooksController (e2e)", () => {
   let app: INestApplication;
-  const userEmail = "webhook-controller-e2e@api.com";
+  const userEmail = `webhooks-controller-user-${randomString()}@api.com`;
   let user: UserWithProfile;
   let otherUser: UserWithProfile;
 
@@ -47,8 +48,8 @@ describe("WebhooksController (e2e)", () => {
     });
 
     otherUser = await userRepositoryFixture.create({
-      email: "other-user-webhook-controller@api.com",
-      username: "other-user-webhook-controller@api.com",
+      email: `webhooks-controller-other-user-${randomString()}@api.com`,
+      username: `webhooks-controller-other-user-${randomString()}@api.com`,
     });
 
     otherWebhook = await webhookRepositoryFixture.create({

apps/api/v2/swagger/documentation.json

@@ -1251,6 +1251,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "hostsLimit",
+            "required": false,
+            "in": "query",
+            "description": "Specifies the maximum number of hosts to include in the response. This limit helps optimize performance. If not provided, all Hosts will be fetched.",
+            "schema": {
+              "type": "number"
+            }
           }
         ],
         "responses": {
@@ -5889,6 +5898,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "hostsLimit",
+            "required": false,
+            "in": "query",
+            "description": "Specifies the maximum number of hosts to include in the response. This limit helps optimize performance. If not provided, all Hosts will be fetched.",
+            "schema": {
+              "type": "number"
+            }
           }
         ],
         "responses": {
@@ -15101,6 +15119,10 @@
             "type": "string",
             "example": "Jane Doe"
           },
+          "email": {
+            "type": "string",
+            "example": "jane100@example.com"
+          },
           "username": {
             "type": "string",
             "example": "jane100"
@@ -15113,6 +15135,7 @@
         "required": [
           "id",
           "name",
+          "email",
           "username",
           "timeZone"
         ]

apps/api/v2/test/utils/randomNumber.ts

@@ -1,3 +0,0 @@
-export function randomNumber(): number {
-  return Math.floor(Math.random() * 100000);
-}

apps/api/v2/test/utils/randomString.ts

@@ -0,0 +1,5 @@
+import { v4 as uuidv4 } from "uuid";
+
+export function randomString() {
+  return uuidv4().replace(/-/g, "");
+}

apps/ui-playground/.gitignore

@@ -0,0 +1,41 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files (can opt-in for committing if needed)
+.env*
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts

apps/ui-playground/README.md

@@ -0,0 +1,36 @@
+This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+npm run dev
+# or
+yarn dev
+# or
+pnpm dev
+# or
+bun dev
+```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+
+This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
+
+## Learn More
+
+To learn more about Next.js, take a look at the following resources:
+
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+
+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+
+## Deploy on Vercel
+
+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+
+Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.

apps/ui-playground/app/globals.css

@@ -0,0 +1,485 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+/**
+* Add css variables here as well for light mode in addition to tailwind.config to avoid FOUC
+*/
+:root {
+  /* background */
+
+  --cal-bg-emphasis: hsla(220,13%,91%,1);
+  --cal-bg: hsla(0,0%,100%,1);
+  --cal-bg-subtle: hsla(220, 14%, 96%,1);
+  --cal-bg-muted: hsla(210,20%,98%,1);
+  --cal-bg-inverted: hsla(0,0%,6%,1);
+
+  /* background -> components*/
+  --cal-bg-info: hsla(218,83%,98%,1);
+  --cal-bg-success: hsla(134,76%,94%,1);
+  --cal-bg-attention: hsla(37, 86%, 92%, 1);
+  --cal-bg-error: hsla(3,66%,93%,1);
+  --cal-bg-dark-error: hsla(2, 55%, 30%, 1);
+
+  /* Borders */
+  --cal-border-emphasis: hsla(218, 11%, 65%, 1);
+  --cal-border: hsla(216, 12%, 84%, 1);
+  --cal-border-subtle: hsla(220, 13%, 91%, 1);
+  --cal-border-booker: #e5e7eb;
+  --cal-border-muted: hsla(220, 14%, 96%, 1);
+  --cal-border-error: hsla(4, 63%, 41%, 1);
+  --cal-border-focus: hsla(0, 0%, 10%, 1);
+
+  /* Content/Text */
+  --cal-text-emphasis: hsla(217, 19%, 27%, 1);
+  --cal-text: hsla(217, 19%, 27%, 1);
+  --cal-text-subtle: hsla(220, 9%, 46%, 1);
+  --cal-text-muted: hsla(218, 11%, 65%, 1);
+  --cal-text-inverted: hsla(0, 0%, 100%, 1);
+
+  /* Content/Text -> components */
+  --cal-text-info: hsla(228, 56%, 33%, 1);
+  --cal-text-success: hsla(133, 34%, 24%, 1);
+  --cal-text-attention: hsla(16, 62%, 28%, 1);
+  --cal-text-error: hsla(2, 55%, 30%, 1);
+
+  /* Brand shinanigans
+      -> These will be computed for the users theme at runtime.
+    */
+  --cal-brand: hsla(221, 39%, 11%, 1);
+  --cal-brand-emphasis: hsla(0, 0%, 6%, 1);
+  --cal-brand-text: hsla(0, 0%, 100%, 1);
+}
+.dark {
+  /* background */
+
+  --cal-bg-emphasis: hsla(0, 0%, 25%, 1);
+  --cal-bg: hsla(0, 0%, 10%, 1);
+  --cal-bg-subtle: hsla(0, 0%, 18%, 1);
+  --cal-bg-muted: hsla(0, 0%, 12%, 1);
+  --cal-bg-inverted: hsla(220, 14%, 96%, 1);
+
+  /* background -> components*/
+  --cal-bg-info: hsla(228, 56%, 33%, 1);
+  --cal-bg-success: hsla(133, 34%, 24%, 1);
+  --cal-bg-attention: hsla(16, 62%, 28%, 1);
+  --cal-bg-error: hsla(2, 55%, 30%, 1);
+  --cal-bg-dark-error: hsla(2, 55%, 30%, 1);
+
+  /* Borders */
+  --cal-border-emphasis: hsla(0, 0%, 46%, 1);
+  --cal-border: hsla(0, 0%, 34%, 1);
+  --cal-border-subtle: hsla(0, 0%, 22%, 1);
+  --cal-border-booker: hsla(0, 0%, 22%, 1);
+  --cal-border-muted: hsla(0, 0%, 18%, 1);
+  --cal-border-error: hsla(4, 63%, 41%, 1);
+  --cal-border-focus: hsla(0, 0%, 100%, 1);
+
+  /* Content/Text */
+  --cal-text-emphasis: hsla(240, 20%, 99%, 1);
+  --cal-text: hsla(0, 0%, 84%, 1);
+  --cal-text-subtle: hsla(0, 0%, 65%, 1);
+  --cal-text-muted: hsla(0, 0%, 34%, 1);
+  --cal-text-inverted: hsla(0, 0%, 10%, 1);
+
+  /* Content/Text -> components */
+  --cal-text-info: hsla(218, 83%, 93%, 1);
+  --cal-text-success: hsla(134, 76%, 94%, 1);
+  --cal-text-attention: hsla(37, 86%, 92%, 1);
+  --cal-text-error: hsla(3, 66%, 93%, 1);
+
+  /* Brand shenanigans
+      -> These will be computed for the users theme at runtime.
+    */
+  --cal-brand: hsla(0, 0%, 100%, 1);
+  --cal-brand-emphasis: hsla(218, 11%, 65%, 1);
+  --cal-brand-text: hsla(0, 0%, 0%,1);
+}
+
+@layer base {
+  * {
+    @apply border-default
+  }
+}
+
+::-moz-selection {
+  color: var(--cal-brand-text);
+  background: var(--cal-brand);
+}
+
+::selection {
+  color: var(--cal-brand-text);
+  background: var(--cal-brand);
+}
+
+body  {
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+}
+
+/*
+  Desktop App specific CSS
+    https://docs.todesktop.com/
+*/
+
+html.todesktop-platform-win32 .todesktop\:\!bg-transparent{
+  background: inherit !important;
+}
+
+/* disable user selection on buttons, links and images on desktop app */
+html.todesktop button,
+html.todesktop a,
+html.todesktop img,
+html.todesktop header {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  cursor: default !important;
+}
+
+html.todesktop,
+html.todesktop div {
+  cursor: default !important;
+}
+
+/* make header draggable on desktop app */
+html.todesktop header {
+  -webkit-app-region: drag;
+}
+
+html.todesktop header button,
+html.todesktop header a {
+  -webkit-app-region: no-drag;
+}
+
+html.todesktop-platform-darwin body, html.todesktop-platform-darwin aside {
+  background: transparent !important;
+}
+
+html.todesktop-platform-darwin.dark main.bg-default {
+  background: rgba(0, 0, 0, 0.6) !important;
+}
+
+html.todesktop-platform-darwin.light main.bg-default {
+  background: rgba(255, 255, 255, 0.8) !important;
+}
+
+html.todesktop.light {
+  --cal-bg-emphasis: hsla(0, 0%, 11%, 0.1);
+}
+
+html.todesktop.dark {
+  --cal-bg-emphasis: hsla(220, 2%, 26%, 0.3);
+}
+
+/*
+  Adds Utility to hide scrollbar to tailwind
+    https://github.com/tailwindlabs/tailwindcss/discussions/2394
+    https://github.com/tailwindlabs/tailwindcss/pull/5732
+*/
+@layer utilities {
+  /* Chrome, Safari and Opera */
+  .no-scrollbar::-webkit-scrollbar {
+    display: none;
+  }
+
+  .no-scrollbar {
+    -ms-overflow-style: none; /* IE and Edge */
+    scrollbar-width: none; /* Firefox */
+  }
+}
+
+/*
+ * Override the default tailwindcss-forms styling (default is: 'colors.blue.600')
+ * @see: https://github.com/tailwindlabs/tailwindcss-forms/issues/14#issuecomment-1005376006
+ */
+[type="text"]:focus,
+[type="email"]:focus,
+[type="url"]:focus,
+[type="password"]:focus,
+[type="number"]:focus,
+[type="date"]:focus,
+[type="datetime-local"]:focus,
+[type="month"]:focus,
+[type="search"]:focus,
+[type="tel"]:focus,
+[type="checkbox"]:focus,
+[type="radio"]:focus,
+[type="time"]:focus,
+[type="week"]:focus,
+[multiple]:focus,
+textarea:focus,
+select:focus {
+  --tw-ring-color: var(--brand-color);
+  border-color: var(--brand-color);
+}
+
+@layer components {
+  .scroll-bar {
+    @apply scrollbar-thin scrollbar-thumb-rounded-md dark:scrollbar-thumb-darkgray-300 scrollbar-thumb-gray-300 scrollbar-track-transparent;
+  }
+}
+
+/* TODO: avoid global specific css */
+/* button[role="switch"][data-state="checked"] span {
+  transform: translateX(16px);
+} */
+
+@layer components {
+  /* slider */
+  .slider {
+    @apply relative flex h-4 w-40 select-none items-center;
+  }
+
+  .slider > .slider-track {
+    @apply relative h-1 flex-grow rounded-md bg-gray-400;
+  }
+
+  .slider .slider-range {
+    @apply absolute h-full rounded-full bg-gray-700;
+  }
+
+  .slider .slider-thumb {
+    @apply block h-3 w-3 cursor-pointer rounded-full bg-gray-700 transition-all;
+  }
+
+  .slider .slider-thumb:hover {
+    @apply bg-gray-600;
+  }
+
+  .slider .slider-thumb:focus {
+    box-shadow: 0 0 0 4px rgba(0, 0, 0, 0.2);
+  }
+}
+
+/* hide chat bubble on mobile */
+@media only screen and (max-width: 768px) {
+  /* Intercom FAB*/
+  #launcher {
+    display: none !important;
+  }
+
+  /* Zendesk FAB*/
+  div[role="presentation"] > iframe {
+    display: none !important;
+  }
+
+  /* Helpscout FAB*/
+  .BeaconFabButtonFrame {
+    margin-left: -30px;
+    left: 50%;
+    bottom: 28px !important;
+    z-index: 1058 !important;
+  }
+}
+
+/* TODO: implement styling for react-multi-email */
+
+/* !important to override react-dates */
+.DateRangePickerInput__withBorder {
+  border: 0 !important;
+}
+.DateInput_input {
+  border: 1px solid #d1d5db !important;
+  border-radius: 2px !important;
+  font-size: inherit !important;
+  font-weight: inherit !important;
+  color: #000;
+  padding: 11px ​11px 9px !important;
+  line-height: 16px !important;
+}
+
+.DateInput_input__focused {
+  border: 2px solid #000 !important;
+  border-radius: 2px !important;
+  box-shadow: none !important;
+  padding: 10px ​10px 9px !important;
+}
+
+.DateRangePickerInput_arrow {
+  padding: 0px 10px;
+}
+
+.loader {
+  display: block;
+  width: 30px;
+  height: 30px;
+  margin: 60px auto;
+  position: relative;
+  border-width: 4px;
+  border-style: solid;
+  animation: loader 2s infinite ease;
+}
+
+.loader-inner {
+  vertical-align: top;
+  display: inline-block;
+  width: 100%;
+  animation: loader-inner 2s infinite ease-in;
+}
+
+.no-ring-inset {
+  --tw-ring-inset: unset;
+}
+
+@keyframes loader {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  25% {
+    transform: rotate(180deg);
+  }
+
+  50% {
+    transform: rotate(180deg);
+  }
+
+  75% {
+    transform: rotate(360deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes loader-inner {
+  0% {
+    height: 0%;
+  }
+
+  25% {
+    height: 0%;
+  }
+
+  50% {
+    height: 100%;
+  }
+
+  75% {
+    height: 100%;
+  }
+
+  100% {
+    height: 0%;
+  }
+}
+
+.text-inverted-important {
+  color: white !important;
+}
+
+@layer utilities {
+  .transition-max-width {
+    -webkit-transition-property: max-width;
+    transition-property: max-width;
+  }
+}
+
+#timeZone input:focus {
+  box-shadow: none;
+}
+
+/* react-date-picker forces a border upon us, cast it away */
+.react-date-picker__wrapper {
+  border: none !important;
+}
+
+.react-date-picker__inputGroup__input {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+/* animations */
+.slideInBottom {
+  animation-duration: 0.3s;
+  animation-fill-mode: both;
+  animation-name: slideInBottom;
+}
+
+@keyframes slideInBottom {
+  from {
+    opacity: 0;
+    transform: translateY(30%);
+    pointer-events: none;
+  }
+  to {
+    opacity: 1;
+    pointer-events: auto;
+  }
+}
+
+/* animations */
+.slideInTop {
+  animation-duration: 0.3s;
+  animation-fill-mode: both;
+  animation-name: slideInTop;
+}
+
+@keyframes slideInTop {
+  from {
+    opacity: 0;
+    transform: translateY(-20%);
+    pointer-events: none;
+  }
+  to {
+    opacity: 1;
+    pointer-events: auto;
+    transform: translateY(0%);
+  }
+}
+
+.fadeIn {
+  animation-duration: 0.3s;
+  animation-fill-mode: both;
+  animation-name: fadeIn;
+  animation-timing-function: ease-in-out;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+/**
+ * Makes sure h-screen works on mobile Safari. By default h-screen
+ * does not take into account the height of the address bar, causing
+ * weird behaviour when scrolling — sometimes the height will be correct
+ * and sometimes it won't, depending on whether the address bar is
+ * in 'collapsed' state or not.
+ * @see: https://benborgers.com/posts/tailwind-h-screen
+ */
+@supports (-webkit-touch-callout: none) {
+  .h-screen {
+    height: -webkit-fill-available;
+  }
+}
+
+::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+.react-tel-input .country-list .country:hover,
+.react-tel-input .country-list .country.highlight {
+  @apply !bg-emphasis;
+}
+
+.react-tel-input .flag-dropdown .selected-flag,
+.react-tel-input .flag-dropdown.open .selected-flag {
+  @apply !bg-default;
+}
+
+.react-tel-input .flag-dropdown {
+  @apply !border-r-default left-0.5 !border-y-0 !border-l-0;
+}
+
+.intercom-lightweight-app  {
+  @apply z-40 !important;
+}

apps/ui-playground/app/layout.tsx

@@ -0,0 +1,31 @@
+import type { Metadata } from "next";
+import { Geist, Geist_Mono } from "next/font/google";
+
+import "./globals.css";
+
+const geistSans = Geist({
+  variable: "--font-geist-sans",
+  subsets: ["latin"],
+});
+
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",
+  subsets: ["latin"],
+});
+
+export const metadata: Metadata = {
+  title: "Create Next App",
+  description: "Generated by create next app",
+};
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html lang="en">
+      <body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>{children}</body>
+    </html>
+  );
+}

apps/ui-playground/app/page.tsx

@@ -0,0 +1,5 @@
+// import  AvatarDemo  from "./_components/AvatarDemo";
+
+export default function Home() {
+  return <div className="p-4 font-[family-name:var(--font-geist-sans)]">{/* <AvatarDemo /> */}</div>;
+}

apps/ui-playground/eslint.config.mjs

@@ -0,0 +1,16 @@
+import { dirname } from "path";
+import { fileURLToPath } from "url";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+});
+
+const eslintConfig = [
+  ...compat.extends("next/core-web-vitals", "next/typescript"),
+];
+
+export default eslintConfig;

apps/ui-playground/next.config.ts

@@ -0,0 +1,7 @@
+import type { NextConfig } from "next";
+
+const nextConfig: NextConfig = {
+  /* config options here */
+};
+
+export default nextConfig;

apps/ui-playground/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "ui-playground",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev --turbopack --port=1337",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "@calcom/config": "*",
+    "@calcom/lib": "*",
+    "@calcom/ui": "*",
+    "next": "15.1.6",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
+  },
+  "devDependencies": {
+    "@eslint/eslintrc": "^3",
+    "@types/node": "^20",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
+    "eslint": "^9",
+    "eslint-config-next": "15.1.6",
+    "postcss": "^8",
+    "tailwindcss": "^3.4.1",
+    "typescript": "^5"
+  }
+}

apps/ui-playground/postcss.config.mjs

@@ -0,0 +1,8 @@
+/** @type {import('postcss-load-config').Config} */
+const config = {
+  plugins: {
+    tailwindcss: {},
+  },
+};
+
+export default config;

apps/ui-playground/tailwind.config.ts

@@ -0,0 +1,8 @@
+import base from "@calcom/config/tailwind-preset";
+
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  ...base,
+  content: [...base.content],
+  plugins: [...base.plugins, require("tailwindcss-animate")],
+};

apps/ui-playground/tsconfig.json

@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./*"]
+    }
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "exclude": ["node_modules"]
+}

apps/web/abTest/middlewareFactory.ts

@@ -5,17 +5,7 @@ import { NextResponse, URLPattern } from "next/server";
 import { FUTURE_ROUTES_ENABLED_COOKIE_NAME, FUTURE_ROUTES_OVERRIDE_COOKIE_NAME } from "@calcom/lib/constants";
 
 const ROUTES: [URLPattern, boolean][] = [
-  ["/apps/installed/:category", process.env.APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED === "1"] as const,
-  ["/apps/:slug", process.env.APP_ROUTER_APPS_SLUG_ENABLED === "1"] as const,
   ["/apps/:slug/setup", process.env.APP_ROUTER_APPS_SLUG_SETUP_ENABLED === "1"] as const,
-  ["/apps/categories", process.env.APP_ROUTER_APPS_CATEGORIES_ENABLED === "1"] as const,
-  ["/apps/categories/:category", process.env.APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED === "1"] as const,
-  ["/auth/forgot-password/:path*", process.env.APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED === "1"] as const,
-  ["/auth/login", process.env.APP_ROUTER_AUTH_LOGIN_ENABLED === "1"] as const,
-  ["/auth/logout", process.env.APP_ROUTER_AUTH_LOGOUT_ENABLED === "1"] as const,
-  ["/auth/saml-idp", process.env.APP_ROUTER_AUTH_SAML_ENABLED === "1"] as const,
-  ["/auth/platform/:path*", process.env.APP_ROUTER_AUTH_PLATFORM_ENABLED === "1"] as const,
-  ["/auth/oauth2/:path*", process.env.APP_ROUTER_AUTH_OAUTH2_ENABLED === "1"] as const,
   ["/team", process.env.APP_ROUTER_TEAM_ENABLED === "1"] as const,
 ].map(([pathname, enabled]) => [
   new URLPattern({

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

@@ -0,0 +1,65 @@
+import { ShellMainAppDirBackButton } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton";
+import classNames from "classnames";
+
+import type { LayoutProps } from "@calcom/features/shell/Shell";
+
+// Copied from `ShellMain` but with a different `ShellMainAppDirBackButton` import
+// for client/server component separation
+export function ShellMainAppDir(props: LayoutProps) {
+  return (
+    <>
+      {(props.heading || !!props.backPath) && (
+        <div
+          className={classNames(
+            "flex items-center md:mb-6 md:mt-0",
+            props.smallHeading ? "lg:mb-7" : "lg:mb-8",
+            props.hideHeadingOnMobile ? "mb-0" : "mb-6"
+          )}>
+          {!!props.backPath && <ShellMainAppDirBackButton backPath={props.backPath} />}
+          {props.heading && (
+            <header
+              className={classNames(props.large && "py-8", "flex w-full max-w-full items-center truncate")}>
+              {props.HeadingLeftIcon && <div className="ltr:mr-4">{props.HeadingLeftIcon}</div>}
+              <div
+                className={classNames("w-full truncate ltr:mr-4 rtl:ml-4 md:block", props.headerClassName)}>
+                {props.heading && (
+                  <h3
+                    className={classNames(
+                      "font-cal text-emphasis max-w-28 sm:max-w-72 md:max-w-80 inline truncate text-lg font-semibold tracking-wide sm:text-xl md:block xl:max-w-full",
+                      props.smallHeading ? "text-base" : "text-xl",
+                      props.hideHeadingOnMobile && "hidden"
+                    )}>
+                    {props.heading}
+                  </h3>
+                )}
+                {props.subtitle && (
+                  <p className="text-default hidden text-sm md:block" data-testid="subtitle">
+                    {props.subtitle}
+                  </p>
+                )}
+              </div>
+              {props.beforeCTAactions}
+              {props.CTA && (
+                <div
+                  className={classNames(
+                    props.backPath
+                      ? "relative"
+                      : "pwa:bottom-[max(7rem,_calc(5rem_+_env(safe-area-inset-bottom)))] fixed bottom-20 z-40 ltr:right-4 rtl:left-4 md:z-auto md:ltr:right-0 md:rtl:left-0",
+                    "flex-shrink-0 [-webkit-app-region:no-drag] md:relative md:bottom-auto md:right-auto"
+                  )}>
+                  {props.CTA}
+                </div>
+              )}
+              {props.actions && props.actions}
+            </header>
+          )}
+        </div>
+      )}
+      {props.afterHeading && <>{props.afterHeading}</>}
+
+      <div className={classNames(props.flexChildrenContainer && "flex flex-1 flex-col")}>
+        {props.children}
+      </div>
+    </>
+  );
+}

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

@@ -0,0 +1,22 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+
+import type { LayoutProps } from "@calcom/features/shell/Shell";
+import { Button } from "@calcom/ui";
+
+export const ShellMainAppDirBackButton = ({ backPath }: { backPath: LayoutProps["backPath"] }) => {
+  const router = useRouter();
+  return (
+    <Button
+      variant="icon"
+      size="sm"
+      color="minimal"
+      onClick={() => (typeof backPath === "string" ? router.push(backPath as string) : router.back())}
+      StartIcon="arrow-left"
+      aria-label="Go Back"
+      className="rounded-md ltr:mr-2 rtl:ml-2"
+      data-testid="go-back-button"
+    />
+  );
+};

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

@@ -0,0 +1,46 @@
+import { _generateMetadata, getTranslate } from "app/_utils";
+// import { cookies, headers } from "next/headers";
+import { notFound } from "next/navigation";
+
+// import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+// import { buildLegacyRequest } from "@lib/buildLegacyCtx";
+// import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import AvailabilityPage, { AvailabilityCTA } from "~/availability/availability-view";
+
+import { ShellMainAppDir } from "../ShellMainAppDir";
+
+export const generateMetadata = async () => {
+  return await _generateMetadata(
+    (t) => t("availability"),
+    (t) => t("configure_availability")
+  );
+};
+
+const Page = async () => {
+  // const session = await getServerSession({ req: buildLegacyRequest(headers(), cookies()) });
+  // const userId = session?.user?.id;
+  // const orgId = session?.user?.org?.id;
+  // if (!userId || !orgId) {
+  //   notFound();
+  // }
+
+  try {
+    // const currentOrg = await OrganizationRepository.findCurrentOrg({
+    //   orgId,
+    //   userId,
+    // });
+    const t = await getTranslate();
+    return (
+      <ShellMainAppDir
+        heading={t("availability")}
+        subtitle={t("configure_availability")}
+        CTA={<AvailabilityCTA />}>
+        <AvailabilityPage />
+      </ShellMainAppDir>
+    );
+  } catch {
+    notFound();
+  }
+};
+
+export default Page;

apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx

@@ -1,5 +1,6 @@
+import { ShellMainAppDir } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDir";
 import type { PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata, getTranslate } from "app/_utils";
 import { redirect } from "next/navigation";
 import { z } from "zod";
 
@@ -16,17 +17,18 @@ export const generateMetadata = async () =>
     (t) => t("bookings_description")
   );
 
-export const generateStaticParams = async () => {
-  return validStatuses.map((status) => ({ status }));
-};
-
-const Page = ({ params }: PageProps) => {
+const Page = async ({ params }: PageProps) => {
   const parsed = querySchema.safeParse(params);
   if (!parsed.success) {
     redirect("/bookings/upcoming");
   }
+  const t = await getTranslate();
 
-  return <BookingsList status={parsed.data.status} />;
+  return (
+    <ShellMainAppDir heading={t("bookings")} subtitle={t("bookings_description")}>
+      <BookingsList status={parsed.data.status} />
+    </ShellMainAppDir>
+  );
 };
 
 export default Page;

apps/web/app/(use-page-wrapper)/(main-nav)/event-types/page.tsx

@@ -0,0 +1,42 @@
+import { ShellMainAppDir } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDir";
+import type { PageProps } from "app/_types";
+import { _generateMetadata, getTranslate } from "app/_utils";
+import { cookies, headers } from "next/headers";
+import { redirect } from "next/navigation";
+
+import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+
+import { ssrInit } from "@server/lib/ssr";
+
+import EventTypes, { EventTypesCTA } from "~/event-types/views/event-types-listing-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("event_types_page_title"),
+    (t) => t("event_types_page_subtitle")
+  );
+
+const Page = async ({ params, searchParams }: PageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+  const session = await getServerSession({ req: context.req });
+
+  if (!session?.user?.id) {
+    redirect("/auth/login");
+  }
+
+  await ssrInit(context);
+  const t = await getTranslate();
+
+  return (
+    <ShellMainAppDir
+      heading={t("event_types_page_title")}
+      subtitle={t("event_types_page_subtitle")}
+      CTA={<EventTypesCTA />}>
+      <EventTypes />
+    </ShellMainAppDir>
+  );
+};
+
+export default Page;

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

@@ -0,0 +1,11 @@
+import Shell from "@calcom/features/shell/Shell";
+
+const Layout = ({ children }: { children: React.ReactNode }) => {
+  return (
+    <Shell hideHeadingOnMobile withoutSeo={true} withoutMain={true}>
+      {children}
+    </Shell>
+  );
+};
+
+export default Layout;

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

@@ -0,0 +1,35 @@
+import { ShellMainAppDir } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDir";
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps as ServerPageProps } from "app/_types";
+import { _generateMetadata, getTranslate } from "app/_utils";
+import { cookies, headers } from "next/headers";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getServerSideProps } from "@lib/teams/getServerSideProps";
+
+import type { PageProps as ClientPageProps } from "~/teams/teams-view";
+import TeamsView, { TeamsCTA } from "~/teams/teams-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("teams"),
+    (t) => t("create_manage_teams_collaborative")
+  );
+
+const getData = withAppDirSsr<ClientPageProps>(getServerSideProps);
+
+const ServerPage = async ({ params, searchParams }: ServerPageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+  const props = await getData(context);
+  const t = await getTranslate();
+
+  return (
+    <ShellMainAppDir
+      CTA={<TeamsCTA />}
+      heading={t("teams")}
+      subtitle={t("create_manage_teams_collaborative")}>
+      <TeamsView {...props} />
+    </ShellMainAppDir>
+  );
+};
+export default ServerPage;

apps/web/app/(use-page-wrapper)/403/page.tsx

@@ -1,5 +1,4 @@
 import { _generateMetadata, getTranslate } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
 import { Button } from "@calcom/ui";
@@ -27,4 +26,4 @@ async function Error403() {
   );
 }
 
-export default WithLayout({ ServerPage: Error403 });
+export default Error403;