chore: release v4.9.4

Co-authored-by: CarinaWolli <wollencarina@gmail.com>

.env.example

@@ -107,6 +107,15 @@ NEXT_PUBLIC_POSTHOG_KEY=
 
 NEXT_PUBLIC_POSTHOG_HOST=
 
+# plain.com config
+
+PLAIN_API_KEY=
+PLAIN_API_URL=https://api.plain.com/v1
+PLAIN_HMAC_SECRET_KEY=
+PLAIN_CHAT_ID=
+PLAIN_CHAT_HMAC_SECRET_KEY=
+NEXT_PUBLIC_PLAIN_CHAT_EXCLUDED_PATHS=
+
 # Zendesk Config
 NEXT_PUBLIC_ZENDESK_KEY=
 
@@ -233,6 +242,7 @@ E2E_TEST_MAILHOG_ENABLED=
 
 # Cloudflare Turnstile
 NEXT_PUBLIC_CLOUDFLARE_SITEKEY=
+NEXT_PUBLIC_CLOUDFLARE_USE_TURNSTILE_IN_BOOKER=
 CLOUDFLARE_TURNSTILE_SECRET=
 
 # Set the following value to true if you wish to enable Team Impersonation
@@ -346,8 +356,6 @@ 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
-# whether we redirect to the future/event-types from event-types or not
-APP_ROUTER_EVENT_TYPES_ENABLED=0
 APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED=0
 APP_ROUTER_APPS_SLUG_ENABLED=0
 APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
@@ -355,18 +363,12 @@ APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
 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_BOOKING_ENABLED=0
-APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
-APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
 APP_ROUTER_APPS_ENABLED=0
 APP_ROUTER_TEAM_ENABLED=0
-APP_ROUTER_TEAMS_ENABLED=0
 APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED=0
 APP_ROUTER_AUTH_LOGIN_ENABLED=0
 APP_ROUTER_AUTH_LOGOUT_ENABLED=0
-APP_ROUTER_AUTH_NEW_ENABLED=0
 APP_ROUTER_AUTH_SAML_ENABLED=0
-APP_ROUTER_AUTH_ERROR_ENABLED=0
 APP_ROUTER_AUTH_PLATFORM_ENABLED=0
 APP_ROUTER_AUTH_OAUTH2_ENABLED=0
 
@@ -411,3 +413,8 @@ REPLEXICA_API_KEY=
 
 # Comma-separated list of DSyncData.directoryId to log SCIM API requests for. It can be enabled temporarily for debugging the requests being sent to SCIM server.
 DIRECTORY_IDS_TO_LOG=
+
+
+# Set this when Cal.com is used to serve only one organization's booking pages
+# Read more about it in the README.md
+NEXT_PUBLIC_SINGLE_ORG_SLUG=

.github/workflows/check-if-ui-has-changed.yml

@@ -1,39 +0,0 @@
-# .github/workflows/chromatic.yml
-
-# Workflow name
-name: "Chromatic"
-
-# Event for the workflow
-on:
-  pull_request_target: # So we can test on forks
-    branches:
-      - main
-    paths:
-      - apps/storybook/**
-      - packages/ui/**
-  workflow_dispatch:
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-# List of jobs
-jobs:
-  chromatic-deployment:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }} # So we can test on forks
-          fetch-depth: 0
-      - name: Install dependencies
-        run: yarn
-        # 👇 Adds Chromatic as a step in the workflow
-      - name: Publish to Chromatic
-        uses: chromaui/action@v1
-        # Options required to the GitHub Chromatic Action
-        with:
-          # 👇 Chromatic projectToken, refer to the manage page to obtain it.
-          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-          workingDir: "apps/storybook"
-          buildScriptName: "build"

.github/workflows/lint.yml

@@ -12,16 +12,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
-      - name: Run Linting with Reports
-        run: yarn lint:report
+      - name: Run Lint
+        run: yarn lint
         continue-on-error: true
-
-      - name: Merge lint reports
-        run: jq -s '[.[]]|flatten' lint-results/*.json &> lint-results/eslint_report.json
-
-      - name: Upload ESLint report
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: lint-results
-          path: lint-results

.yarn/patches/libphonenumber-js+1.11.18.patch

@@ -1,5 +1,5 @@
 diff --git a/index.cjs b/index.cjs
-index c83f700ae9998cd87b4c2d66ecbb2ad3d7b4603c..76a2200b57f0b9243e2c61464d578b67746ad5a4 100644
+index c83f700..da6fc7e 100644
 --- a/index.cjs
 +++ b/index.cjs
 @@ -13,8 +13,8 @@ function withMetadataArgument(func, _arguments) {
@@ -12,4 +12,4 @@ index c83f700ae9998cd87b4c2d66ecbb2ad3d7b4603c..76a2200b57f0b9243e2c61464d578b67
 +// exports['default'] = min.parsePhoneNumberFromString
  
  // `parsePhoneNumberFromString()` named export is now considered legacy:
- // it has been promoted to a default export due to being too verbose.
+ // it has been promoted to a default export due to being too verbose.

.yarn/versions/14a3a33b.yml

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

.yarn/versions/1b1ef70b.yml

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

.yarn/versions/52e3b28d.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"

.yarn/versions/727b22e1.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"

.yarn/versions/74098419.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/8864696c.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"

.yarn/versions/8e04affb.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

.yarn/versions/a1fc426b.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"

.yarn/versions/aa332bc0.yml

@@ -0,0 +1,2 @@
+undecided:
+  - calcom-monorepo

.yarn/versions/aecb4352.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/be9e9950.yml

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

.yarn/versions/c041b45d.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

.yarn/versions/c2e72c83.yml

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

.yarn/versions/c8975f9d.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"

.yarn/versions/c92a78d0.yml

@@ -0,0 +1,2 @@
+undecided:
+  - calcom-monorepo

.yarn/versions/d05ae1e0.yml

@@ -0,0 +1,3 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/prisma"

README.md

@@ -485,6 +485,15 @@ Don't code but still want to contribute? Join our [Discussions](https://github.c
 
 - Set CSP_POLICY="non-strict" env variable, which enables [Strict CSP](https://web.dev/strict-csp/) except for unsafe-inline in style-src . If you have some custom changes in your instance, you might have to make some code change to make your instance CSP compatible. Right now it enables strict CSP only on login page and on other SSR pages it is enabled in Report only mode to detect possible issues. On, SSG pages it is still not supported.
 
+## Single Org Mode
+If you want to have booker.yourcompany.com to be the domain used for both dashboard(e.g. https://booker.yourcompany.com/event-types) and booking pages(e.g. https://booker.yourcompany.com/john.joe/15min).
+- Set the `NEXT_PUBLIC_SINGLE_ORG_SLUG` environment variable to the slug of the organization you want to use. `NEXT_PUBLIC_SINGLE_ORG_SLUG=booker`
+- Set the `NEXT_PUBLIC_WEBAPP_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXT_PUBLIC_WEBAPP_URL=https://booker.yourcompany.com`.
+- Set the `NEXT_PUBLIC_WEBSITE_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXT_PUBLIC_WEBSITE_URL=https://booker.yourcompany.com`.
+- Set the `NEXTAUTH_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXTAUTH_URL=https://booker.yourcompany.com`.
+
+Note: It causes root to serve the dashboard and not the organization profile page which shows all bookable users in the organization.
+
 ## Integrations
 
 ### Obtaining the Google API Credentials

__checks__/organization.spec.ts

@@ -11,15 +11,15 @@ test.describe("Org", () => {
       await expectPageToBeRenderedWithEmbedSsr(page);
     });
 
-    test("Org User(Peer) Page should be embeddable", async ({ page }) => {
-      const response = await page.goto("https://i.cal.com/peer/embed");
+    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=Peer Richelsen")).toBeVisible();
+      await expect(page.locator("text=Rick in i.cal.com")).toBeVisible();
       await expectPageToBeRenderedWithEmbedSsr(page);
     });
 
-    test("Org User Event(peer/meet) Page should be embeddable", async ({ page }) => {
-      const response = await page.goto("https://i.cal.com/peer/meet/embed");
+    test("Org User Event(/team-rick/test-event) Page should be embeddable", async ({ page }) => {
+      const response = await page.goto("https://i.cal.com/team-rick/test-event/embed");
       expect(response?.status()).toBe(200);
       await expect(page.locator('[data-testid="decrementMonth"]')).toBeVisible();
       await expect(page.locator('[data-testid="incrementMonth"]')).toBeVisible();

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

@@ -1,9 +1,12 @@
+import type { RatelimitResponse } from "@unkey/ratelimit";
 import type { Request, Response } from "express";
 import type { NextApiResponse, NextApiRequest } from "next";
 import { createMocks } from "node-mocks-http";
 import { describe, it, expect, vi } from "vitest";
 
+import { handleAutoLock } from "@calcom/lib/autoLock";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
+import { HttpError } from "@calcom/lib/http-error";
 
 import { rateLimitApiKey } from "~/lib/helpers/rateLimitApiKey";
 
@@ -14,6 +17,10 @@ vi.mock("@calcom/lib/checkRateLimitAndThrowError", () => ({
   checkRateLimitAndThrowError: vi.fn(),
 }));
 
+vi.mock("@calcom/lib/autoLock", () => ({
+  handleAutoLock: vi.fn(),
+}));
+
 describe("rateLimitApiKey middleware", () => {
   it("should return 401 if no apiKey is provided", async () => {
     const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
@@ -55,15 +62,20 @@ describe("rateLimitApiKey middleware", () => {
       query: { apiKey: "test-key" },
     });
 
-    const rateLimiterResponse = {
+    const rateLimiterResponse: RatelimitResponse = {
       limit: 100,
       remaining: 99,
       reset: Date.now(),
+      success: true,
     };
 
-    (checkRateLimitAndThrowError as any).mockImplementationOnce(({ onRateLimiterResponse }) => {
-      onRateLimiterResponse(rateLimiterResponse);
-    });
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    (checkRateLimitAndThrowError as any).mockImplementationOnce(
+      ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => {
+        onRateLimiterResponse(rateLimiterResponse);
+      }
+    );
 
     // @ts-expect-error weird typing between middleware and createMocks
     await rateLimitApiKey(req, res, vi.fn() as any);
@@ -87,4 +99,135 @@ describe("rateLimitApiKey middleware", () => {
     expect(res._getStatusCode()).toBe(429);
     expect(res._getJSONData()).toEqual({ message: "Rate limit exceeded" });
   });
+
+  it("should lock API key when rate limit is repeatedly exceeded", async () => {
+    const { req, res } = createMocks({
+      method: "GET",
+      query: { apiKey: "test-key" },
+    });
+
+    const rateLimiterResponse: RatelimitResponse = {
+      success: false,
+      remaining: 0,
+      limit: 100,
+      reset: Date.now(),
+    };
+
+    // Mock rate limiter to trigger the onRateLimiterResponse callback
+    (checkRateLimitAndThrowError as any).mockImplementationOnce(
+      ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => {
+        onRateLimiterResponse(rateLimiterResponse);
+      }
+    );
+
+    // Mock handleAutoLock to indicate the key was locked
+    vi.mocked(handleAutoLock).mockResolvedValueOnce(true);
+
+    // @ts-expect-error weird typing between middleware and createMocks
+    await rateLimitApiKey(req, res, vi.fn() as any);
+
+    expect(handleAutoLock).toHaveBeenCalledWith({
+      identifier: "test-key",
+      identifierType: "apiKey",
+      rateLimitResponse: rateLimiterResponse,
+    });
+
+    expect(res._getStatusCode()).toBe(429);
+    expect(res._getJSONData()).toEqual({ message: "Too many requests" });
+  });
+
+  it("should handle API key not found error during auto-lock", async () => {
+    const { req, res } = createMocks({
+      method: "GET",
+      query: { apiKey: "test-key" },
+    });
+
+    const rateLimiterResponse: RatelimitResponse = {
+      success: false,
+      remaining: 0,
+      limit: 100,
+      reset: Date.now(),
+    };
+
+    // Mock rate limiter to trigger the onRateLimiterResponse callback
+    (checkRateLimitAndThrowError as any).mockImplementationOnce(
+      ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => {
+        onRateLimiterResponse(rateLimiterResponse);
+      }
+    );
+
+    // Mock handleAutoLock to throw a "No user found" error
+    vi.mocked(handleAutoLock).mockRejectedValueOnce(new Error("No user found for this API key."));
+
+    // @ts-expect-error weird typing between middleware and createMocks
+    await rateLimitApiKey(req, res, vi.fn() as any);
+
+    expect(handleAutoLock).toHaveBeenCalledWith({
+      identifier: "test-key",
+      identifierType: "apiKey",
+      rateLimitResponse: rateLimiterResponse,
+    });
+
+    expect(res._getStatusCode()).toBe(401);
+    expect(res._getJSONData()).toEqual({ message: "No user found for this API key." });
+  });
+
+  it("should continue if auto-lock returns false (not locked)", async () => {
+    const { req, res } = createMocks({
+      method: "GET",
+      query: { apiKey: "test-key" },
+    });
+
+    const rateLimiterResponse: RatelimitResponse = {
+      success: false,
+      remaining: 0,
+      limit: 100,
+      reset: Date.now(),
+    };
+
+    // Mock rate limiter to trigger the onRateLimiterResponse callback
+    (checkRateLimitAndThrowError as any).mockImplementationOnce(
+      ({ onRateLimiterResponse }: { onRateLimiterResponse: (response: RatelimitResponse) => void }) => {
+        onRateLimiterResponse(rateLimiterResponse);
+      }
+    );
+
+    // Mock handleAutoLock to indicate the key was not locked
+    vi.mocked(handleAutoLock).mockResolvedValueOnce(false);
+
+    const next = vi.fn();
+    // @ts-expect-error weird typing between middleware and createMocks
+    await rateLimitApiKey(req, res, next);
+
+    expect(handleAutoLock).toHaveBeenCalledWith({
+      identifier: "test-key",
+      identifierType: "apiKey",
+      rateLimitResponse: rateLimiterResponse,
+    });
+
+    // Verify headers were set but request continued
+    expect(res.getHeader("X-RateLimit-Limit")).toBe(rateLimiterResponse.limit);
+    expect(next).toHaveBeenCalled();
+  });
+
+  it("should handle HttpError during rate limiting", async () => {
+    const { req, res } = createMocks({
+      method: "GET",
+      query: { apiKey: "test-key" },
+    });
+
+    // Mock checkRateLimitAndThrowError to throw HttpError
+    vi.mocked(checkRateLimitAndThrowError).mockRejectedValueOnce(
+      new HttpError({
+        statusCode: 429,
+        message: "Custom rate limit error",
+      })
+    );
+
+    // @ts-expect-error weird typing between middleware and createMocks
+    await rateLimitApiKey(req, res, vi.fn() as any);
+
+    expect(res._getStatusCode()).toBe(429);
+    expect(res._getJSONData()).toEqual({ message: "Custom rate limit error" });
+  });
 });

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

@@ -1,6 +1,8 @@
 import type { NextMiddleware } from "next-api-middleware";
 
+import { handleAutoLock } from "@calcom/lib/autoLock";
 import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
+import { HttpError } from "@calcom/lib/http-error";
 
 export const rateLimitApiKey: NextMiddleware = async (req, res, next) => {
   if (!req.query.apiKey) return res.status(401).json({ message: "No apiKey provided" });
@@ -10,14 +12,34 @@ export const rateLimitApiKey: NextMiddleware = async (req, res, next) => {
     await checkRateLimitAndThrowError({
       identifier: req.query.apiKey as string,
       rateLimitingType: "api",
-      onRateLimiterResponse: (response) => {
+      onRateLimiterResponse: async (response) => {
         res.setHeader("X-RateLimit-Limit", response.limit);
         res.setHeader("X-RateLimit-Remaining", response.remaining);
         res.setHeader("X-RateLimit-Reset", response.reset);
+
+        try {
+          const didLock = await handleAutoLock({
+            identifier: req.query.apiKey as string, // Casting as this is verified in another middleware
+            identifierType: "apiKey",
+            rateLimitResponse: response,
+          });
+
+          if (didLock) {
+            return res.status(429).json({ message: "Too many requests" });
+          }
+        } catch (error) {
+          if (error instanceof Error && error.message === "No user found for this API key.") {
+            return res.status(401).json({ message: error.message });
+          }
+          throw error;
+        }
       },
     });
   } catch (error) {
-    res.status(429).json({ message: "Rate limit exceeded" });
+    if (error instanceof HttpError) {
+      return res.status(error.statusCode).json({ message: error.message });
+    }
+    return res.status(429).json({ message: "Rate limit exceeded" });
   }
 
   await next();

apps/api/v1/lib/utils/isLockedOrBlocked.ts

@@ -1,9 +1,9 @@
 import type { NextApiRequest } from "next";
 
-import { checkIfEmailInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
+import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
 
 export async function isLockedOrBlocked(req: NextApiRequest) {
   const user = req.user;
   if (!user?.email) return false;
-  return user.locked || (await checkIfEmailInWatchlistController(user.email));
+  return user.locked || (await checkIfEmailIsBlockedInWatchlistController(user.email));
 }

apps/api/v1/lib/validations/selected-calendar.ts

@@ -9,11 +9,25 @@ export const schemaSelectedCalendarBaseBodyParams = SelectedCalendar;
 
 export const schemaSelectedCalendarPublic = SelectedCalendar.omit({});
 
-export const schemaSelectedCalendarBodyParams = schemaSelectedCalendarBaseBodyParams.partial({
-  userId: true,
-});
+export const schemaSelectedCalendarBodyParams = schemaSelectedCalendarBaseBodyParams
+  .partial({
+    userId: true,
+  })
+  .omit({
+    // id will be set by the database
+    id: true,
+    // No eventTypeId support in API v1
+    eventTypeId: true,
+  });
 
-export const schemaSelectedCalendarUpdateBodyParams = schemaSelectedCalendarBaseBodyParams.partial();
+export const schemaSelectedCalendarUpdateBodyParams = schemaSelectedCalendarBaseBodyParams
+  .omit({
+    // id is decided by DB
+    id: true,
+    // No eventTypeId support in API v1
+    eventTypeId: true,
+  })
+  .partial();
 
 export const selectedCalendarIdSchema = schemaQueryIdAsString.transform((v, ctx) => {
   /** We can assume the first part is the userId since it's an integer */

apps/api/v1/lib/validations/shared/jsonSchema.ts

@@ -1,9 +1,11 @@
 import { z } from "zod";
 
 // Helper schema for JSON fields
-type Literal = boolean | number | string;
+type Literal = boolean | number | string | null;
 type Json = Literal | { [key: string]: Json } | Json[];
-const literalSchema = z.union([z.string(), z.number(), z.boolean()]);
+const literalSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
+const jsonObjectSchema = z.record(z.lazy(() => jsonSchema));
+const jsonArraySchema = z.array(z.lazy(() => jsonSchema));
 export const jsonSchema: z.ZodSchema<Json> = z.lazy(() =>
-  z.union([literalSchema, z.array(jsonSchema), z.record(jsonSchema)])
+  z.union([literalSchema, jsonObjectSchema, jsonArraySchema])
 );

apps/api/v1/package.json

@@ -14,7 +14,8 @@
     "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
     "start": "PORT=3003 next start",
     "docker-start-api": "PORT=80 next start",
-    "type-check": "tsc --pretty --noEmit"
+    "type-check": "tsc --pretty --noEmit",
+    "type-check:ci": "tsc-absolute --pretty --noEmit"
   },
   "devDependencies": {
     "@calcom/tsconfig": "*",

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

@@ -1,9 +1,10 @@
 import type { NextApiRequest } from "next";
 
 import type { UserWithCalendars } from "@calcom/lib/getConnectedDestinationCalendars";
-import { getConnectedDestinationCalendars } from "@calcom/lib/getConnectedDestinationCalendars";
+import { getConnectedDestinationCalendarsAndEnsureDefaultsInDb } from "@calcom/lib/getConnectedDestinationCalendars";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
+import { UserRepository } from "@calcom/lib/server/repository/user";
 import prisma from "@calcom/prisma";
 
 import { extractUserIdsFromQuery } from "~/lib/utils/extractUserIdsFromQuery";
@@ -104,12 +105,8 @@ async function getHandler(req: NextApiRequest) {
 
   const userIds = req.query.userId ? extractUserIdsFromQuery(req) : [userId];
 
-  const usersWithCalendars = await prisma.user.findMany({
-    where: { id: { in: userIds } },
-    include: {
-      selectedCalendars: true,
-      destinationCalendar: true,
-    },
+  const usersWithCalendars = await UserRepository.findManyByIdsIncludeDestinationAndSelectedCalendars({
+    ids: userIds,
   });
 
   return await getConnectedCalendars(usersWithCalendars);
@@ -117,11 +114,12 @@ async function getHandler(req: NextApiRequest) {
 
 async function getConnectedCalendars(users: UserWithCalendars[]) {
   const connectedDestinationCalendarsPromises = users.map((user) =>
-    getConnectedDestinationCalendars(user, false, prisma).then((connectedCalendarsResult) =>
-      connectedCalendarsResult.connectedCalendars.map((calendar) => ({
-        userId: user.id,
-        ...calendar,
-      }))
+    getConnectedDestinationCalendarsAndEnsureDefaultsInDb({ user, onboarding: false, prisma }).then(
+      (connectedCalendarsResult) =>
+        connectedCalendarsResult.connectedCalendars.map((calendar) => ({
+          userId: user.id,
+          ...calendar,
+        }))
     )
   );
   const connectedDestinationCalendars = await Promise.all(connectedDestinationCalendarsPromises);

apps/api/v1/pages/api/selected-calendars/[id]/_delete.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 
 import { defaultResponder } from "@calcom/lib/server";
-import prisma from "@calcom/prisma";
+import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 
 import { selectedCalendarIdSchema } from "~/lib/validations/selected-calendar";
 
@@ -49,7 +49,9 @@ import { selectedCalendarIdSchema } from "~/lib/validations/selected-calendar";
 export async function deleteHandler(req: NextApiRequest) {
   const { query } = req;
   const userId_integration_externalId = selectedCalendarIdSchema.parse(query);
-  await prisma.selectedCalendar.delete({ where: { userId_integration_externalId } });
+  await SelectedCalendarRepository.deleteUserLevel({
+    where: userId_integration_externalId,
+  });
   return { message: `Selected Calendar with id: ${query.id} deleted successfully` };
 }
 

apps/api/v1/pages/api/selected-calendars/[id]/_get.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 
 import { defaultResponder } from "@calcom/lib/server";
-import prisma from "@calcom/prisma";
+import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 
 import { schemaSelectedCalendarPublic, selectedCalendarIdSchema } from "~/lib/validations/selected-calendar";
 
@@ -49,8 +49,8 @@ import { schemaSelectedCalendarPublic, selectedCalendarIdSchema } from "~/lib/va
 export async function getHandler(req: NextApiRequest) {
   const { query } = req;
   const userId_integration_externalId = selectedCalendarIdSchema.parse(query);
-  const data = await prisma.selectedCalendar.findUniqueOrThrow({
-    where: { userId_integration_externalId },
+  const data = await SelectedCalendarRepository.findUserLevelUniqueOrThrow({
+    where: userId_integration_externalId,
   });
   return { selected_calendar: schemaSelectedCalendarPublic.parse(data) };
 }

apps/api/v1/pages/api/selected-calendars/[id]/_patch.ts

@@ -3,6 +3,8 @@ import type { NextApiRequest } from "next";
 
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
+import type { UpdateArguments } from "@calcom/lib/server/repository/selectedCalendar";
+import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 import prisma from "@calcom/prisma";
 
 import {
@@ -56,7 +58,7 @@ export async function patchHandler(req: NextApiRequest) {
   const { query, isSystemWideAdmin } = req;
   const userId_integration_externalId = selectedCalendarIdSchema.parse(query);
   const { userId: bodyUserId, ...data } = schemaSelectedCalendarUpdateBodyParams.parse(req.body);
-  const args: Prisma.SelectedCalendarUpdateArgs = { where: { userId_integration_externalId }, data };
+  const args: UpdateArguments = { where: { ...userId_integration_externalId }, data };
 
   if (!isSystemWideAdmin && bodyUserId)
     throw new HttpError({ statusCode: 403, message: `ADMIN required for userId` });
@@ -67,7 +69,7 @@ export async function patchHandler(req: NextApiRequest) {
     args.data.userId = bodyUserId;
   }
 
-  const result = await prisma.selectedCalendar.update(args);
+  const result = await SelectedCalendarRepository.updateUserLevel(args);
   return { selected_calendar: schemaSelectedCalendarPublic.parse(result) };
 }
 

apps/api/v1/pages/api/selected-calendars/_get.ts

@@ -1,9 +1,9 @@
-import type { Prisma } from "@prisma/client";
 import type { NextApiRequest } from "next";
 
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
-import prisma from "@calcom/prisma";
+import type { FindManyArgs } from "@calcom/lib/server/repository/selectedCalendar";
+import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 
 import { schemaSelectedCalendarPublic } from "~/lib/validations/selected-calendar";
 import { schemaQuerySingleOrMultipleUserIds } from "~/lib/validations/shared/queryUserId";
@@ -34,7 +34,7 @@ import { schemaQuerySingleOrMultipleUserIds } from "~/lib/validations/shared/que
 async function getHandler(req: NextApiRequest) {
   const { userId, isSystemWideAdmin } = req;
   /* Admin gets all selected calendar by default, otherwise only the user's ones */
-  const args: Prisma.SelectedCalendarFindManyArgs = isSystemWideAdmin ? {} : { where: { userId } };
+  const args: FindManyArgs = isSystemWideAdmin ? {} : { where: { userId } };
 
   /** Only admins can query other users */
   if (!isSystemWideAdmin && req.query.userId)
@@ -46,7 +46,7 @@ async function getHandler(req: NextApiRequest) {
     if (Array.isArray(query.userId)) args.orderBy = { userId: "asc" };
   }
 
-  const data = await prisma.selectedCalendar.findMany(args);
+  const data = await SelectedCalendarRepository.findManyUserLevel(args);
   return { selected_calendars: data.map((v) => schemaSelectedCalendarPublic.parse(v)) };
 }
 

apps/api/v1/pages/api/selected-calendars/_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 { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 import prisma from "@calcom/prisma";
 
 import {
@@ -52,7 +53,11 @@ import {
 async function postHandler(req: NextApiRequest) {
   const { userId, isSystemWideAdmin } = req;
   const { userId: bodyUserId, ...body } = schemaSelectedCalendarBodyParams.parse(req.body);
-  const args: Prisma.SelectedCalendarCreateArgs = { data: { ...body, userId } };
+  const args: {
+    data: Prisma.SelectedCalendarUncheckedCreateInput;
+  } = {
+    data: { ...body, userId },
+  };
 
   if (!isSystemWideAdmin && bodyUserId)
     throw new HttpError({ statusCode: 403, message: `ADMIN required for userId` });
@@ -63,7 +68,7 @@ async function postHandler(req: NextApiRequest) {
     args.data.userId = bodyUserId;
   }
 
-  const data = await prisma.selectedCalendar.create(args);
+  const data = await SelectedCalendarRepository.create(args.data);
 
   return {
     selected_calendar: schemaSelectedCalendarPublic.parse(data),

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

@@ -2,6 +2,7 @@ import type { NextApiRequest } from "next";
 
 import { getStripeCustomerIdFromUserId } from "@calcom/app-store/stripepayment/lib/customer";
 import stripe from "@calcom/app-store/stripepayment/lib/server";
+import { getDubCustomer } from "@calcom/features/auth/lib/dub";
 import { IS_PRODUCTION } from "@calcom/lib/constants";
 import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants";
 import { HttpError } from "@calcom/lib/http-error";
@@ -192,11 +193,26 @@ const generateTeamCheckoutSession = async ({
   pendingPaymentTeamId: number;
   ownerId: number;
 }) => {
-  const customer = await getStripeCustomerIdFromUserId(ownerId);
+  const [customer, dubCustomer] = await Promise.all([
+    getStripeCustomerIdFromUserId(ownerId),
+    getDubCustomer(ownerId.toString()),
+  ]);
+
   const session = await stripe.checkout.sessions.create({
     customer,
     mode: "subscription",
-    allow_promotion_codes: true,
+    ...(dubCustomer?.discount?.couponId
+      ? {
+          discounts: [
+            {
+              coupon:
+                process.env.NODE_ENV !== "production" && dubCustomer.discount.couponTestId
+                  ? dubCustomer.discount.couponTestId
+                  : dubCustomer.discount.couponId,
+            },
+          ],
+        }
+      : { allow_promotion_codes: true }),
     success_url: `${WEBAPP_URL}/api/teams/api/create?session_id={CHECKOUT_SESSION_ID}`,
     cancel_url: `${WEBAPP_URL}/settings/my-account/profile`,
     line_items: [

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

@@ -52,6 +52,8 @@ describe("POST /api/attendees", () => {
         bookingId: 1,
       };
 
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
       prismaMock.attendee.create.mockResolvedValue(attendeeData);
       req.isSystemWideAdmin = true;
       req.userId = 123;
@@ -84,7 +86,8 @@ describe("POST /api/attendees", () => {
         timeZone: "UTC",
         bookingId: 1,
       };
-
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
       prismaMock.attendee.create.mockResolvedValue(attendeeData);
 
       req.userId = 123;

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

@@ -11,7 +11,7 @@ import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload";
 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";
+import type { Booking } from "@calcom/prisma/client";
 
 import handler from "../../../pages/api/bookings/_post";
 

apps/api/v1/test/lib/event-types/[id]/_delete.test.ts

@@ -21,6 +21,8 @@ describe("DELETE /api/event-types/[id]", () => {
   beforeEach(() => {
     vi.resetAllMocks();
     // Mocking membership.findFirst
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
     prismaMock.membership.findFirst.mockImplementation(({ where }) => {
       const { userId, teamId, accepted, role } = where;
       const mockData = [

apps/api/v1/test/lib/event-types/_post.test.ts

@@ -72,6 +72,7 @@ describe("POST /api/event-types", () => {
         },
       });
       req.userId = memberUserId;
+      // @ts-expect-error - Return type is wrong
       vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => false);
 
       await handler(req, res);
@@ -114,6 +115,7 @@ describe("POST /api/event-types", () => {
       req.isSystemWideAdmin = true;
       req.userId = adminUserId;
 
+      // @ts-expect-error - Return type is wrong
       vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => false);
 
       await handler(req, res);
@@ -138,6 +140,7 @@ describe("POST /api/event-types", () => {
       req.isSystemWideAdmin = true;
       req.userId = adminUserId;
 
+      // @ts-expect-error - Return type is wrong
       vi.mocked(canUserAccessTeamWithRole).mockImplementationOnce(async () => true);
       vi.mocked(checkParentEventOwnership).mockImplementationOnce(async () => undefined);
       vi.mocked(checkUserMembership).mockImplementationOnce(async () => undefined);

apps/api/v1/test/lib/middleware/verifyApiKey.test.ts

@@ -5,6 +5,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { createMocks } from "node-mocks-http";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
+import type { ILicenseKeyService } from "@calcom/ee/common/server/LicenseKeyService";
 import LicenseKeyService from "@calcom/ee/common/server/LicenseKeyService";
 import prisma from "@calcom/prisma";
 import { MembershipRole, UserPermissionRole } from "@calcom/prisma/enums";
@@ -21,7 +22,7 @@ afterEach(() => {
 });
 
 describe("Verify API key", () => {
-  let service: LicenseKeyService;
+  let service: ILicenseKeyService;
 
   beforeEach(async () => {
     service = await LicenseKeyService.create();

apps/api/v1/test/lib/selected-calendars/_post.test.ts

@@ -79,6 +79,15 @@ describe("POST /api/selected-calendars", () => {
         integration: "google",
         externalId: "ext123",
         userId: 444444,
+        id: "xxx-xxx",
+        eventTypeId: null,
+        domainWideDelegationCredentialId: null,
+        googleChannelId: null,
+        googleChannelKind: null,
+        googleChannelResourceId: null,
+        googleChannelResourceUri: null,
+        googleChannelExpiration: null,
+        error: null,
       });
 
       await handler(req, res);
@@ -104,10 +113,19 @@ describe("POST /api/selected-calendars", () => {
       req.userId = 333333;
 
       prismaMock.selectedCalendar.create.mockResolvedValue({
+        id: "xxx-xxx",
         credentialId: 1,
         integration: "google",
         externalId: "ext123",
         userId: 333333,
+        googleChannelId: null,
+        googleChannelKind: null,
+        googleChannelResourceId: null,
+        googleChannelResourceUri: null,
+        googleChannelExpiration: null,
+        domainWideDelegationCredentialId: null,
+        eventTypeId: null,
+        error: null,
       });
 
       await handler(req, res);

apps/api/v1/test/lib/utils/isLockedOrBlocked.test.ts

@@ -2,6 +2,8 @@ import prismock from "../../../../../../tests/libs/__mocks__/prisma";
 
 import { describe, expect, it, beforeEach } from "vitest";
 
+import { WatchlistSeverity } from "@calcom/prisma/enums";
+
 import { isLockedOrBlocked } from "../../../lib/utils/isLockedOrBlocked";
 
 describe("isLockedOrBlocked", () => {
@@ -16,6 +18,7 @@ describe("isLockedOrBlocked", () => {
         {
           type: "DOMAIN",
           value: "blocked.com",
+          severity: WatchlistSeverity.CRITICAL,
           createdById: 1,
         },
       ],

apps/api/v2/package.json

@@ -29,7 +29,7 @@
     "@axiomhq/winston": "^1.2.0",
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.73",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.86",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
@@ -59,6 +59,7 @@
     "googleapis": "^84.0.0",
     "helmet": "^7.1.0",
     "ioredis": "^5.3.2",
+    "jsforce": "^1.11.0",
     "luxon": "^3.4.4",
     "nest-winston": "^1.9.4",
     "next-auth": "^4.22.1",

apps/api/v2/src/app.ts

@@ -18,6 +18,7 @@ import {
   CAL_API_VERSION_HEADER,
   X_CAL_CLIENT_ID,
   X_CAL_SECRET_KEY,
+  X_CAL_PLATFORM_EMBED,
 } from "@calcom/platform-constants";
 
 import { TRPCExceptionFilter } from "./filters/trpc-exception.filter";
@@ -45,6 +46,7 @@ export const bootstrap = (app: NestExpressApplication): NestExpressApplication =
     allowedHeaders: [
       X_CAL_CLIENT_ID,
       X_CAL_SECRET_KEY,
+      X_CAL_PLATFORM_EMBED,
       CAL_API_VERSION_HEADER,
       "Accept",
       "Authorization",

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

@@ -37,7 +37,7 @@ import { Request } from "express";
 import { NextApiRequest } from "next/types";
 import { v4 as uuidv4 } from "uuid";
 
-import { X_CAL_CLIENT_ID } from "@calcom/platform-constants";
+import { X_CAL_CLIENT_ID, X_CAL_PLATFORM_EMBED } from "@calcom/platform-constants";
 import { BOOKING_READ, SUCCESS_STATUS, BOOKING_WRITE } from "@calcom/platform-constants";
 import {
   handleNewRecurringBooking,
@@ -161,14 +161,15 @@ export class BookingsController_2024_04_15 {
   async createBooking(
     @Req() req: BookingRequest,
     @Body() body: CreateBookingInput_2024_04_15,
-    @Headers(X_CAL_CLIENT_ID) clientId?: string
+    @Headers(X_CAL_CLIENT_ID) clientId?: string,
+    @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<Partial<BookingResponse>>> {
     const oAuthClientId = clientId?.toString();
     const { orgSlug, locationUrl } = body;
     req.headers["x-cal-force-slug"] = orgSlug;
     try {
       const booking = await handleNewBooking(
-        await this.createNextApiBookingRequest(req, oAuthClientId, locationUrl)
+        await this.createNextApiBookingRequest(req, oAuthClientId, locationUrl, isEmbed)
       );
       if (booking.userId && booking.uid && booking.startTime) {
         void (await this.billingService.increaseUsageByUserId(booking.userId, {
@@ -192,13 +193,16 @@ export class BookingsController_2024_04_15 {
     @Req() req: BookingRequest,
     @Param("bookingId") bookingId: string,
     @Body() _: CancelBookingInput_2024_04_15,
-    @Headers(X_CAL_CLIENT_ID) clientId?: string
+    @Headers(X_CAL_CLIENT_ID) clientId?: string,
+    @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<{ bookingId: number; bookingUid: string; onlyRemovedAttendee: boolean }>> {
     const oAuthClientId = clientId?.toString();
     if (bookingId) {
       try {
         req.body.id = parseInt(bookingId);
-        const res = await handleCancelBooking(await this.createNextApiBookingRequest(req, oAuthClientId));
+        const res = await handleCancelBooking(
+          await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed)
+        );
         if (!res.onlyRemovedAttendee) {
           void (await this.billingService.cancelUsageByBookingUid(res.bookingUid));
         }
@@ -246,7 +250,8 @@ export class BookingsController_2024_04_15 {
   async createRecurringBooking(
     @Req() req: BookingRequest,
     @Body() _: CreateRecurringBookingInput_2024_04_15[],
-    @Headers(X_CAL_CLIENT_ID) clientId?: string
+    @Headers(X_CAL_CLIENT_ID) clientId?: string,
+    @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<BookingResponse[]>> {
     const oAuthClientId = clientId?.toString();
     try {
@@ -258,7 +263,7 @@ export class BookingsController_2024_04_15 {
       }
 
       const createdBookings: BookingResponse[] = await handleNewRecurringBooking(
-        await this.createNextApiRecurringBookingRequest(req, oAuthClientId)
+        await this.createNextApiRecurringBookingRequest(req, oAuthClientId, undefined, isEmbed)
       );
 
       createdBookings.forEach(async (booking) => {
@@ -284,13 +289,14 @@ export class BookingsController_2024_04_15 {
   async createInstantBooking(
     @Req() req: BookingRequest,
     @Body() _: CreateBookingInput_2024_04_15,
-    @Headers(X_CAL_CLIENT_ID) clientId?: string
+    @Headers(X_CAL_CLIENT_ID) clientId?: string,
+    @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<Awaited<ReturnType<typeof handleInstantMeeting>>>> {
     const oAuthClientId = clientId?.toString();
     req.userId = (await this.getOwnerId(req)) ?? -1;
     try {
       const instantMeeting = await handleInstantMeeting(
-        await this.createNextApiBookingRequest(req, oAuthClientId)
+        await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed)
       );
 
       if (instantMeeting.userId && instantMeeting.bookingUid) {
@@ -332,8 +338,14 @@ export class BookingsController_2024_04_15 {
     }
   }
 
-  private async getOAuthClientsParams(clientId: string): Promise<OAuthRequestParams> {
+  private async getOAuthClientsParams(clientId: string, isEmbed = false): Promise<OAuthRequestParams> {
     const res = { ...DEFAULT_PLATFORM_PARAMS };
+
+    if (isEmbed) {
+      // embed should ignore oauth client settings and enable emails by default
+      return { ...res, arePlatformEmailsEnabled: true };
+    }
+
     try {
       const client = await this.oAuthClientRepository.getOAuthClient(clientId);
       // fetch oAuthClient from db and use data stored in db to set these values
@@ -354,13 +366,14 @@ export class BookingsController_2024_04_15 {
   private async createNextApiBookingRequest(
     req: BookingRequest,
     oAuthClientId?: string,
-    platformBookingLocation?: string
+    platformBookingLocation?: string,
+    isEmbed?: string
   ): Promise<NextApiRequest & { userId?: number } & OAuthRequestParams> {
     const requestId = req.get("X-Request-Id");
     const clone = { ...req };
     const userId = (await this.getOwnerId(req)) ?? -1;
     const oAuthParams = oAuthClientId
-      ? await this.getOAuthClientsParams(oAuthClientId)
+      ? await this.getOAuthClientsParams(oAuthClientId, this.transformToBoolean(isEmbed))
       : DEFAULT_PLATFORM_PARAMS;
     this.logger.log(`createNextApiBookingRequest_2024_04_15`, {
       requestId,
@@ -377,12 +390,13 @@ export class BookingsController_2024_04_15 {
   private async createNextApiRecurringBookingRequest(
     req: BookingRequest,
     oAuthClientId?: string,
-    platformBookingLocation?: string
+    platformBookingLocation?: string,
+    isEmbed?: string
   ): Promise<NextApiRequest & { userId?: number } & OAuthRequestParams> {
     const clone = { ...req };
     const userId = (await this.getOwnerId(req)) ?? -1;
     const oAuthParams = oAuthClientId
-      ? await this.getOAuthClientsParams(oAuthClientId)
+      ? await this.getOAuthClientsParams(oAuthClientId, this.transformToBoolean(isEmbed))
       : DEFAULT_PLATFORM_PARAMS;
     const requestId = req.get("X-Request-Id");
     this.logger.log(`createNextApiRecurringBookingRequest_2024_04_15`, {
@@ -424,4 +438,8 @@ export class BookingsController_2024_04_15 {
 
     throw new InternalServerErrorException(errMsg);
   }
+
+  private transformToBoolean(v?: string): boolean {
+    return v && typeof v === "string" ? v.toLowerCase() === "true" : false;
+  }
 }

apps/api/v2/src/ee/bookings/2024-08-13/controllers/bookings.controller.ts

@@ -5,7 +5,7 @@ import { MarkAbsentBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/out
 import { ReassignBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reassign-booking.output";
 import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
 import { BookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/services/bookings.service";
-import { VERSION_2024_08_13_VALUE } from "@/lib/api-versions";
+import { VERSION_2024_08_13_VALUE, VERSION_2024_08_13 } from "@/lib/api-versions";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
@@ -65,6 +65,7 @@ import {
 @ApiHeader({
   name: "cal-api-version",
   description: `Must be set to \`2024-08-13\``,
+  example: VERSION_2024_08_13,
   required: true,
 })
 export class BookingsController_2024_08_13 {

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

@@ -952,7 +952,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               slug: recurringSeatedTventTypeSlug,
             });
             expect(firstBooking.attendees.length).toEqual(2);
-            expect(firstBooking.attendees[0]).toEqual({
+            const firstAttendee = firstBooking.attendees.find(
+              (attendee) => attendee.name === nameAttendeeOne
+            );
+            expect(firstAttendee).toEqual({
               name: nameAttendeeOne,
               email: emailAttendeeOne,
               timeZone: body.attendee.timeZone,
@@ -965,7 +968,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               },
               metadata: createdRecurringSeatedBooking[0].attendees[0].metadata,
             });
-            expect(firstBooking.attendees[1]).toEqual({
+            const secondAttendee = firstBooking.attendees.find(
+              (attendee) => attendee.name === nameAttendeeTwo
+            );
+            expect(secondAttendee).toEqual({
               name: nameAttendeeTwo,
               email: emailAttendeeTwo,
               timeZone: body.attendee.timeZone,

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

@@ -59,6 +59,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
     let team1EventTypeId: number;
     let team2EventTypeId: number;
+    let phoneOnlyEventTypeId: number;
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
@@ -205,6 +206,83 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       team1EventTypeId = team1EventType.id;
 
+      const phoneOnlyEventType = await eventTypesRepositoryFixture.createTeamEventType({
+        schedulingType: "ROUND_ROBIN",
+        team: {
+          connect: { id: team1.id },
+        },
+        title: "Phone Only Event Type",
+        slug: "phone-only-event-type",
+        length: 15,
+        assignAllTeamMembers: false,
+        hosts: {
+          connectOrCreate: [
+            {
+              where: {
+                userId_eventTypeId: {
+                  userId: teamUser.id,
+                  eventTypeId: team1EventTypeId,
+                },
+              },
+              create: {
+                userId: teamUser.id,
+                isFixed: true,
+              },
+            },
+          ],
+        },
+        bookingFields: [
+          {
+            name: "name",
+            type: "name",
+            label: "your name",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            variant: "fullName",
+            editable: "system",
+            required: true,
+            defaultLabel: "your_name",
+            variantsConfig: {
+              variants: {
+                fullName: {
+                  fields: [{ name: "fullName", type: "text", label: "your name", required: true }],
+                },
+              },
+            },
+          },
+          {
+            name: "email",
+            type: "email",
+            label: "your email",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system",
+            required: false,
+            defaultLabel: "email_address",
+          },
+          {
+            name: "attendeePhoneNumber",
+            type: "phone",
+            label: "phone_number",
+            sources: [{ id: "user", type: "user", label: "User", fieldRequired: true }],
+            editable: "user",
+            required: true,
+            placeholder: "",
+          },
+          {
+            name: "rescheduleReason",
+            type: "textarea",
+            views: [{ id: "reschedule", label: "Reschedule View" }],
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "reason_for_reschedule",
+            defaultPlaceholder: "reschedule_placeholder",
+          },
+        ],
+        locations: [],
+      });
+
+      phoneOnlyEventTypeId = phoneOnlyEventType.id;
+
       const team2EventType = await eventTypesRepositoryFixture.createTeamEventType({
         schedulingType: "COLLECTIVE",
         team: {
@@ -322,6 +400,60 @@ describe("Bookings Endpoints 2024-08-13", () => {
           });
       });
 
+      it("should create a phone based booking", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 15, 0, 0)).toISOString(),
+          eventTypeId: phoneOnlyEventTypeId,
+          attendee: {
+            name: "alice",
+            phoneNumber: "+919876543210",
+            timeZone: "Europe/Madrid",
+            language: "es",
+          },
+          meetingUrl: "https://meet.google.com/abc-def-ghi",
+        };
+
+        return request(app.getHttpServer())
+          .post("/v2/bookings")
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: CreateBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(responseDataIsBooking(responseBody.data)).toBe(true);
+
+            if (responseDataIsBooking(responseBody.data)) {
+              const data: BookingOutput_2024_08_13 = responseBody.data;
+              expect(data.id).toBeDefined();
+              expect(data.uid).toBeDefined();
+              expect(data.hosts.length).toEqual(1);
+              expect(data.hosts[0].id).toEqual(teamUser.id);
+              expect(data.status).toEqual("accepted");
+              expect(data.start).toEqual(body.start);
+              expect(data.end).toEqual(new Date(Date.UTC(2030, 0, 8, 15, 15, 0)).toISOString());
+              expect(data.duration).toEqual(15);
+              expect(data.eventTypeId).toEqual(phoneOnlyEventTypeId);
+              expect(data.attendees.length).toEqual(1);
+              expect(data.attendees[0]).toEqual({
+                name: body.attendee.name,
+                email: "919876543210@sms.cal.com",
+                phoneNumber: body.attendee.phoneNumber,
+                timeZone: body.attendee.timeZone,
+                language: body.attendee.language,
+                absent: false,
+              });
+              expect(data.meetingUrl).toEqual(body.meetingUrl);
+              expect(data.absentHost).toEqual(false);
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+
       it("should create a team 2 booking", async () => {
         const body: CreateBookingInput_2024_08_13 = {
           start: new Date(Date.UTC(2030, 0, 8, 10, 0, 0)).toISOString(),
@@ -398,7 +530,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               | RecurringBookingOutput_2024_08_13
               | GetSeatedBookingOutput_2024_08_13
             )[] = responseBody.data;
-            expect(data.length).toEqual(1);
+            expect(data.length).toEqual(2);
             expect(data[0].eventTypeId).toEqual(team1EventTypeId);
           });
       });
@@ -436,7 +568,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               | RecurringBookingOutput_2024_08_13
               | GetSeatedBookingOutput_2024_08_13
             )[] = responseBody.data;
-            expect(data.length).toEqual(2);
+            expect(data.length).toEqual(3);
             expect(data.find((booking) => booking.eventTypeId === team1EventTypeId)).toBeDefined();
             expect(data.find((booking) => booking.eventTypeId === team2EventTypeId)).toBeDefined();
           });

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

@@ -332,6 +332,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
           metadata: {
             userId: "100",
           },
+          guests: ["bob@gmail.com"],
         };
 
         const beforeCreate = new Date();
@@ -376,7 +377,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: body.attendee.name,
                 email: body.attendee.email,
                 ...body.bookingFieldsResponses,
+                guests: body.guests,
               });
+              expect(data.guests).toEqual(body.guests);
 
               // Check createdAt date is between the time of the request and after the request
               const createdAtDate = new Date(data.createdAt);

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

@@ -13,7 +13,6 @@ import { Request } from "express";
 import { z } from "zod";
 
 import {
-  handleNewBooking,
   handleNewRecurringBooking,
   getAllUserBookings,
   handleInstantMeeting,
@@ -23,6 +22,7 @@ import {
   handleMarkNoShow,
   confirmBookingHandler,
 } from "@calcom/platform-libraries";
+import { handleNewBooking } from "@calcom/platform-libraries";
 import {
   CreateBookingInput_2024_08_13,
   CreateBookingInput,
@@ -340,7 +340,10 @@ export class BookingsService_2024_08_13 {
     }
 
     const bookingRequest = await this.inputService.createCancelBookingRequest(request, bookingUid, body);
-    await handleCancelBooking(bookingRequest);
+    const res = await handleCancelBooking(bookingRequest);
+    if (!res.onlyRemovedAttendee) {
+      await this.billingService.cancelUsageByBookingUid(res.bookingUid);
+    }
 
     if ("cancelSubsequentBookings" in body && body.cancelSubsequentBookings) {
       return this.getAllRecurringBookingsByIndividualUid(bookingUid);

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

@@ -146,6 +146,8 @@ export class InputBookingsService_2024_08_13 {
     );
     const endTime = startTime.plus({ minutes: lengthInMinutes });
 
+    const guests = inputBooking.guests;
+
     return {
       start: startTime.toISO(),
       end: endTime.toISO(),
@@ -154,15 +156,22 @@ export class InputBookingsService_2024_08_13 {
       language: inputBooking.attendee.language || "en",
       metadata: inputBooking.metadata || {},
       hasHashedBookingLink: false,
-      guests: inputBooking.guests,
+      guests,
       // note(Lauris): responses with name and email are required by the handleNewBooking
       responses: inputBooking.bookingFieldsResponses
         ? {
             ...inputBooking.bookingFieldsResponses,
             name: inputBooking.attendee.name,
-            email: inputBooking.attendee.email,
+            email: inputBooking.attendee.email ?? "",
+            attendeePhoneNumber: inputBooking.attendee.phoneNumber,
+            guests,
           }
-        : { name: inputBooking.attendee.name, email: inputBooking.attendee.email },
+        : {
+            name: inputBooking.attendee.name,
+            email: inputBooking.attendee.email ?? "",
+            attendeePhoneNumber: inputBooking.attendee.phoneNumber,
+            guests,
+          },
     };
   }
 
@@ -246,6 +255,8 @@ export class InputBookingsService_2024_08_13 {
       inputBooking.attendee.timeZone
     );
 
+    const guests = inputBooking.guests;
+
     for (let i = 0; i < repeatsTimes; i++) {
       const endTime = startTime.plus({ minutes: eventType.length });
 
@@ -258,15 +269,16 @@ export class InputBookingsService_2024_08_13 {
         language: inputBooking.attendee.language || "en",
         metadata: inputBooking.metadata || {},
         hasHashedBookingLink: false,
-        guests: inputBooking.guests,
+        guests,
         // note(Lauris): responses with name and email are required by the handleNewBooking
         responses: inputBooking.bookingFieldsResponses
           ? {
               ...inputBooking.bookingFieldsResponses,
               name: inputBooking.attendee.name,
               email: inputBooking.attendee.email,
+              guests,
             }
-          : { name: inputBooking.attendee.name, email: inputBooking.attendee.email },
+          : { name: inputBooking.attendee.name, email: inputBooking.attendee.email, guests },
         schedulingType: eventType.schedulingType,
       });
 

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

@@ -72,6 +72,7 @@ type DatabaseBooking = Booking & {
     email: string;
     timeZone: string;
     locale: string | null;
+    phoneNumber?: string | null;
     noShow: boolean | null;
     bookingSeat?: BookingSeat | null;
   }[];
@@ -121,6 +122,7 @@ export class OutputBookingsService_2024_08_13 {
         timeZone: attendee.timeZone,
         language: attendee.locale,
         absent: !!attendee.noShow,
+        phoneNumber: attendee.phoneNumber ?? undefined,
       })),
       guests: bookingResponses.guests,
       location,

apps/api/v2/src/ee/calendars/controllers/calendars.controller.ts

@@ -86,18 +86,16 @@ export class CalendarsController {
 
   @UseGuards(ApiAuthGuard)
   @Get("/busy-times")
-  @ApiOperation({ summary: "Get busy times" })
+  @ApiOperation({
+    summary: "Get busy times",
+    description:
+      "Get busy times from a calendar. Example request URL is `https://api.cal.com/v2/calendars/busy-times?loggedInUsersTz=Europe%2FMadrid&dateFrom=2024-12-18&dateTo=2024-12-18&calendarsToLoad[0][credentialId]=135&calendarsToLoad[0][externalId]=skrauciz%40gmail.com`",
+  })
   async getBusyTimes(
     @Query() queryParams: CalendarBusyTimesInput,
     @GetUser() user: UserWithProfile
   ): Promise<GetBusyTimesOutput> {
     const { loggedInUsersTz, dateFrom, dateTo, calendarsToLoad } = queryParams;
-    if (!dateFrom || !dateTo) {
-      return {
-        status: SUCCESS_STATUS,
-        data: [],
-      };
-    }
 
     const busyTimes = await this.calendarsService.getBusyTimes(
       calendarsToLoad,

apps/api/v2/src/ee/calendars/services/calendars.service.ts

@@ -19,7 +19,10 @@ import { DateTime } from "luxon";
 import { z } from "zod";
 
 import { APPS_TYPE_ID_MAPPING } from "@calcom/platform-constants";
-import { getConnectedDestinationCalendars, getBusyCalendarTimes } from "@calcom/platform-libraries";
+import {
+  getConnectedDestinationCalendarsAndEnsureDefaultsInDb,
+  getBusyCalendarTimes,
+} from "@calcom/platform-libraries";
 import { Calendar } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
 
@@ -41,12 +44,18 @@ export class CalendarsService {
     if (!userWithCalendars) {
       throw new NotFoundException("User not found");
     }
-
-    return getConnectedDestinationCalendars(
-      userWithCalendars,
-      false,
-      this.dbWrite.prisma as unknown as PrismaClient
-    );
+    return getConnectedDestinationCalendarsAndEnsureDefaultsInDb({
+      user: {
+        ...userWithCalendars,
+        allSelectedCalendars: userWithCalendars.selectedCalendars,
+        userLevelSelectedCalendars: userWithCalendars.selectedCalendars.filter(
+          (calendar) => !calendar.eventTypeId
+        ),
+      },
+      onboarding: false,
+      eventTypeId: null,
+      prisma: this.dbWrite.prisma as unknown as PrismaClient,
+    });
   }
 
   async getBusyTimes(
@@ -64,7 +73,6 @@ export class CalendarsService {
     );
     try {
       const calendarBusyTimes = await getBusyCalendarTimes(
-        "",
         credentials,
         dateFrom,
         dateTo,

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

@@ -33,11 +33,18 @@ import {
   ApiSuccessResponse,
   CreateEventTypeInput_2024_06_14,
   EventTypeOutput_2024_06_14,
-  NameFieldInput_2024_06_14,
+  NameDefaultFieldInput_2024_06_14,
+  NotesDefaultFieldInput_2024_06_14,
   UpdateEventTypeInput_2024_06_14,
 } from "@calcom/platform-types";
 import { SchedulingType } from "@calcom/prisma/enums";
 
+const orderBySlug = (a: { slug: string }, b: { slug: string }) => {
+  if (a.slug < b.slug) return -1;
+  if (a.slug > b.slug) return 1;
+  return 0;
+};
+
 describe("Event types Endpoints", () => {
   describe("Not authenticated", () => {
     let app: INestApplication;
@@ -93,6 +100,67 @@ describe("Event types Endpoints", () => {
     let orgUserEventType1: EventType;
     let orgUserEventType2: EventType;
     let orgUserEventType3: EventType;
+
+    const defaultResponseBookingFieldName = {
+      isDefault: true,
+      type: "name",
+      slug: "name",
+      required: true,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldEmail = {
+      isDefault: true,
+      type: "email",
+      slug: "email",
+      required: true,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldLocation = {
+      isDefault: true,
+      type: "radioInput",
+      slug: "location",
+      required: false,
+      hidden: false,
+    };
+
+    const defaultResponseBookingFieldTitle = {
+      isDefault: true,
+      type: "text",
+      slug: "title",
+      required: true,
+      hidden: true,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldNotes = {
+      isDefault: true,
+      type: "textarea",
+      slug: "notes",
+      required: false,
+      hidden: false,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldGuests = {
+      isDefault: true,
+      type: "multiemail",
+      slug: "guests",
+      required: false,
+      hidden: false,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldRescheduleReason = {
+      isDefault: true,
+      type: "textarea",
+      slug: "rescheduleReason",
+      required: false,
+      hidden: false,
+      disableOnPrefill: false,
+    };
+
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
         userEmail,
@@ -253,7 +321,7 @@ describe("Event types Endpoints", () => {
     });
 
     it("should create an event type", async () => {
-      const nameBookingField: NameFieldInput_2024_06_14 = {
+      const nameBookingField: NameDefaultFieldInput_2024_06_14 = {
         type: "name",
         label: "Your name sir / madam",
         placeholder: "john doe",
@@ -291,6 +359,7 @@ describe("Event types Endpoints", () => {
             placeholder: "select language",
             options: ["javascript", "python", "cobol"],
             disableOnPrefill: true,
+            hidden: false,
           },
         ],
         scheduleId: firstSchedule.id,
@@ -378,16 +447,25 @@ describe("Event types Endpoints", () => {
           );
           expect(createdEventType.color).toEqual(body.color);
 
-          const requestBookingFields = body.bookingFields || [];
           const expectedBookingFields = [
-            { isDefault: true, required: true, slug: "name", ...nameBookingField },
-            { isDefault: true, required: true, slug: "email", type: "email" },
-            // note(Lauris): location booking field is added if multiple locations are passed
-            { isDefault: true, required: false, slug: "location", type: "radioInput" },
-            { isDefault: true, required: false, slug: "rescheduleReason", type: "textarea" },
-            ...requestBookingFields
-              .filter((field) => field.type !== "name" && field.type !== "email")
-              .map((field) => ({ isDefault: false, ...field })),
+            { ...defaultResponseBookingFieldName, ...nameBookingField },
+            { ...defaultResponseBookingFieldEmail },
+            { ...defaultResponseBookingFieldLocation },
+            {
+              type: "select",
+              label: "select which language you want to learn",
+              slug: "select-language",
+              required: true,
+              placeholder: "select language",
+              options: ["javascript", "python", "cobol"],
+              disableOnPrefill: true,
+              hidden: false,
+              isDefault: false,
+            },
+            { ...defaultResponseBookingFieldTitle },
+            { ...defaultResponseBookingFieldNotes },
+            { ...defaultResponseBookingFieldGuests },
+            { ...defaultResponseBookingFieldRescheduleReason },
           ];
 
           expect(createdEventType.bookingFields).toEqual(expectedBookingFields);
@@ -417,7 +495,9 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType?.lengthInMinutes).toEqual(eventType.lengthInMinutes);
       expect(fetchedEventType?.lengthInMinutesOptions).toEqual(eventType.lengthInMinutesOptions);
       expect(fetchedEventType?.locations).toEqual(eventType.locations);
-      expect(fetchedEventType?.bookingFields).toEqual(eventType.bookingFields);
+      expect(fetchedEventType?.bookingFields.sort(orderBySlug)).toEqual(
+        eventType.bookingFields.sort(orderBySlug).filter((f) => ("hidden" in f ? !f?.hidden : true))
+      );
       expect(fetchedEventType?.ownerId).toEqual(user.id);
       expect(fetchedEventType.bookingLimitsCount).toEqual(eventType.bookingLimitsCount);
       expect(fetchedEventType.onlyShowFirstAvailableSlot).toEqual(eventType.onlyShowFirstAvailableSlot);
@@ -440,7 +520,6 @@ describe("Event types Endpoints", () => {
     });
 
     it(`/GET/event-types by username and orgSlug`, async () => {
-      console.log(organization);
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types?username=${orgUser.username}&orgSlug=${organization.slug}`)
         .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
@@ -621,7 +700,6 @@ describe("Event types Endpoints", () => {
         .expect(201);
 
       const createdEventType = createResponse.body.data;
-      console.log("createdEventType: ", createdEventType);
 
       expect(createdEventType).toMatchObject({
         id: expect.any(Number),
@@ -764,13 +842,20 @@ describe("Event types Endpoints", () => {
     });
 
     it("should update event type", async () => {
-      const nameBookingField: NameFieldInput_2024_06_14 = {
+      const nameBookingField: NameDefaultFieldInput_2024_06_14 = {
         type: "name",
         label: "Your name sir / madam",
         placeholder: "john doe",
         disableOnPrefill: true,
       };
 
+      const notesBookingField: NotesDefaultFieldInput_2024_06_14 = {
+        slug: "notes",
+        label: "lemme take some notes",
+        placeholder: "write your notes here",
+        required: true,
+      };
+
       const newTitle = "Coding class in Italian!";
 
       const body: UpdateEventTypeInput_2024_06_14 = {
@@ -787,7 +872,9 @@ describe("Event types Endpoints", () => {
             placeholder: "select language",
             options: ["javascript", "python", "cobol"],
             disableOnPrefill: false,
+            hidden: false,
           },
+          notesBookingField,
         ],
         bookingLimitsCount: {
           day: 4,
@@ -850,14 +937,25 @@ describe("Event types Endpoints", () => {
           expect(updatedEventType.lengthInMinutes).toEqual(eventType.lengthInMinutes);
           expect(updatedEventType.locations).toEqual(eventType.locations);
 
-          const requestBookingFields = body.bookingFields || [];
           const expectedBookingFields = [
-            { isDefault: true, required: true, slug: "name", ...nameBookingField },
-            { isDefault: true, required: true, slug: "email", type: "email" },
-            { isDefault: true, required: false, slug: "rescheduleReason", type: "textarea" },
-            ...requestBookingFields
-              .filter((field) => field.type !== "name" && field.type !== "email")
-              .map((field) => ({ isDefault: false, ...field })),
+            { ...defaultResponseBookingFieldName, ...nameBookingField },
+            { ...defaultResponseBookingFieldEmail },
+            { ...defaultResponseBookingFieldLocation },
+            {
+              type: "select",
+              label: "select which language you want to learn",
+              slug: "select-language",
+              required: true,
+              placeholder: "select language",
+              options: ["javascript", "python", "cobol"],
+              disableOnPrefill: false,
+              hidden: false,
+              isDefault: false,
+            },
+            { ...defaultResponseBookingFieldTitle },
+            { ...defaultResponseBookingFieldNotes, ...notesBookingField },
+            { ...defaultResponseBookingFieldGuests },
+            { ...defaultResponseBookingFieldRescheduleReason },
           ];
 
           expect(updatedEventType.bookingFields).toEqual(expectedBookingFields);
@@ -974,7 +1072,9 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType?.lengthInMinutes).toEqual(eventType.lengthInMinutes);
       expect(fetchedEventType?.lengthInMinutesOptions).toEqual(eventType.lengthInMinutesOptions);
       expect(fetchedEventType?.locations).toEqual(eventType.locations);
-      expect(fetchedEventType?.bookingFields).toEqual(eventType.bookingFields);
+      expect(fetchedEventType?.bookingFields.sort(orderBySlug)).toEqual(
+        eventType.bookingFields.sort(orderBySlug).filter((f) => ("hidden" in f ? !f?.hidden : true))
+      );
       expect(fetchedEventType?.ownerId).toEqual(user.id);
       expect(fetchedEventType.bookingLimitsCount).toEqual(eventType.bookingLimitsCount);
       expect(fetchedEventType.onlyShowFirstAvailableSlot).toEqual(eventType.onlyShowFirstAvailableSlot);
@@ -1055,14 +1155,48 @@ describe("Event types Endpoints", () => {
     let legacyEventTypeId2: number;
 
     const expectedReturnSystemFields = [
-      { isDefault: true, required: true, slug: "name", type: "name" },
-      { isDefault: true, required: true, slug: "email", type: "email" },
-      { isDefault: true, type: "radioInput", slug: "location", required: false },
-      { isDefault: true, required: true, slug: "title", type: "text" },
-      { isDefault: true, required: false, slug: "notes", type: "textarea" },
-      { isDefault: true, required: false, slug: "guests", type: "multiemail" },
-      { isDefault: true, required: false, slug: "rescheduleReason", type: "textarea" },
-      { isDefault: true, type: "phone", slug: "attendeePhoneNumber", required: false },
+      { isDefault: true, required: true, slug: "name", type: "name", disableOnPrefill: false },
+      { isDefault: true, required: true, slug: "email", type: "email", disableOnPrefill: false },
+      {
+        isDefault: true,
+        type: "radioInput",
+        slug: "location",
+        required: false,
+        hidden: false,
+      },
+      { isDefault: true, required: true, slug: "title", type: "text", disableOnPrefill: false, hidden: true },
+      {
+        isDefault: true,
+        required: false,
+        slug: "guests",
+        type: "multiemail",
+        disableOnPrefill: false,
+        hidden: false,
+      },
+      {
+        isDefault: true,
+        required: false,
+        slug: "rescheduleReason",
+        type: "textarea",
+        disableOnPrefill: false,
+        hidden: false,
+      },
+      {
+        disableOnPrefill: false,
+        isDefault: true,
+        type: "phone",
+        slug: "attendeePhoneNumber",
+        required: false,
+        hidden: true,
+      },
+      {
+        isDefault: true,
+        required: false,
+        slug: "notes",
+        type: "textarea",
+        disableOnPrefill: false,
+        hidden: false,
+      },
     ];
 
     beforeAll(async () => {
@@ -1186,15 +1320,6 @@ describe("Event types Endpoints", () => {
             defaultLabel: "what_is_this_meeting_about",
             defaultPlaceholder: "",
           },
-          {
-            name: "notes",
-            type: "textarea",
-            sources: [{ id: "default", type: "default", label: "Default" }],
-            editable: "system-but-optional",
-            required: false,
-            defaultLabel: "additional_notes",
-            defaultPlaceholder: "share_additional_notes",
-          },
           {
             name: "guests",
             type: "multiemail",
@@ -1230,6 +1355,15 @@ describe("Event types Endpoints", () => {
             required: false,
             defaultLabel: "phone_number",
           },
+          {
+            name: "notes",
+            type: "textarea",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "additional_notes",
+            defaultPlaceholder: "share_additional_notes",
+          },
         ],
       };
       const legacyEventType = await eventTypesRepositoryFixture.create(legacyEventTypeInput, user.id);
@@ -1316,15 +1450,6 @@ describe("Event types Endpoints", () => {
             defaultLabel: "what_is_this_meeting_about",
             defaultPlaceholder: "",
           },
-          {
-            name: "notes",
-            type: "textarea",
-            sources: [{ id: "default", type: "default", label: "Default" }],
-            editable: "system-but-optional",
-            required: false,
-            defaultLabel: "additional_notes",
-            defaultPlaceholder: "share_additional_notes",
-          },
           {
             name: "guests",
             type: "multiemail",
@@ -1360,6 +1485,15 @@ describe("Event types Endpoints", () => {
             required: false,
             defaultLabel: "phone_number",
           },
+          {
+            name: "notes",
+            type: "textarea",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "additional_notes",
+            defaultPlaceholder: "share_additional_notes",
+          },
         ],
       };
       const legacyEventType = await eventTypesRepositoryFixture.create(legacyEventTypeInput, user.id);
@@ -1373,17 +1507,21 @@ describe("Event types Endpoints", () => {
           const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
           const fetchedEventType = responseBody.data;
 
-          expect(fetchedEventType.bookingFields).toEqual([
-            ...expectedReturnSystemFields,
-            {
-              isDefault: false,
-              type: userDefinedBookingField.type,
-              slug: userDefinedBookingField.name,
-              label: userDefinedBookingField.label,
-              required: userDefinedBookingField.required,
-              placeholder: userDefinedBookingField.placeholder,
-            },
-          ]);
+          expect(fetchedEventType.bookingFields.sort(orderBySlug)).toEqual(
+            [
+              {
+                isDefault: false,
+                type: userDefinedBookingField.type,
+                slug: userDefinedBookingField.name,
+                label: userDefinedBookingField.label,
+                required: userDefinedBookingField.required,
+                placeholder: userDefinedBookingField.placeholder,
+                disableOnPrefill: false,
+                hidden: false,
+              },
+              ...expectedReturnSystemFields,
+            ].sort(orderBySlug)
+          );
         });
     });
 
@@ -1461,42 +1599,53 @@ describe("Event types Endpoints", () => {
               type: "name",
               slug: "name",
               required: true,
+              disableOnPrefill: false,
             },
             {
               isDefault: true,
               type: "email",
               slug: "email",
               required: true,
+              disableOnPrefill: false,
             },
             {
               isDefault: true,
               type: "radioInput",
               slug: "location",
               required: false,
+              hidden: false,
             },
             {
               isDefault: true,
               type: "text",
               slug: "title",
               required: true,
+              disableOnPrefill: false,
+              hidden: true,
             },
             {
               isDefault: true,
               type: "textarea",
               slug: "notes",
               required: false,
+              disableOnPrefill: false,
+              hidden: false,
             },
             {
               isDefault: true,
               type: "multiemail",
               slug: "guests",
               required: false,
+              disableOnPrefill: false,
+              hidden: false,
             },
             {
               isDefault: true,
               type: "textarea",
               slug: "rescheduleReason",
               required: false,
+              disableOnPrefill: false,
+              hidden: false,
             },
           ]);
         });

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

@@ -34,6 +34,7 @@ import {
   UpdateEventTypeInput_2024_06_14,
   GetEventTypesQuery_2024_06_14,
   CreateEventTypeInput_2024_06_14,
+  EventTypeOutput_2024_06_14,
 } from "@calcom/platform-types";
 
 @Controller({
@@ -113,10 +114,26 @@ export class EventTypesController_2024_06_14 {
     @Query() queryParams: GetEventTypesQuery_2024_06_14
   ): Promise<GetEventTypesOutput_2024_06_14> {
     const eventTypes = await this.eventTypesService.getEventTypes(queryParams);
+    const eventTypesFormatted = this.eventTypeResponseTransformPipe.transform(eventTypes);
+    const eventTypesWithoutHiddenFields = eventTypesFormatted.map((eventType) => {
+      return {
+        ...eventType,
+        bookingFields: Array.isArray(eventType?.bookingFields)
+          ? eventType?.bookingFields
+              .map((field) => {
+                if ("hidden" in field) {
+                  return field.hidden !== true ? field : null;
+                }
+                return field;
+              })
+              .filter((f) => f)
+          : [],
+      };
+    }) as EventTypeOutput_2024_06_14[];
 
     return {
       status: SUCCESS_STATUS,
-      data: this.eventTypeResponseTransformPipe.transform(eventTypes),
+      data: eventTypesWithoutHiddenFields,
     };
   }
 

apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/input-event-types.service.ts

@@ -12,9 +12,12 @@ import {
   transformRecurrenceApiToInternal,
   systemBeforeFieldName,
   systemBeforeFieldEmail,
+  systemBeforeFieldLocation,
+  systemAfterFieldTitle,
+  systemAfterFieldNotes,
+  systemAfterFieldGuests,
   systemAfterFieldRescheduleReason,
   EventTypeMetaDataSchema,
-  systemBeforeFieldLocation,
   transformBookerLayoutsApiToInternal,
   transformConfirmationPolicyApiToInternal,
   transformEventColorsApiToInternal,
@@ -217,27 +220,46 @@ export class InputEventTypesService_2024_06_14 {
     inputBookingFields: CreateEventTypeInput_2024_06_14["bookingFields"],
     hasMultipleLocations: boolean
   ) {
-    const customFields: (SystemField | CustomField)[] = inputBookingFields
+    const internalFields: (SystemField | CustomField)[] = inputBookingFields
       ? transformBookingFieldsApiToInternal(inputBookingFields)
       : [];
-    const customFieldsWithoutNameEmail = customFields.filter(
-      (field) => field.type !== "name" && field.type !== "email"
+    const systemCustomFields = internalFields.filter((field) => !this.isUserCustomField(field));
+    const userCustomFields = internalFields.filter((field) => this.isUserCustomField(field));
+
+    const systemCustomNameField = systemCustomFields?.find((field) => field.type === "name");
+    const systemCustomEmailField = systemCustomFields?.find((field) => field.type === "email");
+    const systemCustomTitleField = systemCustomFields?.find((field) => field.name === "title");
+    const systemCustomNotesField = systemCustomFields?.find((field) => field.name === "notes");
+    const systemCustomGuestsField = systemCustomFields?.find((field) => field.name === "guests");
+    const systemCustomRescheduleReasonField = systemCustomFields?.find(
+      (field) => field.name === "rescheduleReason"
     );
-    const customNameField = customFields?.find((field) => field.type === "name");
-    const customEmailField = customFields?.find((field) => field.type === "email");
 
     const defaultFieldsBefore: (SystemField | CustomField)[] = [
-      customNameField || systemBeforeFieldName,
-      customEmailField || systemBeforeFieldEmail,
+      systemCustomNameField || systemBeforeFieldName,
+      systemCustomEmailField || systemBeforeFieldEmail,
+      systemBeforeFieldLocation,
     ];
-    // note(Lauris): if event type has multiple locations then a radio button booking field has to be displayed to allow booker to pick location
-    if (hasMultipleLocations) {
-      defaultFieldsBefore.push(systemBeforeFieldLocation);
-    }
 
-    const defaultFieldsAfter = [systemAfterFieldRescheduleReason];
+    const defaultFieldsAfter = [
+      systemCustomTitleField || systemAfterFieldTitle,
+      systemCustomNotesField || systemAfterFieldNotes,
+      systemCustomGuestsField || systemAfterFieldGuests,
+      systemCustomRescheduleReasonField || systemAfterFieldRescheduleReason,
+    ];
 
-    return [...defaultFieldsBefore, ...customFieldsWithoutNameEmail, ...defaultFieldsAfter];
+    return [...defaultFieldsBefore, ...userCustomFields, ...defaultFieldsAfter];
+  }
+
+  isUserCustomField(field: SystemField | CustomField): field is CustomField {
+    return (
+      field.type !== "name" &&
+      field.type !== "email" &&
+      field.name !== "title" &&
+      field.name !== "notes" &&
+      field.name !== "guests" &&
+      field.name !== "rescheduleReason"
+    );
   }
 
   transformInputIntervalLimits(inputBookingFields: CreateEventTypeInput_2024_06_14["bookingLimitsCount"]) {

apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.ts

@@ -128,6 +128,7 @@ export class OutputEventTypesService_2024_06_14 {
     const bookingFields = databaseEventType.bookingFields
       ? this.transformBookingFields(databaseEventType.bookingFields)
       : this.getDefaultBookingFields(isOrgTeamEvent);
+
     const recurrence = this.transformRecurringEvent(databaseEventType.recurringEvent);
     const metadata = this.transformMetadata(databaseEventType.metadata) || {};
     const users = this.transformUsers(databaseEventType.users || []);

apps/api/v2/src/ee/platform-endpoints-module.ts

@@ -9,6 +9,7 @@ import { ProviderModule } from "@/ee/provider/provider.module";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module";
 import { SlotsModule } from "@/modules/slots/slots.module";
+import { TeamsEventTypesModule } from "@/modules/teams/event-types/teams-event-types.module";
 import { TeamsModule } from "@/modules/teams/teams/teams.module";
 import { TeamsMembershipsModule } from "@/modules/teams/memberships/teams-memberships.module";
 import type { MiddlewareConsumer, NestModule } from "@nestjs/common";
@@ -20,6 +21,7 @@ import { Module } from "@nestjs/common";
     ProviderModule,
     SchedulesModule_2024_04_15,
     SchedulesModule_2024_06_11,
+    TeamsEventTypesModule,
     MeModule,
     EventTypesModule_2024_04_15,
     EventTypesModule_2024_06_14,

apps/api/v2/src/ee/schedules/schedules_2024_06_11/services/output-schedules.service.ts

@@ -10,7 +10,7 @@ export class OutputSchedulesService_2024_06_11 {
 
   async getResponseSchedule(databaseSchedule: Schedule & { availability: Availability[] }) {
     if (!databaseSchedule.timeZone) {
-      throw new Error("Failed to create schedule because its timezone is not set.");
+      databaseSchedule.timeZone = "Europe/London";
     }
 
     const ownerDefaultScheduleId = await this.usersRepository.getUserScheduleDefaultId(

apps/api/v2/src/lib/is-origin-allowed/is-origin-allowed.spec.ts

@@ -41,6 +41,18 @@ describe("isOriginAllowed", () => {
       const origin = "https://sub.mydomain.com/path/to/resource";
       expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
     });
+
+    it("should handle patterns with wildcard for routes correctly", () => {
+      const allowedOrigins = ["https://domain.com/*"];
+      const origin = "https://domain.com/dashboard";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
+
+    it("should handle patterns with wildcard for root route correctly", () => {
+      const allowedOrigins = ["https://domain.com*"];
+      const origin = "https://domain.com";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
   });
 
   describe("is not allowed", () => {

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

@@ -8,12 +8,13 @@ import { CredentialsRepository } from "@/modules/credentials/credentials.reposit
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { OrganizationsModule } from "@/modules/organizations/organizations.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TeamsEventTypesModule } from "@/modules/teams/event-types/teams-event-types.module";
 import { UsersService } from "@/modules/users/services/users.service";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { Module } from "@nestjs/common";
 
 @Module({
-  imports: [PrismaModule, EventTypesModule_2024_06_14, OrganizationsModule],
+  imports: [PrismaModule, EventTypesModule_2024_06_14, OrganizationsModule, TeamsEventTypesModule],
   providers: [
     EventTypesAtomService,
     ConferencingAtomsService,

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

@@ -2,10 +2,9 @@ import { EventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_
 import { AtomsRepository } from "@/modules/atoms/atoms.repository";
 import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
-import { OrganizationsEventTypesService } from "@/modules/organizations/services/event-types/organizations-event-types.service";
+import { TeamsEventTypesService } from "@/modules/teams/event-types/services/teams-event-types.service";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
-import { TeamsRepository } from "@/modules/teams/teams/teams.repository";
 import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable, NotFoundException, ForbiddenException } from "@nestjs/common";
@@ -50,7 +49,7 @@ export class EventTypesAtomService {
     private readonly dbWrite: PrismaWriteService,
     private readonly dbRead: PrismaReadService,
     private readonly eventTypeService: EventTypesService_2024_06_14,
-    private readonly teamEventTypeService: OrganizationsEventTypesService
+    private readonly teamEventTypeService: TeamsEventTypesService
   ) {}
 
   async getUserEventType(user: UserWithProfile, eventTypeId: number) {

apps/api/v2/src/modules/auth/decorators/get-user/get-user.decorator.ts

@@ -1,22 +1,18 @@
-import { UserWithProfile } from "@/modules/users/users.repository";
+import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
 import { ExecutionContext } from "@nestjs/common";
 import { createParamDecorator } from "@nestjs/common";
 
-export type GetUserReturnType = UserWithProfile & { isSystemAdmin: boolean };
-
 export const GetUser = createParamDecorator<
-  keyof GetUserReturnType | (keyof GetUserReturnType)[],
+  keyof ApiAuthGuardUser | (keyof ApiAuthGuardUser)[],
   ExecutionContext
 >((data, ctx) => {
   const request = ctx.switchToHttp().getRequest();
-  const user = request.user as GetUserReturnType;
+  const user = request.user as ApiAuthGuardUser;
 
   if (!user) {
     throw new Error("GetUser decorator : User not found");
   }
 
-  user.isSystemAdmin = user.role === "ADMIN";
-
   if (Array.isArray(data)) {
     return data.reduce((prev, curr) => {
       return {

apps/api/v2/src/modules/auth/guards/billing/platform-plan.guard.ts

@@ -1,5 +1,5 @@
 import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
-import { GetUserReturnType } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
 import { PlatformPlanType } from "@/modules/billing/types";
 import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
 import { RedisService } from "@/modules/redis/redis.service";
@@ -19,7 +19,7 @@ export class PlatformPlanGuard implements CanActivate {
     const request = context.switchToHttp().getRequest<Request>();
     const teamId = request.params.teamId as string;
     const orgId = request.params.orgId as string;
-    const user = request.user as GetUserReturnType;
+    const user = request.user as ApiAuthGuardUser;
     const minimumPlan = this.reflector.get(PlatformPlan, context.getHandler()) as PlatformPlanType;
 
     const REDIS_CACHE_KEY = `apiv2:user:${user?.id ?? "none"}:org:${orgId ?? "none"}:team:${

apps/api/v2/src/modules/auth/guards/roles/roles.guard.ts

@@ -1,6 +1,6 @@
 import { ORG_ROLES, TEAM_ROLES, SYSTEM_ADMIN_ROLE } from "@/lib/roles/constants";
-import { GetUserReturnType } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { RedisService } from "@/modules/redis/redis.service";
 import { Injectable, CanActivate, ExecutionContext, ForbiddenException, Logger } from "@nestjs/common";
@@ -22,7 +22,7 @@ export class RolesGuard implements CanActivate {
     const request = context.switchToHttp().getRequest<Request & { team: Team }>();
     const teamId = request.params.teamId as string;
     const orgId = request.params.orgId as string;
-    const user = request.user as GetUserReturnType;
+    const user = request.user as ApiAuthGuardUser;
     const allowedRole = this.reflector.get(Roles, context.getHandler());
     const REDIS_CACHE_KEY = `apiv2:user:${user.id ?? "none"}:org:${orgId ?? "none"}:team:${
       teamId ?? "none"

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

@@ -17,6 +17,8 @@ import { getToken } from "next-auth/jwt";
 
 import { INVALID_ACCESS_TOKEN, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
 
+export type ApiAuthGuardUser = UserWithProfile & { isSystemAdmin: boolean };
+
 @Injectable()
 export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth") {
   constructor(
@@ -75,12 +77,19 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
 
   async authenticateNextAuth(token: { email?: string | null }) {
     const user = await this.nextAuthStrategy(token);
-    return this.success(user);
+    return this.success(this.getSuccessUser(user));
+  }
+
+  getSuccessUser(user: UserWithProfile): ApiAuthGuardUser {
+    return {
+      ...user,
+      isSystemAdmin: user.role === "ADMIN",
+    };
   }
 
   async authenticateOAuthClient(oAuthClientId: string, oAuthClientSecret: string) {
     const user = await this.oAuthClientStrategy(oAuthClientId, oAuthClientSecret);
-    return this.success(user);
+    return this.success(this.getSuccessUser(user));
   }
 
   async oAuthClientStrategy(oAuthClientId: string, oAuthClientSecret: string) {
@@ -119,7 +128,7 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
         return this.error(new UnauthorizedException("No user associated with the provided token"));
       }
 
-      return this.success(user);
+      return this.success(this.getSuccessUser(user));
     } catch (err) {
       if (err instanceof Error) {
         return this.error(err);
@@ -170,7 +179,7 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
 
     if (origin && !isOriginAllowed(origin, client.redirectUris)) {
       throw new UnauthorizedException(
-        `Invalid request origin - please open https://app.cal.com/settings/platform and add the origin '${origin}' to the 'Redirect uris' of your OAuth client.`
+        `Invalid request origin - please open https://app.cal.com/settings/platform and add the origin '${origin}' to the 'Redirect uris' of your OAuth client with ID '${client.id}'`
       );
     }
 

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

@@ -220,6 +220,7 @@ describe("OAuth Client Users Endpoints", () => {
       await userConnectedToOAuth(responseBody.data.user.email);
       await userHasDefaultEventTypes(responseBody.data.user.id);
       await userHasDefaultSchedule(responseBody.data.user.id, responseBody.data.user.defaultScheduleId);
+      await userHasOnlyOneSchedule(responseBody.data.user.id);
     });
 
     async function userConnectedToOAuth(userEmail: string) {
@@ -260,6 +261,11 @@ describe("OAuth Client Users Endpoints", () => {
       expect(schedule?.userId).toEqual(userId);
     }
 
+    async function userHasOnlyOneSchedule(userId: number) {
+      const schedules = await schedulesRepositoryFixture.getByUserId(userId);
+      expect(schedules?.length).toEqual(1);
+    }
+
     it(`should fail /POST using already used managed user email`, async () => {
       const requestBody: CreateManagedUserInput = {
         email: userEmail,

apps/api/v2/src/modules/oauth-clients/guards/oauth-client-guard.ts

@@ -1,4 +1,4 @@
-import { GetUserReturnType } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
 import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
 import { UsersService } from "@/modules/users/services/users.service";
 import {
@@ -15,8 +15,8 @@ export class OAuthClientGuard implements CanActivate {
   constructor(private oAuthClientRepository: OAuthClientRepository, private usersService: UsersService) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
-    const request = context.switchToHttp().getRequest<Request & { user: GetUserReturnType }>();
-    const user: GetUserReturnType = request.user;
+    const request = context.switchToHttp().getRequest<Request & { user: ApiAuthGuardUser }>();
+    const user: ApiAuthGuardUser = request.user;
     const organizationId = user ? this.usersService.getUserMainOrgId(user) : null;
     const oAuthClientId = request.params.clientId;
 

apps/api/v2/src/modules/ooo/guards/is-user-ooo.ts

@@ -0,0 +1,30 @@
+import { UserOOORepository } from "@/modules/ooo/repositories/ooo.repository";
+import { Injectable, CanActivate, ExecutionContext, ForbiddenException } from "@nestjs/common";
+import { Request } from "express";
+
+@Injectable()
+export class IsUserOOO implements CanActivate {
+  constructor(private oooRepo: UserOOORepository) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request>();
+    const oooId: string = request.params.oooId;
+    const userId: string = request.params.userId;
+
+    if (!userId) {
+      throw new ForbiddenException("No user id found in request params.");
+    }
+
+    if (!oooId) {
+      throw new ForbiddenException("No ooo entry id found in request params.");
+    }
+
+    const ooo = await this.oooRepo.getUserOOOByIdAndUserId(Number(oooId), Number(userId));
+
+    if (ooo) {
+      return true;
+    }
+
+    throw new ForbiddenException("This OOO entry does not belong to this user.");
+  }
+}

apps/api/v2/src/modules/ooo/inputs/ooo.input.ts

@@ -0,0 +1,128 @@
+import { BadRequestException } from "@nestjs/common";
+import { ApiProperty, ApiPropertyOptional, PartialType } from "@nestjs/swagger";
+import { Transform } from "class-transformer";
+import { IsDate, IsInt, IsOptional, IsString, IsEnum, isDate } from "class-validator";
+
+import { SkipTakePagination } from "@calcom/platform-types";
+
+export enum OutOfOfficeReason {
+  UNSPECIFIED = "unspecified",
+  VACATION = "vacation",
+  TRAVEL = "travel",
+  SICK_LEAVE = "sick",
+  PUBLIC_HOLIDAY = "public_holiday",
+}
+
+export type OutOfOfficeReasonType = `${OutOfOfficeReason}`;
+
+const isDateString = (dateString: string) => {
+  try {
+    const isoDateRegex = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d{3})?Z$/;
+    return isoDateRegex.test(dateString);
+  } catch {
+    throw new BadRequestException("Invalid Date.");
+  }
+};
+
+export class CreateOutOfOfficeEntryDto {
+  @Transform(({ value }: { value: string }) => {
+    if (isDateString(value)) {
+      const date = new Date(value);
+      date.setUTCHours(0, 0, 0, 0);
+      return date;
+    }
+    throw new BadRequestException("Invalid Date.");
+  })
+  @IsDate()
+  @ApiProperty({
+    description: "The start date and time of the out of office period in ISO 8601 format in UTC timezone.",
+    example: "2023-05-01T00:00:00.000Z",
+  })
+  start!: Date;
+
+  @Transform(({ value }: { value: string }) => {
+    if (isDateString(value)) {
+      const date = new Date(value);
+      date.setUTCHours(23, 59, 59, 999);
+      return date;
+    }
+    throw new BadRequestException("Invalid Date.");
+  })
+  @IsDate()
+  @ApiProperty({
+    description: "The end date and time of the out of office period in ISO 8601 format in UTC timezone.",
+    example: "2023-05-10T23:59:59.999Z",
+  })
+  end!: Date;
+
+  @IsString()
+  @IsOptional()
+  @ApiPropertyOptional({
+    description: "Optional notes for the out of office entry.",
+    example: "Vacation in Hawaii",
+  })
+  notes?: string;
+
+  @IsInt()
+  @IsOptional()
+  @ApiPropertyOptional({
+    description: "The ID of the user covering for the out of office period, if applicable.",
+    example: 2,
+  })
+  toUserId?: number;
+
+  @IsEnum(OutOfOfficeReason)
+  @IsOptional()
+  @ApiPropertyOptional({
+    description: "the reason for the out of office entry, if applicable",
+    example: "vacation",
+    enum: OutOfOfficeReason,
+  })
+  reason?: OutOfOfficeReasonType;
+}
+
+export class UpdateOutOfOfficeEntryDto extends PartialType(CreateOutOfOfficeEntryDto) {}
+
+export enum SortOrder {
+  asc = "asc",
+  desc = "desc",
+}
+type SortOrderType = keyof typeof SortOrder;
+
+export class GetOutOfOfficeEntryFiltersDTO extends SkipTakePagination {
+  @IsOptional()
+  @IsEnum(SortOrder, {
+    message: 'SortStart must be either "asc" or "desc".',
+  })
+  @ApiProperty({
+    required: false,
+    description: "Sort results by their start time in ascending or descending order.",
+    example: "?sortStart=asc OR ?sortStart=desc",
+    enum: SortOrder,
+  })
+  sortStart?: SortOrderType;
+
+  @IsOptional()
+  @IsEnum(SortOrder, {
+    message: 'SortEnd must be either "asc" or "desc".',
+  })
+  @ApiProperty({
+    required: false,
+    description: "Sort results by their end time in ascending or descending order.",
+    example: "?sortEnd=asc OR ?sortEnd=desc",
+    enum: SortOrder,
+  })
+  sortEnd?: SortOrderType;
+}
+
+export class GetOrgUsersOutOfOfficeEntryFiltersDTO extends GetOutOfOfficeEntryFiltersDTO {
+  @IsString()
+  @IsOptional()
+  @ApiProperty({
+    type: String,
+    required: false,
+    description: "Filter ooo entries by the user email address. user must be within your organization.",
+    example: "example@domain.com",
+  })
+  email?: string;
+}

apps/api/v2/src/modules/ooo/outputs/ooo.output.ts

@@ -0,0 +1,100 @@
+import { OutOfOfficeReason } from "@/modules/ooo/inputs/ooo.input";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsInt, IsEnum, ValidateNested, IsString, IsDateString, IsOptional } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class UserOooOutputDto {
+  @IsInt()
+  @Expose()
+  @ApiProperty({
+    description: "The ID of the user.",
+    example: 2,
+  })
+  readonly userId!: number;
+
+  @IsInt()
+  @IsOptional()
+  @ApiPropertyOptional({
+    description: "The ID of the user covering for the out of office period, if applicable.",
+    example: 2,
+  })
+  @Expose()
+  readonly toUserId?: number;
+
+  @IsInt()
+  @Expose()
+  @ApiProperty({
+    description: "The ID of the ooo entry.",
+    example: 2,
+  })
+  readonly id!: number;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    description: "The UUID of the ooo entry.",
+    example: 2,
+  })
+  readonly uuid!: string;
+
+  @IsDateString()
+  @ApiProperty({
+    description: "The start date and time of the out of office period in ISO 8601 format in UTC timezone.",
+    example: "2023-05-01T00:00:00.000Z",
+  })
+  @Expose()
+  start!: Date;
+
+  @IsDateString()
+  @ApiProperty({
+    description: "The end date and time of the out of office period in ISO 8601 format in UTC timezone.",
+    example: "2023-05-10T23:59:59.999Z",
+  })
+  @Expose()
+  end!: Date;
+
+  @IsString()
+  @IsOptional()
+  @ApiPropertyOptional({
+    description: "Optional notes for the out of office entry.",
+    example: "Vacation in Hawaii",
+  })
+  @Expose()
+  notes?: string;
+
+  @IsEnum(OutOfOfficeReason)
+  @IsOptional()
+  @ApiPropertyOptional({
+    description: "the reason for the out of office entry, if applicable",
+    example: "vacation",
+    enum: OutOfOfficeReason,
+  })
+  @Expose()
+  reason?: OutOfOfficeReason;
+}
+
+export class UserOooOutputResponseDto {
+  @Expose()
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @Expose()
+  @ValidateNested()
+  @Type(() => UserOooOutputDto)
+  data!: UserOooOutputDto;
+}
+
+export class UserOoosOutputResponseDto {
+  @Expose()
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @Expose()
+  @ValidateNested()
+  @Type(() => UserOooOutputDto)
+  data!: UserOooOutputDto[];
+}

apps/api/v2/src/modules/ooo/repositories/ooo.repository.ts

@@ -0,0 +1,107 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { Injectable } from "@nestjs/common";
+import { v4 as uuidv4 } from "uuid";
+
+import { Prisma } from "@calcom/prisma/client";
+
+import { PrismaWriteService } from "../../prisma/prisma-write.service";
+
+type OOOInputData = Omit<Prisma.OutOfOfficeEntryCreateInput, "user" | "toUser" | "reason" | "uuid"> & {
+  toUserId?: number;
+  userId: number;
+  reasonId?: number;
+};
+
+@Injectable()
+export class UserOOORepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async createUserOOO(data: OOOInputData) {
+    const uuid = uuidv4();
+    return this.dbWrite.prisma.outOfOfficeEntry.create({
+      data: { ...data, uuid },
+      include: { reason: true },
+    });
+  }
+
+  async updateUserOOO(oooId: number, data: Partial<OOOInputData>) {
+    return this.dbWrite.prisma.outOfOfficeEntry.update({
+      where: { id: oooId },
+      data,
+      include: { reason: true },
+    });
+  }
+
+  async getUserOOOById(oooId: number) {
+    return this.dbRead.prisma.outOfOfficeEntry.findFirst({
+      where: { id: oooId },
+      include: { reason: true },
+    });
+  }
+
+  async getUserOOOByIdAndUserId(oooId: number, userId: number) {
+    return this.dbRead.prisma.outOfOfficeEntry.findFirst({
+      where: { id: oooId, userId },
+      include: { reason: true },
+    });
+  }
+
+  async getUserOOOPaginated(
+    userId: number,
+    skip: number,
+    take: number,
+    sort?: { sortStart?: "asc" | "desc"; sortEnd?: "asc" | "desc" }
+  ) {
+    return this.dbRead.prisma.outOfOfficeEntry.findMany({
+      where: { userId },
+      skip,
+      take,
+      include: { reason: true },
+      ...(sort?.sortStart && { orderBy: { start: sort.sortStart } }),
+      ...(sort?.sortEnd && { orderBy: { end: sort.sortEnd } }),
+    });
+  }
+
+  async deleteUserOOO(oooId: number) {
+    return this.dbWrite.prisma.outOfOfficeEntry.delete({
+      where: { id: oooId },
+      include: { reason: true },
+    });
+  }
+
+  async findExistingOooRedirect(userId: number, start: Date, end: Date, toUserId?: number) {
+    const existingOutOfOfficeEntry = await this.dbRead.prisma.outOfOfficeEntry.findFirst({
+      select: {
+        userId: true,
+        toUserId: true,
+      },
+      where: {
+        ...(toUserId && { userId: toUserId }),
+        toUserId: userId,
+        // Check for time overlap or collision
+        OR: [
+          // Outside of range
+          {
+            AND: [{ start: { lte: end } }, { end: { gte: start } }],
+          },
+          // Inside of range
+          {
+            AND: [{ start: { gte: start } }, { end: { lte: end } }],
+          },
+        ],
+      },
+    });
+
+    return existingOutOfOfficeEntry;
+  }
+
+  async getOooByUserIdAndTime(userId: number, start: Date, end: Date) {
+    return await this.dbRead.prisma.outOfOfficeEntry.findFirst({
+      where: {
+        userId,
+        start,
+        end,
+      },
+    });
+  }
+}

apps/api/v2/src/modules/ooo/services/ooo.service.ts

@@ -0,0 +1,142 @@
+import {
+  CreateOutOfOfficeEntryDto,
+  UpdateOutOfOfficeEntryDto,
+  OutOfOfficeReason,
+  GetOutOfOfficeEntryFiltersDTO,
+  SortOrder,
+} from "@/modules/ooo/inputs/ooo.input";
+import { UserOOORepository } from "@/modules/ooo/repositories/ooo.repository";
+import { UsersRepository } from "@/modules/users/users.repository";
+import { BadRequestException, ConflictException, Injectable } from "@nestjs/common";
+
+import { OutOfOfficeEntry } from "@calcom/prisma/client";
+
+const OOO_REASON_ID_TO_REASON = {
+  1: OutOfOfficeReason["UNSPECIFIED"],
+  2: OutOfOfficeReason["VACATION"],
+  3: OutOfOfficeReason["TRAVEL"],
+  4: OutOfOfficeReason["SICK_LEAVE"],
+  5: OutOfOfficeReason["PUBLIC_HOLIDAY"],
+};
+
+const OOO_REASON_TO_REASON_ID = {
+  [OutOfOfficeReason["UNSPECIFIED"]]: 1,
+  [OutOfOfficeReason["VACATION"]]: 2,
+  [OutOfOfficeReason["TRAVEL"]]: 3,
+  [OutOfOfficeReason["SICK_LEAVE"]]: 4,
+  [OutOfOfficeReason["PUBLIC_HOLIDAY"]]: 5,
+};
+
+@Injectable()
+export class UserOOOService {
+  constructor(
+    private readonly oooRepository: UserOOORepository,
+    private readonly usersRepository: UsersRepository
+  ) {}
+
+  formatOooReason(ooo: OutOfOfficeEntry) {
+    return {
+      ...ooo,
+      reason: ooo.reasonId
+        ? OOO_REASON_ID_TO_REASON[ooo.reasonId as keyof typeof OOO_REASON_ID_TO_REASON]
+        : OOO_REASON_ID_TO_REASON[1],
+    };
+  }
+
+  isStartBeforeEnd(start?: Date, end?: Date) {
+    if ((end && !start) || (start && !end)) {
+      throw new BadRequestException("Please specify both ooo start and end time.");
+    }
+
+    if (start && end) {
+      if (start.getTime() > end.getTime()) {
+        throw new BadRequestException("Start date must be before end date.");
+      }
+    }
+    return true;
+  }
+
+  async checkUserEligibleForRedirect(userId: number, toUserId?: number) {
+    if (toUserId) {
+      const user = await this.usersRepository.findUserOOORedirectEligible(userId, toUserId);
+      if (!user) {
+        throw new BadRequestException("Cannot redirect to this user.");
+      }
+    }
+  }
+
+  async checkExistingOooRedirect(userId: number, start?: Date, end?: Date, toUserId?: number) {
+    if (start && end) {
+      const existingOooRedirect = await this.oooRepository.findExistingOooRedirect(
+        userId,
+        start,
+        end,
+        toUserId
+      );
+
+      if (existingOooRedirect) {
+        throw new BadRequestException("Booking redirect infinite not allowed.");
+      }
+    }
+  }
+
+  async checkDuplicateOOOEntry(userId: number, start?: Date, end?: Date) {
+    if (start && end) {
+      const duplicateEntry = await this.oooRepository.getOooByUserIdAndTime(userId, start, end);
+
+      if (duplicateEntry) {
+        throw new ConflictException("Ooo entry already exists.");
+      }
+    }
+  }
+
+  checkRedirectToSelf(userId: number, toUserId?: number) {
+    if (toUserId && toUserId === userId) {
+      throw new BadRequestException("Cannot redirect to self.");
+    }
+  }
+
+  async checkIsValidOOO(userId: number, ooo: CreateOutOfOfficeEntryDto | UpdateOutOfOfficeEntryDto) {
+    this.isStartBeforeEnd(ooo.start, ooo.end);
+    await this.checkExistingOooRedirect(userId, ooo.start, ooo.end, ooo.toUserId);
+    await this.checkDuplicateOOOEntry(userId, ooo.start, ooo.end);
+    await this.checkRedirectToSelf(userId, ooo.toUserId);
+    await this.checkUserEligibleForRedirect(userId, ooo.toUserId);
+  }
+
+  async createUserOOO(userId: number, body: CreateOutOfOfficeEntryDto) {
+    await this.checkIsValidOOO(userId, body);
+    const { reason, ...rest } = body;
+    const ooo = await this.oooRepository.createUserOOO({
+      ...rest,
+      userId,
+      reasonId: OOO_REASON_TO_REASON_ID[reason ?? OutOfOfficeReason["UNSPECIFIED"]],
+    });
+    return this.formatOooReason(ooo);
+  }
+
+  async updateUserOOO(userId: number, oooId: number, body: UpdateOutOfOfficeEntryDto) {
+    await this.checkIsValidOOO(userId, body);
+    const { reason, ...rest } = body;
+    const data = reason
+      ? { ...rest, reasonId: OOO_REASON_TO_REASON_ID[reason ?? OutOfOfficeReason["UNSPECIFIED"]] }
+      : rest;
+    const ooo = await this.oooRepository.updateUserOOO(oooId, data);
+    return this.formatOooReason(ooo);
+  }
+
+  async deleteUserOOO(oooId: number) {
+    const ooo = await this.oooRepository.deleteUserOOO(oooId);
+    return this.formatOooReason(ooo);
+  }
+
+  async getUserOOOPaginated(
+    userId: number,
+    skip: number,
+    take: number,
+    sort?: { sortStart?: "asc" | "desc"; sortEnd?: "asc" | "desc" }
+  ) {
+    const ooos = await this.oooRepository.getUserOOOPaginated(userId, skip, take, sort);
+    return ooos.map((ooo) => this.formatOooReason(ooo));
+  }
+}

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

@@ -1,6 +1,5 @@
 import { CreatePhoneCallInput } from "@/ee/event-types/event-types_2024_06_14/inputs/create-phone-call.input";
 import { CreatePhoneCallOutput } from "@/ee/event-types/event-types_2024_06_14/outputs/create-phone-call.output";
-import { InputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/input-event-types.service";
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
 import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
@@ -11,15 +10,15 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
-import { CreateTeamEventTypeOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/create-team-event-type.output";
-import { DeleteTeamEventTypeOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/delete-team-event-type.output";
-import { GetTeamEventTypeOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/get-team-event-type.output";
-import { GetTeamEventTypesOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/get-team-event-types.output";
-import { UpdateTeamEventTypeOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/update-team-event-type.output";
 import { OutputTeamEventTypesResponsePipe } from "@/modules/organizations/controllers/pipes/event-types/team-event-types-response.transformer";
 import { InputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/input.service";
 import { OrganizationsEventTypesService } from "@/modules/organizations/services/event-types/organizations-event-types.service";
 import { DatabaseTeamEventType } from "@/modules/organizations/services/event-types/output.service";
+import { CreateTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/create-team-event-type.output";
+import { DeleteTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/delete-team-event-type.output";
+import { GetTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/get-team-event-type.output";
+import { GetTeamEventTypesOutput } from "@/modules/teams/event-types/outputs/get-team-event-types.output";
+import { UpdateTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/update-team-event-type.output";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import {
   Controller,
@@ -62,7 +61,6 @@ export class OrganizationsEventTypesController {
   constructor(
     private readonly organizationsEventTypesService: OrganizationsEventTypesService,
     private readonly inputService: InputOrganizationsEventTypesService,
-    private readonly inputUserEventTypesService: InputEventTypesService_2024_06_14,
     private readonly outputTeamEventTypesResponsePipe: OutputTeamEventTypesResponsePipe
   ) {}
 
@@ -180,7 +178,11 @@ export class OrganizationsEventTypesController {
     @Query() queryParams: SkipTakePagination
   ): Promise<GetTeamEventTypesOutput> {
     const { skip, take } = queryParams;
-    const eventTypes = await this.organizationsEventTypesService.getTeamsEventTypes(orgId, skip, take);
+    const eventTypes = await this.organizationsEventTypesService.getOrganizationsTeamsEventTypes(
+      orgId,
+      skip,
+      take
+    );
 
     return {
       status: SUCCESS_STATUS,

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

@@ -577,6 +577,100 @@ describe("Organizations Event Types Endpoints", () => {
         });
     });
 
+    it("should be able to configure phone-only event type", async () => {
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        bookingFields: [
+          {
+            type: "email",
+            required: false,
+            label: "Email",
+          },
+          {
+            type: "phone",
+            slug: "attendeePhoneNumber",
+            required: true,
+            label: "Phone number",
+            hidden: true,
+          },
+        ],
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${team.id}/event-types/${collectiveEventType.id}`)
+        .send(body)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const data = responseBody.data;
+          expect(data.bookingFields).toEqual([
+            {
+              isDefault: true,
+              type: "name",
+              slug: "name",
+              required: true,
+              disableOnPrefill: false,
+            },
+            {
+              isDefault: true,
+              type: "email",
+              slug: "email",
+              required: false,
+              label: "Email",
+              disableOnPrefill: false,
+            },
+            {
+              isDefault: true,
+              type: "radioInput",
+              slug: "location",
+              required: false,
+              hidden: false,
+            },
+            {
+              isDefault: true,
+              type: "phone",
+              slug: "attendeePhoneNumber",
+              required: true,
+              hidden: true,
+              label: "Phone number",
+              disableOnPrefill: false,
+            },
+            {
+              isDefault: true,
+              type: "text",
+              slug: "title",
+              required: true,
+              disableOnPrefill: false,
+              hidden: true,
+            },
+            {
+              isDefault: true,
+              type: "textarea",
+              slug: "notes",
+              required: false,
+              disableOnPrefill: false,
+              hidden: false,
+            },
+            {
+              isDefault: true,
+              type: "multiemail",
+              slug: "guests",
+              required: false,
+              disableOnPrefill: false,
+              hidden: false,
+            },
+            {
+              isDefault: true,
+              type: "textarea",
+              slug: "rescheduleReason",
+              required: false,
+              disableOnPrefill: false,
+              hidden: false,
+            },
+          ]);
+        });
+    });
+
     it("should assign all members to managed event-type", async () => {
       const body: UpdateTeamEventTypeInput_2024_06_14 = {
         assignAllTeamMembers: true,
@@ -677,53 +771,54 @@ describe("Organizations Event Types Endpoints", () => {
           const fetchedEventType = responseBody.data;
 
           expect(fetchedEventType.bookingFields).toEqual([
+            { isDefault: true, required: true, slug: "name", type: "name", disableOnPrefill: false },
+            { isDefault: true, required: true, slug: "email", type: "email", disableOnPrefill: false },
             {
+              disableOnPrefill: false,
               isDefault: true,
-              type: "name",
-              slug: "name",
-              required: true,
-            },
-            {
-              isDefault: true,
-              type: "email",
-              slug: "email",
-              required: true,
-            },
-            {
-              isDefault: true,
-              required: false,
-              slug: "attendeePhoneNumber",
               type: "phone",
+              slug: "attendeePhoneNumber",
+              required: false,
+              hidden: true,
             },
             {
               isDefault: true,
               type: "radioInput",
               slug: "location",
               required: false,
+              hidden: false,
             },
             {
               isDefault: true,
-              type: "text",
-              slug: "title",
               required: true,
+              slug: "title",
+              type: "text",
+              disableOnPrefill: false,
+              hidden: true,
             },
             {
               isDefault: true,
-              type: "textarea",
+              required: false,
               slug: "notes",
-              required: false,
-            },
-            {
-              isDefault: true,
-              type: "multiemail",
-              slug: "guests",
-              required: false,
-            },
-            {
-              isDefault: true,
               type: "textarea",
-              slug: "rescheduleReason",
+              disableOnPrefill: false,
+              hidden: false,
+            },
+            {
+              isDefault: true,
               required: false,
+              slug: "guests",
+              type: "multiemail",
+              disableOnPrefill: false,
+              hidden: false,
+            },
+            {
+              isDefault: true,
+              required: false,
+              slug: "rescheduleReason",
+              type: "textarea",
+              disableOnPrefill: false,
+              hidden: false,
             },
           ]);
         });

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

@@ -15,8 +15,8 @@ import {
   OrgTeamMembershipsOutputResponseDto,
   OrgTeamMembershipOutputResponseDto,
 } from "@/modules/organizations/outputs/organization-teams-memberships.output";
-import { OrganizationsEventTypesService } from "@/modules/organizations/services/event-types/organizations-event-types.service";
 import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/services/organizations-teams-memberships.service";
+import { TeamsEventTypesService } from "@/modules/teams/event-types/services/teams-event-types.service";
 import {
   Controller,
   UseGuards,
@@ -51,7 +51,7 @@ export class OrganizationsTeamsMembershipsController {
 
   constructor(
     private organizationsTeamsMembershipsService: OrganizationsTeamsMembershipsService,
-    private oganizationsEventTypesService: OrganizationsEventTypesService,
+    private teamsEventTypesService: TeamsEventTypesService,
     private readonly organizationsRepository: OrganizationsRepository
   ) {}
 
@@ -119,7 +119,7 @@ export class OrganizationsTeamsMembershipsController {
       membershipId
     );
 
-    await this.oganizationsEventTypesService.deleteUserTeamEventTypesAndHosts(membership.userId, teamId);
+    await this.teamsEventTypesService.deleteUserTeamEventTypesAndHosts(membership.userId, teamId);
 
     return {
       status: SUCCESS_STATUS,

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

@@ -0,0 +1,142 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard";
+import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-admin-api-enabled.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { IsUserInOrg } from "@/modules/auth/guards/users/is-user-in-org.guard";
+import { IsUserOOO } from "@/modules/ooo/guards/is-user-ooo";
+import {
+  CreateOutOfOfficeEntryDto,
+  UpdateOutOfOfficeEntryDto,
+  GetOutOfOfficeEntryFiltersDTO,
+  GetOrgUsersOutOfOfficeEntryFiltersDTO,
+} from "@/modules/ooo/inputs/ooo.input";
+import {
+  UserOooOutputDto,
+  UserOooOutputResponseDto,
+  UserOoosOutputResponseDto,
+} from "@/modules/ooo/outputs/ooo.output";
+import { UserOOOService } from "@/modules/ooo/services/ooo.service";
+import { OrgUsersOOOService } from "@/modules/organizations/controllers/users/ooo/services/organization-users-ooo.service";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Post,
+  Patch,
+  Delete,
+  Param,
+  ParseIntPipe,
+  Body,
+  UseInterceptors,
+  Query,
+} from "@nestjs/common";
+import { ClassSerializerInterceptor } from "@nestjs/common";
+import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
+import { plainToInstance } from "class-transformer";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+
+@Controller({
+  path: "/v2/organizations/:orgId",
+  version: API_VERSIONS_VALUES,
+})
+@UseInterceptors(ClassSerializerInterceptor)
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, PlatformPlanGuard, IsAdminAPIEnabledGuard)
+@UseGuards(IsOrgGuard)
+@DocsTags("Orgs / Users / OOO")
+export class OrganizationsUsersOOOController {
+  constructor(
+    private readonly userOOOService: UserOOOService,
+    private readonly orgUsersOOOService: OrgUsersOOOService
+  ) {}
+
+  @Get("/users/:userId/ooo")
+  @Roles("ORG_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @UseGuards(IsUserInOrg)
+  @ApiOperation({ summary: "Get all ooo entries of a user" })
+  async getOrganizationUserOOO(
+    @Param("userId", ParseIntPipe) userId: number,
+    @Query() query: GetOutOfOfficeEntryFiltersDTO
+  ): Promise<UserOoosOutputResponseDto> {
+    const { skip, take, ...rest } = query ?? { skip: 0, take: 250 };
+    const ooos = await this.userOOOService.getUserOOOPaginated(userId, skip ?? 0, take ?? 250, rest);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: ooos.map((ooo) => plainToInstance(UserOooOutputDto, ooo, { strategy: "excludeAll" })),
+    };
+  }
+
+  @Post("/users/:userId/ooo")
+  @Roles("ORG_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @UseGuards(IsUserInOrg)
+  @ApiOperation({ summary: "Create an ooo entry for user" })
+  async createOrganizationUserOOO(
+    @Param("userId", ParseIntPipe) userId: number,
+    @Body() input: CreateOutOfOfficeEntryDto
+  ): Promise<UserOooOutputResponseDto> {
+    const ooo = await this.userOOOService.createUserOOO(userId, input);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(UserOooOutputDto, ooo, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Patch("/users/:userId/ooo/:oooId")
+  @Roles("ORG_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @UseGuards(IsUserInOrg, IsUserOOO)
+  @ApiOperation({ summary: "Update ooo entry of a user" })
+  async updateOrganizationUserOOO(
+    @Param("userId", ParseIntPipe) userId: number,
+    @Param("oooId", ParseIntPipe) oooId: number,
+
+    @Body() input: UpdateOutOfOfficeEntryDto
+  ): Promise<UserOooOutputResponseDto> {
+    const ooo = await this.userOOOService.updateUserOOO(userId, oooId, input);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(UserOooOutputDto, ooo, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Delete("/users/:userId/ooo/:oooId")
+  @Roles("ORG_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @UseGuards(IsUserInOrg, IsUserOOO)
+  @ApiOperation({ summary: "Delete ooo entry of a user" })
+  async deleteOrganizationUserOOO(
+    @Param("oooId", ParseIntPipe) oooId: number
+  ): Promise<UserOooOutputResponseDto> {
+    const ooo = await this.userOOOService.deleteUserOOO(oooId);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(UserOooOutputDto, ooo, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Get("/ooo")
+  @Roles("ORG_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @ApiOperation({ summary: "Get all OOO entries of org users" })
+  async getOrganizationUsersOOO(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Query() query: GetOrgUsersOutOfOfficeEntryFiltersDTO
+  ): Promise<UserOoosOutputResponseDto> {
+    const { skip, take, email, ...rest } = query ?? { skip: 0, take: 250 };
+    const ooos = await this.orgUsersOOOService.getOrgUsersOOOPaginated(orgId, skip ?? 0, take ?? 250, rest, {
+      email,
+    });
+
+    return {
+      status: SUCCESS_STATUS,
+      data: ooos.map((ooo) => plainToInstance(UserOooOutputDto, ooo, { strategy: "excludeAll" })),
+    };
+  }
+}

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

@@ -0,0 +1,445 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { UserOooOutputDto } from "@/modules/ooo/outputs/ooo.output";
+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";
+import { Test } from "@nestjs/testing";
+import { User } from "@prisma/client";
+import * as request from "supertest";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
+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 { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { Team } from "@calcom/prisma/client";
+
+describe("Organizations User OOO Endpoints", () => {
+  describe("User Authentication - User is Org Admin", () => {
+    let app: INestApplication;
+    let oooCreatedViaApiId: number;
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: OrganizationRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+
+    let org: Team;
+    let team: Team;
+    let falseTestOrg: Team;
+    let falseTestTeam: Team;
+
+    const userEmail = "org-admin-ooo-controller-e222e@api.com";
+    let userAdmin: User;
+
+    const teammate1Email = "teammate111ooo@team.com";
+    const teammate2Email = "teammate221ooo@team.com";
+    const falseTestUserEmail = "false-user-ooo@false-team.com";
+    let teammate1: User;
+    let teammate2: User;
+    let falseTestUser: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new OrganizationRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+
+      userAdmin = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        role: "ADMIN",
+      });
+
+      teammate1 = await userRepositoryFixture.create({
+        email: teammate1Email,
+        username: teammate1Email,
+      });
+
+      teammate2 = await userRepositoryFixture.create({
+        email: teammate2Email,
+        username: teammate2Email,
+      });
+
+      falseTestUser = await userRepositoryFixture.create({
+        email: falseTestUserEmail,
+        username: falseTestUserEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization ooo",
+        isOrganization: true,
+      });
+
+      falseTestOrg = await organizationsRepositoryFixture.create({
+        name: "False test org ooo",
+        isOrganization: true,
+      });
+
+      team = await teamsRepositoryFixture.create({
+        name: "Test org team ooo",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      falseTestTeam = await teamsRepositoryFixture.create({
+        name: "Outside org team ooo",
+        isOrganization: false,
+        parent: { connect: { id: falseTestOrg.id } },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${userAdmin.id}`,
+        username: userEmail,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: userAdmin.id,
+          },
+        },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${teammate1.id}`,
+        username: teammate1Email,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: teammate1.id,
+          },
+        },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: userAdmin.id } },
+        team: { connect: { id: org.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: teammate1.id } },
+        team: { connect: { id: team.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: teammate2.id } },
+        team: { connect: { id: team.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: falseTestUser.id } },
+        team: { connect: { id: falseTestTeam.id } },
+        accepted: true,
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(userAdmin).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should create a ooo entry without redirect", async () => {
+      const body = {
+        start: "2025-05-01T01:00:00.000Z",
+        end: "2025-05-10T13:59:59.999Z",
+        notes: "ooo numero uno",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo`)
+        .send(body)
+        .expect(201)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data as UserOooOutputDto;
+          expect(data.reason).toEqual("unspecified");
+          expect(data.userId).toEqual(teammate1.id);
+          expect(data.start).toEqual("2025-05-01T00:00:00.000Z");
+          expect(data.end).toEqual("2025-05-10T23:59:59.999Z");
+          oooCreatedViaApiId = data.id;
+        });
+    });
+
+    it("should create a ooo entry with redirect", async () => {
+      const body = {
+        start: "2025-08-01T01:00:00.000Z",
+        end: "2025-10-10T13:59:59.999Z",
+        notes: "ooo numero dos with redirect",
+        toUserId: teammate2.id,
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo`)
+        .send(body)
+        .expect(201)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const data = responseBody.data as UserOooOutputDto;
+          expect(data.reason).toEqual("unspecified");
+          expect(data.userId).toEqual(teammate1.id);
+          expect(data.start).toEqual("2025-08-01T00:00:00.000Z");
+          expect(data.end).toEqual("2025-10-10T23:59:59.999Z");
+          expect(data.toUserId).toEqual(teammate2.id);
+        });
+    });
+
+    it("should fail to create a ooo entry with start after end", async () => {
+      const body = {
+        start: "2025-07-01T00:00:00.000Z",
+        end: "2025-05-10T23:59:59.999Z",
+        notes: "ooo numero uno duplicate",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo`)
+        .send(body)
+        .expect(400);
+    });
+
+    it("should fail to create a duplicate ooo entry", async () => {
+      const body = {
+        start: "2025-05-01T00:00:00.000Z",
+        end: "2025-05-10T23:59:59.999Z",
+        notes: "ooo numero uno duplicate",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo`)
+        .send(body)
+        .expect(409);
+    });
+
+    it("should fail to create an ooo entry that redirects to self", async () => {
+      const body = {
+        start: "2025-05-02T00:00:00.000Z",
+        end: "2025-05-03T23:59:59.999Z",
+        notes: "ooo infinite redirect",
+        toUserId: teammate1.id,
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo`)
+        .send(body)
+        .expect(400);
+    });
+
+    it("should fail to create an ooo entry that redirects to member outside of org", async () => {
+      const body = {
+        start: "2025-05-02T00:00:00.000Z",
+        end: "2025-05-03T23:59:59.999Z",
+        notes: "ooo invalid redirect",
+        toUserId: falseTestUser.id,
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo`)
+        .send(body)
+        .expect(400);
+    });
+
+    it("should update a ooo entry without redirect", async () => {
+      const body = {
+        start: "2025-06-01T01:00:00.000Z",
+        end: "2025-06-10T13:59:59.999Z",
+        notes: "ooo numero uno",
+        reason: "vacation",
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo/${oooCreatedViaApiId}`)
+        .send(body)
+        .expect(200)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data as UserOooOutputDto;
+          expect(data.reason).toEqual("vacation");
+          expect(data.userId).toEqual(teammate1.id);
+          expect(data.start).toEqual("2025-06-01T00:00:00.000Z");
+          expect(data.end).toEqual("2025-06-10T23:59:59.999Z");
+        });
+    });
+
+    it("should fail to update a ooo entry with redirect outside of org", async () => {
+      const body = {
+        toUserId: falseTestUser.id,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo/${oooCreatedViaApiId}`)
+        .send(body)
+        .expect(400);
+    });
+
+    it("should fail to update a ooo entry with start after end ", async () => {
+      const body = {
+        start: "2025-07-01T00:00:00.000Z",
+        end: "2025-05-10T23:59:59.999Z",
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo/${oooCreatedViaApiId}`)
+        .send(body)
+        .expect(400);
+    });
+
+    it("should fail to update a ooo entry with redirect to self ", async () => {
+      const body = {
+        toUserId: teammate1.id,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo/${oooCreatedViaApiId}`)
+        .send(body)
+        .expect(400);
+    });
+
+    it("should fail to update a ooo entry with duplicate time", async () => {
+      const body = {
+        start: "2025-06-01T01:00:00.000Z",
+        end: "2025-06-10T13:59:59.999Z",
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo/${oooCreatedViaApiId}`)
+        .send(body)
+        .expect(409);
+    });
+
+    it("should update a ooo entry without redirect", async () => {
+      const body = {
+        toUserId: teammate2.id,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo/${oooCreatedViaApiId}`)
+        .send(body)
+        .expect(200)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data as UserOooOutputDto;
+          expect(data.reason).toEqual("vacation");
+          expect(data.toUserId).toEqual(teammate2.id);
+          expect(data.userId).toEqual(teammate1.id);
+          expect(data.start).toEqual("2025-06-01T00:00:00.000Z");
+          expect(data.end).toEqual("2025-06-10T23:59:59.999Z");
+        });
+    });
+
+    it("should get 2 ooo entries", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/ooo?sortEnd=desc&email=${teammate1Email}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data as UserOooOutputDto[];
+          expect(data.length).toEqual(2);
+          const oooUno = data.find((ooo) => ooo.id === oooCreatedViaApiId);
+          expect(oooUno).toBeDefined();
+          if (oooUno) {
+            expect(oooUno.reason).toEqual("vacation");
+            expect(oooUno.toUserId).toEqual(teammate2.id);
+            expect(oooUno.userId).toEqual(teammate1.id);
+            expect(oooUno.start).toEqual("2025-06-01T00:00:00.000Z");
+            expect(oooUno.end).toEqual("2025-06-10T23:59:59.999Z");
+          }
+          // test sort
+          expect(data[1].id).toEqual(oooCreatedViaApiId);
+        });
+    });
+
+    it("should get 2 ooo entries", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo`)
+        .expect(200)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data as UserOooOutputDto[];
+          expect(data.length).toEqual(2);
+          const oooUno = data.find((ooo) => ooo.id === oooCreatedViaApiId);
+          expect(oooUno).toBeDefined();
+          if (oooUno) {
+            expect(oooUno.reason).toEqual("vacation");
+            expect(oooUno.toUserId).toEqual(teammate2.id);
+            expect(oooUno.userId).toEqual(teammate1.id);
+            expect(oooUno.start).toEqual("2025-06-01T00:00:00.000Z");
+            expect(oooUno.end).toEqual("2025-06-10T23:59:59.999Z");
+          }
+        });
+    });
+
+    it("should delete ooo entry", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo/${oooCreatedViaApiId}`)
+        .expect(200);
+    });
+
+    it("user should have 1 ooo entries", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users/${teammate1.id}/ooo`)
+        .expect(200)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const data = responseBody.data as UserOooOutputDto[];
+          expect(data.length).toEqual(1);
+        });
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(userAdmin.email);
+      await userRepositoryFixture.deleteByEmail(teammate1.email);
+      await userRepositoryFixture.deleteByEmail(teammate2.email);
+      await userRepositoryFixture.deleteByEmail(falseTestUser.email);
+      await teamsRepositoryFixture.delete(team.id);
+      await teamsRepositoryFixture.delete(falseTestTeam.id);
+      await organizationsRepositoryFixture.delete(org.id);
+      await organizationsRepositoryFixture.delete(falseTestOrg.id);
+      await app.close();
+    });
+  });
+});

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

@@ -0,0 +1,33 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrgUsersOOORepository {
+  constructor(private readonly dbRead: PrismaReadService) {}
+  async getOrgUsersOOOPaginated(
+    orgId: number,
+    skip: number,
+    take: number,
+    sort?: { sortStart?: "asc" | "desc"; sortEnd?: "asc" | "desc" },
+    filters?: { email?: string }
+  ) {
+    console.log({ sort, filters });
+    return this.dbRead.prisma.outOfOfficeEntry.findMany({
+      where: {
+        user: {
+          ...(filters?.email && { email: filters.email }),
+          profiles: {
+            some: {
+              organizationId: orgId,
+            },
+          },
+        },
+      },
+      skip,
+      take,
+      include: { reason: true },
+      ...(sort?.sortStart && { orderBy: { start: sort.sortStart } }),
+      ...(sort?.sortEnd && { orderBy: { end: sort.sortEnd } }),
+    });
+  }
+}

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

@@ -0,0 +1,26 @@
+import { UserOOORepository } from "@/modules/ooo/repositories/ooo.repository";
+import { UserOOOService } from "@/modules/ooo/services/ooo.service";
+import { OrgUsersOOORepository } from "@/modules/organizations/controllers/users/ooo/repositories/organizations-users-ooo.repository";
+import { UsersRepository } from "@/modules/users/users.repository";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrgUsersOOOService {
+  constructor(
+    private readonly oooRepository: UserOOORepository,
+    private readonly oooUserService: UserOOOService,
+    private readonly usersRepository: UsersRepository,
+    private readonly orgUsersOOORepository: OrgUsersOOORepository
+  ) {}
+
+  async getOrgUsersOOOPaginated(
+    orgId: number,
+    skip: number,
+    take: number,
+    sort?: { sortStart?: "asc" | "desc"; sortEnd?: "asc" | "desc" },
+    filters?: { email?: string }
+  ) {
+    const ooos = await this.orgUsersOOORepository.getOrgUsersOOOPaginated(orgId, skip, take, sort, filters);
+    return ooos.map((ooo) => this.oooUserService.formatOooReason(ooo));
+  }
+}

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

@@ -3,6 +3,8 @@ import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/
 import { EmailModule } from "@/modules/email/email.module";
 import { EmailService } from "@/modules/email/email.service";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { UserOOORepository } from "@/modules/ooo/repositories/ooo.repository";
+import { UserOOOService } from "@/modules/ooo/services/ooo.service";
 import { OrganizationsOptionsAttributesController } from "@/modules/organizations/controllers/attributes/organizations-attributes-options.controller";
 import { OrganizationsAttributesController } from "@/modules/organizations/controllers/attributes/organizations-attributes.controller";
 import { OrganizationsEventTypesController } from "@/modules/organizations/controllers/event-types/organizations-event-types.controller";
@@ -12,6 +14,9 @@ import { OrganizationsSchedulesController } from "@/modules/organizations/contro
 import { OrganizationsTeamsMembershipsController } from "@/modules/organizations/controllers/teams/memberships/organizations-teams-memberships.controller";
 import { OrganizationsTeamsController } from "@/modules/organizations/controllers/teams/organizations-teams.controller";
 import { OrganizationsTeamsSchedulesController } from "@/modules/organizations/controllers/teams/schedules/organizations-teams-schedules.controller";
+import { OrganizationsUsersOOOController } from "@/modules/organizations/controllers/users/ooo/organizations-users-ooo-controller";
+import { OrgUsersOOORepository } from "@/modules/organizations/controllers/users/ooo/repositories/organizations-users-ooo.repository";
+import { OrgUsersOOOService } from "@/modules/organizations/controllers/users/ooo/services/organization-users-ooo.service";
 import { OrganizationsUsersController } from "@/modules/organizations/controllers/users/organizations-users.controller";
 import { OrganizationsWebhooksController } from "@/modules/organizations/controllers/webhooks/organizations-webhooks.controller";
 import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
@@ -39,6 +44,7 @@ import { OrganizationsService } from "@/modules/organizations/services/organizat
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
+import { TeamsEventTypesModule } from "@/modules/teams/event-types/teams-event-types.module";
 import { TeamsModule } from "@/modules/teams/teams/teams.module";
 import { UsersModule } from "@/modules/users/users.module";
 import { WebhooksService } from "@/modules/webhooks/services/webhooks.service";
@@ -54,6 +60,7 @@ import { Module } from "@nestjs/common";
     RedisModule,
     EmailModule,
     EventTypesModule_2024_06_14,
+    TeamsEventTypesModule,
     TeamsModule,
   ],
   providers: [
@@ -84,6 +91,10 @@ import { Module } from "@nestjs/common";
     WebhooksRepository,
     WebhooksService,
     OutputTeamEventTypesResponsePipe,
+    UserOOOService,
+    UserOOORepository,
+    OrgUsersOOOService,
+    OrgUsersOOORepository,
   ],
   exports: [
     OrganizationsService,
@@ -116,6 +127,7 @@ import { Module } from "@nestjs/common";
     OrganizationsOptionsAttributesController,
     OrganizationsWebhooksController,
     OrganizationsTeamsSchedulesController,
+    OrganizationsUsersOOOController,
   ],
 })
 export class OrganizationsModule {}

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

@@ -1,91 +1,10 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
-import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
 
 @Injectable()
 export class OrganizationsEventTypesRepository {
-  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
-
-  async getTeamEventType(teamId: number, eventTypeId: number) {
-    return this.dbRead.prisma.eventType.findUnique({
-      where: {
-        id: eventTypeId,
-        teamId,
-      },
-      include: { users: true, schedule: true, hosts: true, destinationCalendar: true },
-    });
-  }
-
-  async getTeamEventTypeBySlug(teamId: number, eventTypeSlug: string) {
-    return this.dbRead.prisma.eventType.findUnique({
-      where: {
-        teamId_slug: {
-          teamId,
-          slug: eventTypeSlug,
-        },
-      },
-      include: {
-        users: true,
-        schedule: true,
-        hosts: true,
-        destinationCalendar: true,
-        team: {
-          select: {
-            bannerUrl: true,
-            name: true,
-            logoUrl: true,
-            slug: true,
-            weekStart: true,
-            brandColor: true,
-            darkBrandColor: true,
-            theme: true,
-          },
-        },
-      },
-    });
-  }
-
-  async getTeamEventTypes(teamId: number) {
-    return this.dbRead.prisma.eventType.findMany({
-      where: {
-        teamId,
-      },
-      include: {
-        users: true,
-        schedule: true,
-        hosts: true,
-        destinationCalendar: true,
-        team: {
-          select: {
-            bannerUrl: true,
-            name: true,
-            logoUrl: true,
-            slug: true,
-            weekStart: true,
-            brandColor: true,
-            darkBrandColor: true,
-            theme: true,
-          },
-        },
-      },
-    });
-  }
-
-  async getEventTypeById(eventTypeId: number) {
-    return this.dbRead.prisma.eventType.findUnique({
-      where: { id: eventTypeId },
-      include: { users: true, schedule: true, hosts: true, destinationCalendar: true },
-    });
-  }
-
-  async getEventTypeChildren(eventTypeId: number) {
-    return this.dbRead.prisma.eventType.findMany({
-      where: { parentId: eventTypeId },
-      include: { users: true, schedule: true, hosts: true, destinationCalendar: true },
-    });
-  }
-
-  async getTeamsEventTypes(orgId: number, skip: number, take: number) {
+  constructor(private readonly dbRead: PrismaReadService) {}
+  async getOrganizationTeamsEventTypes(orgId: number, skip: number, take: number) {
     return this.dbRead.prisma.eventType.findMany({
       where: {
         team: {
@@ -97,33 +16,4 @@ export class OrganizationsEventTypesRepository {
       include: { users: true, schedule: true, hosts: true, destinationCalendar: true },
     });
   }
-
-  async getEventTypeByIdWithChildren(eventTypeId: number) {
-    return this.dbRead.prisma.eventType.findUnique({
-      where: { id: eventTypeId },
-      include: { children: true },
-    });
-  }
-
-  async deleteUserManagedTeamEventTypes(userId: number, teamId: number) {
-    return this.dbWrite.prisma.eventType.deleteMany({
-      where: {
-        parent: {
-          teamId,
-        },
-        userId,
-      },
-    });
-  }
-
-  async removeUserFromTeamEventTypesHosts(userId: number, teamId: number) {
-    return this.dbWrite.prisma.host.deleteMany({
-      where: {
-        userId,
-        eventType: {
-          teamId,
-        },
-      },
-    });
-  }
 }

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

@@ -1,5 +1,5 @@
 import { InputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/input-event-types.service";
-import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
+import { TeamsEventTypesRepository } from "@/modules/teams/event-types/teams-event-types.repository";
 import { TeamsRepository } from "@/modules/teams/teams/teams.repository";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
@@ -17,7 +17,7 @@ export class InputOrganizationsEventTypesService {
     private readonly inputEventTypesService: InputEventTypesService_2024_06_14,
     private readonly teamsRepository: TeamsRepository,
     private readonly usersRepository: UsersRepository,
-    private readonly orgEventTypesRepository: OrganizationsEventTypesRepository
+    private readonly teamsEventTypesRepository: TeamsEventTypesRepository
   ) {}
   async transformAndValidateCreateTeamEventTypeInput(
     userId: number,
@@ -115,7 +115,7 @@ export class InputOrganizationsEventTypesService {
     const { hosts, assignAllTeamMembers, ...rest } = inputEventType;
 
     const eventType = await this.inputEventTypesService.transformInputUpdateEventType(rest, eventTypeId);
-    const dbEventType = await this.orgEventTypesRepository.getTeamEventType(teamId, eventTypeId);
+    const dbEventType = await this.teamsEventTypesRepository.getTeamEventType(teamId, eventTypeId);
 
     if (!dbEventType) {
       throw new BadRequestException("Event type to update not found");
@@ -144,7 +144,7 @@ export class InputOrganizationsEventTypesService {
   ) {
     let eventType = null;
     if (eventTypeId) {
-      eventType = await this.orgEventTypesRepository.getEventTypeByIdWithChildren(eventTypeId);
+      eventType = await this.teamsEventTypesRepository.getEventTypeByIdWithChildren(eventTypeId);
       if (!eventType || eventType.schedulingType !== "MANAGED") {
         return undefined;
       }

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

@@ -1,14 +1,13 @@
-import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
-import { EventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/event-types.service";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
 import { DatabaseTeamEventType } from "@/modules/organizations/services/event-types/output.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { TeamsEventTypesService } from "@/modules/teams/event-types/services/teams-event-types.service";
 import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
-import { Injectable, NotFoundException, Logger } from "@nestjs/common";
+import { Injectable, Logger } from "@nestjs/common";
 
-import { createEventType, updateEventType } from "@calcom/platform-libraries";
+import { createEventType } from "@calcom/platform-libraries";
 import { InputTeamEventTransformed_2024_06_14 } from "@calcom/platform-types";
 
 @Injectable()
@@ -16,10 +15,9 @@ export class OrganizationsEventTypesService {
   private readonly logger = new Logger("OrganizationsEventTypesService");
 
   constructor(
-    private readonly eventTypesService: EventTypesService_2024_06_14,
     private readonly dbWrite: PrismaWriteService,
     private readonly organizationEventTypesRepository: OrganizationsEventTypesRepository,
-    private readonly eventTypesRepository: EventTypesRepository_2024_06_14,
+    private readonly teamsEventTypesService: TeamsEventTypesService,
     private readonly membershipsRepository: MembershipsRepository,
     private readonly usersService: UsersService
   ) {}
@@ -44,15 +42,7 @@ export class OrganizationsEventTypesService {
       },
     });
 
-    return this.updateTeamEventType(eventTypeCreated.id, teamId, body, user);
-  }
-
-  async validateEventTypeExists(teamId: number, eventTypeId: number) {
-    const eventType = await this.organizationEventTypesRepository.getTeamEventType(teamId, eventTypeId);
-
-    if (!eventType) {
-      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
-    }
+    return this.teamsEventTypesService.updateTeamEventType(eventTypeCreated.id, teamId, body, user);
   }
 
   async getUserToCreateTeamEvent(user: UserWithProfile, organizationId: number) {
@@ -71,34 +61,23 @@ export class OrganizationsEventTypesService {
   }
 
   async getTeamEventType(teamId: number, eventTypeId: number): Promise<DatabaseTeamEventType | null> {
-    const eventType = await this.organizationEventTypesRepository.getTeamEventType(teamId, eventTypeId);
-
-    if (!eventType) {
-      return null;
-    }
-
-    return eventType;
+    return this.teamsEventTypesService.getTeamEventType(teamId, eventTypeId);
   }
 
   async getTeamEventTypeBySlug(teamId: number, eventTypeSlug: string): Promise<DatabaseTeamEventType | null> {
-    const eventType = await this.organizationEventTypesRepository.getTeamEventTypeBySlug(
-      teamId,
-      eventTypeSlug
-    );
-
-    if (!eventType) {
-      return null;
-    }
-
-    return eventType;
+    return this.teamsEventTypesService.getTeamEventTypeBySlug(teamId, eventTypeSlug);
   }
 
   async getTeamEventTypes(teamId: number): Promise<DatabaseTeamEventType[]> {
-    return await this.organizationEventTypesRepository.getTeamEventTypes(teamId);
+    return await this.teamsEventTypesService.getTeamEventTypes(teamId);
   }
 
-  async getTeamsEventTypes(orgId: number, skip = 0, take = 250): Promise<DatabaseTeamEventType[]> {
-    return await this.organizationEventTypesRepository.getTeamsEventTypes(orgId, skip, take);
+  async getOrganizationsTeamsEventTypes(
+    orgId: number,
+    skip = 0,
+    take = 250
+  ): Promise<DatabaseTeamEventType[]> {
+    return await this.organizationEventTypesRepository.getOrganizationTeamsEventTypes(orgId, skip, take);
   }
 
   async updateTeamEventType(
@@ -107,57 +86,10 @@ export class OrganizationsEventTypesService {
     body: InputTeamEventTransformed_2024_06_14,
     user: UserWithProfile
   ): Promise<DatabaseTeamEventType | DatabaseTeamEventType[]> {
-    await this.validateEventTypeExists(teamId, eventTypeId);
-    const eventTypeUser = await this.eventTypesService.getUserToUpdateEvent(user);
-
-    await updateEventType({
-      input: { id: eventTypeId, ...body },
-      ctx: {
-        user: eventTypeUser,
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        prisma: this.dbWrite.prisma,
-      },
-    });
-
-    const eventType = await this.organizationEventTypesRepository.getEventTypeById(eventTypeId);
-
-    if (!eventType) {
-      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
-    }
-
-    if (eventType.schedulingType !== "MANAGED") {
-      return eventType;
-    }
-
-    const childrenEventTypes = await this.organizationEventTypesRepository.getEventTypeChildren(eventType.id);
-
-    return [eventType, ...childrenEventTypes];
+    return this.teamsEventTypesService.updateTeamEventType(eventTypeId, teamId, body, user);
   }
 
   async deleteTeamEventType(teamId: number, eventTypeId: number) {
-    const existingEventType = await this.organizationEventTypesRepository.getTeamEventType(
-      teamId,
-      eventTypeId
-    );
-
-    if (!existingEventType) {
-      throw new NotFoundException(`Event type with ID=${eventTypeId} does not exist.`);
-    }
-
-    return this.eventTypesRepository.deleteEventType(eventTypeId);
-  }
-
-  async deleteUserTeamEventTypesAndHosts(userId: number, teamId: number) {
-    try {
-      await this.organizationEventTypesRepository.deleteUserManagedTeamEventTypes(userId, teamId);
-      await this.organizationEventTypesRepository.removeUserFromTeamEventTypesHosts(userId, teamId);
-    } catch (err) {
-      this.logger.error("Could not remove user from all team event-types.", {
-        error: err,
-        userId,
-        teamId,
-      });
-    }
+    return this.teamsEventTypesService.deleteTeamEventType(teamId, eventTypeId);
   }
 }

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

@@ -1,5 +1,5 @@
 import { OutputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/output-event-types.service";
-import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
+import { TeamsEventTypesRepository } from "@/modules/teams/event-types/teams-event-types.repository";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";
 import type { EventType, User, Schedule, Host, DestinationCalendar } from "@prisma/client";
@@ -77,7 +77,7 @@ type Input = Pick<
 export class OutputOrganizationsEventTypesService {
   constructor(
     private readonly outputEventTypesService: OutputEventTypesService_2024_06_14,
-    private readonly organizationEventTypesRepository: OrganizationsEventTypesRepository,
+    private readonly teamsEventTypesRepository: TeamsEventTypesRepository,
     private readonly usersRepository: UsersRepository
   ) {}
 
@@ -117,7 +117,7 @@ export class OutputOrganizationsEventTypesService {
   }
 
   async getManagedEventTypeHosts(eventTypeId: number) {
-    const children = await this.organizationEventTypesRepository.getEventTypeChildren(eventTypeId);
+    const children = await this.teamsEventTypesRepository.getEventTypeChildren(eventTypeId);
     const transformedHosts: TeamEventTypeResponseHost[] = [];
     for (const child of children) {
       if (child.userId) {

apps/api/v2/src/modules/selected-calendars/selected-calendars.repository.ts

@@ -2,50 +2,62 @@ import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
 
+// It ensures that we work on userLevel calendars only
+const ensureUserLevelWhere = {
+  eventTypeId: null,
+};
+
 @Injectable()
 export class SelectedCalendarsRepository {
   constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
 
-  upsertSelectedCalendar(externalId: string, credentialId: number, userId: number, integration: string) {
-    return this.dbWrite.prisma.selectedCalendar.upsert({
-      create: {
-        userId,
-        externalId,
-        credentialId,
-        integration,
-      },
-      update: {
-        userId,
-        externalId,
-        credentialId,
-        integration,
-      },
-      where: {
-        userId_integration_externalId: {
-          userId,
-          integration,
-          externalId,
+  async upsertSelectedCalendar(
+    externalId: string,
+    credentialId: number,
+    userId: number,
+    integration: string
+  ) {
+    // Why we can't use .upsert here, see server/repository/selectedCalendar.ts#upsert
+    const existingUserSelectedCalendar = await this.getUserSelectedCalendar(userId, integration, externalId);
+    const data = {
+      userId,
+      externalId,
+      credentialId,
+      integration,
+      ...ensureUserLevelWhere,
+    };
+
+    if (existingUserSelectedCalendar) {
+      return this.dbWrite.prisma.selectedCalendar.update({
+        where: {
+          id: existingUserSelectedCalendar.id,
         },
-      },
+        data,
+      });
+    }
+
+    return this.dbWrite.prisma.selectedCalendar.create({
+      data,
     });
   }
 
   getUserSelectedCalendars(userId: number) {
+    // It would be unique result but we can't use .findUnique here because of eventTypeId being nullable
     return this.dbRead.prisma.selectedCalendar.findMany({
       where: {
         userId,
+        ...ensureUserLevelWhere,
       },
     });
   }
 
   getUserSelectedCalendar(userId: number, integration: string, externalId: string) {
-    return this.dbRead.prisma.selectedCalendar.findUnique({
+    return this.dbRead.prisma.selectedCalendar.findFirst({
       where: {
-        userId_integration_externalId: {
-          userId,
-          externalId,
-          integration,
-        },
+        userId,
+        externalId,
+        integration,
+        ...ensureUserLevelWhere,
       },
     });
   }
@@ -56,33 +68,46 @@ export class SelectedCalendarsRepository {
     externalId: string,
     credentialId: number
   ) {
-    return await this.dbWrite.prisma.selectedCalendar.upsert({
-      where: {
-        userId_integration_externalId: {
-          userId,
-          integration,
-          externalId,
-        },
-      },
-      create: {
+    const existingUserSelectedCalendar = await this.getUserSelectedCalendar(userId, integration, externalId);
+
+    if (existingUserSelectedCalendar) {
+      return;
+    }
+
+    return await this.dbWrite.prisma.selectedCalendar.create({
+      data: {
         userId,
         integration,
         externalId,
         credentialId,
+        ...ensureUserLevelWhere,
       },
-      // already exists
-      update: {},
     });
   }
 
   async removeUserSelectedCalendar(userId: number, integration: string, externalId: string) {
+    // Using deleteMany because userId_externalId_integration_eventTypeId is a unique constraint but with eventTypeId being nullable, causing it to be not used as a unique constraint
+    const records = await this.dbWrite.prisma.selectedCalendar.findMany({
+      where: {
+        userId,
+        externalId,
+        integration,
+        ...ensureUserLevelWhere,
+      },
+    });
+
+    // Make the behaviour same as .delete which throws error if no record is found
+    if (records.length === 0) {
+      throw new Error("No SelectedCalendar found.");
+    }
+
+    if (records.length > 1) {
+      throw new Error("Multiple SelecteCalendars found. Skipping deletion");
+    }
+
     return await this.dbWrite.prisma.selectedCalendar.delete({
       where: {
-        userId_integration_externalId: {
-          userId,
-          externalId,
-          integration,
-        },
+        id: records[0].id,
       },
     });
   }

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

@@ -0,0 +1,490 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module";
+import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { SlotsModule } from "@/modules/slots/slots.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";
+import { Test } from "@nestjs/testing";
+import { User } from "@prisma/client";
+import * as request from "supertest";
+import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
+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 { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+
+const expectedSlotsUTC = {
+  slots: {
+    "2050-09-05": [
+      { time: "2050-09-05T07:00:00.000Z" },
+      { time: "2050-09-05T08:00:00.000Z" },
+      { time: "2050-09-05T09:00:00.000Z" },
+      { time: "2050-09-05T10:00:00.000Z" },
+      { time: "2050-09-05T11:00:00.000Z" },
+      { time: "2050-09-05T12:00:00.000Z" },
+      { time: "2050-09-05T13:00:00.000Z" },
+      { time: "2050-09-05T14:00:00.000Z" },
+    ],
+    "2050-09-06": [
+      { time: "2050-09-06T07:00:00.000Z" },
+      { time: "2050-09-06T08:00:00.000Z" },
+      { time: "2050-09-06T09:00:00.000Z" },
+      { time: "2050-09-06T10:00:00.000Z" },
+      { time: "2050-09-06T11:00:00.000Z" },
+      { time: "2050-09-06T12:00:00.000Z" },
+      { time: "2050-09-06T13:00:00.000Z" },
+      { time: "2050-09-06T14:00:00.000Z" },
+    ],
+    "2050-09-07": [
+      { time: "2050-09-07T07:00:00.000Z" },
+      { time: "2050-09-07T08:00:00.000Z" },
+      { time: "2050-09-07T09:00:00.000Z" },
+      { time: "2050-09-07T10:00:00.000Z" },
+      { time: "2050-09-07T11:00:00.000Z" },
+      { time: "2050-09-07T12:00:00.000Z" },
+      { time: "2050-09-07T13:00:00.000Z" },
+      { time: "2050-09-07T14:00:00.000Z" },
+    ],
+    "2050-09-08": [
+      { time: "2050-09-08T07:00:00.000Z" },
+      { time: "2050-09-08T08:00:00.000Z" },
+      { time: "2050-09-08T09:00:00.000Z" },
+      { time: "2050-09-08T10:00:00.000Z" },
+      { time: "2050-09-08T11:00:00.000Z" },
+      { time: "2050-09-08T12:00:00.000Z" },
+      { time: "2050-09-08T13:00:00.000Z" },
+      { time: "2050-09-08T14:00:00.000Z" },
+    ],
+    "2050-09-09": [
+      { time: "2050-09-09T07:00:00.000Z" },
+      { time: "2050-09-09T08:00:00.000Z" },
+      { time: "2050-09-09T09:00:00.000Z" },
+      { time: "2050-09-09T10:00:00.000Z" },
+      { time: "2050-09-09T11:00:00.000Z" },
+      { time: "2050-09-09T12:00:00.000Z" },
+      { time: "2050-09-09T13:00:00.000Z" },
+      { time: "2050-09-09T14:00:00.000Z" },
+    ],
+  },
+};
+
+const expectedSlotsRome = {
+  slots: {
+    "2050-09-05": [
+      { time: "2050-09-05T09:00:00.000+02:00" },
+      { time: "2050-09-05T10:00:00.000+02:00" },
+      { time: "2050-09-05T11:00:00.000+02:00" },
+      { time: "2050-09-05T12:00:00.000+02:00" },
+      { time: "2050-09-05T13:00:00.000+02:00" },
+      { time: "2050-09-05T14:00:00.000+02:00" },
+      { time: "2050-09-05T15:00:00.000+02:00" },
+      { time: "2050-09-05T16:00:00.000+02:00" },
+    ],
+    "2050-09-06": [
+      { time: "2050-09-06T09:00:00.000+02:00" },
+      { time: "2050-09-06T10:00:00.000+02:00" },
+      { time: "2050-09-06T11:00:00.000+02:00" },
+      { time: "2050-09-06T12:00:00.000+02:00" },
+      { time: "2050-09-06T13:00:00.000+02:00" },
+      { time: "2050-09-06T14:00:00.000+02:00" },
+      { time: "2050-09-06T15:00:00.000+02:00" },
+      { time: "2050-09-06T16:00:00.000+02:00" },
+    ],
+    "2050-09-07": [
+      { time: "2050-09-07T09:00:00.000+02:00" },
+      { time: "2050-09-07T10:00:00.000+02:00" },
+      { time: "2050-09-07T11:00:00.000+02:00" },
+      { time: "2050-09-07T12:00:00.000+02:00" },
+      { time: "2050-09-07T13:00:00.000+02:00" },
+      { time: "2050-09-07T14:00:00.000+02:00" },
+      { time: "2050-09-07T15:00:00.000+02:00" },
+      { time: "2050-09-07T16:00:00.000+02:00" },
+    ],
+    "2050-09-08": [
+      { time: "2050-09-08T09:00:00.000+02:00" },
+      { time: "2050-09-08T10:00:00.000+02:00" },
+      { time: "2050-09-08T11:00:00.000+02:00" },
+      { time: "2050-09-08T12:00:00.000+02:00" },
+      { time: "2050-09-08T13:00:00.000+02:00" },
+      { time: "2050-09-08T14:00:00.000+02:00" },
+      { time: "2050-09-08T15:00:00.000+02:00" },
+      { time: "2050-09-08T16:00:00.000+02:00" },
+    ],
+    "2050-09-09": [
+      { time: "2050-09-09T09:00:00.000+02:00" },
+      { time: "2050-09-09T10:00:00.000+02:00" },
+      { time: "2050-09-09T11:00:00.000+02:00" },
+      { time: "2050-09-09T12:00:00.000+02:00" },
+      { time: "2050-09-09T13:00:00.000+02:00" },
+      { time: "2050-09-09T14:00:00.000+02:00" },
+      { time: "2050-09-09T15:00:00.000+02:00" },
+      { time: "2050-09-09T16:00:00.000+02:00" },
+    ],
+  },
+};
+
+const expectedSlotsUTCRange = {
+  slots: {
+    "2050-09-05": [
+      { startTime: "2050-09-05T07:00:00.000Z", endTime: "2050-09-05T08:00:00.000Z" },
+      { startTime: "2050-09-05T08:00:00.000Z", endTime: "2050-09-05T09:00:00.000Z" },
+      { startTime: "2050-09-05T09:00:00.000Z", endTime: "2050-09-05T10:00:00.000Z" },
+      { startTime: "2050-09-05T10:00:00.000Z", endTime: "2050-09-05T11:00:00.000Z" },
+      { startTime: "2050-09-05T11:00:00.000Z", endTime: "2050-09-05T12:00:00.000Z" },
+      { startTime: "2050-09-05T12:00:00.000Z", endTime: "2050-09-05T13:00:00.000Z" },
+      { startTime: "2050-09-05T13:00:00.000Z", endTime: "2050-09-05T14:00:00.000Z" },
+      { startTime: "2050-09-05T14:00:00.000Z", endTime: "2050-09-05T15:00:00.000Z" },
+    ],
+    "2050-09-06": [
+      { startTime: "2050-09-06T07:00:00.000Z", endTime: "2050-09-06T08:00:00.000Z" },
+      { startTime: "2050-09-06T08:00:00.000Z", endTime: "2050-09-06T09:00:00.000Z" },
+      { startTime: "2050-09-06T09:00:00.000Z", endTime: "2050-09-06T10:00:00.000Z" },
+      { startTime: "2050-09-06T10:00:00.000Z", endTime: "2050-09-06T11:00:00.000Z" },
+      { startTime: "2050-09-06T11:00:00.000Z", endTime: "2050-09-06T12:00:00.000Z" },
+      { startTime: "2050-09-06T12:00:00.000Z", endTime: "2050-09-06T13:00:00.000Z" },
+      { startTime: "2050-09-06T13:00:00.000Z", endTime: "2050-09-06T14:00:00.000Z" },
+      { startTime: "2050-09-06T14:00:00.000Z", endTime: "2050-09-06T15:00:00.000Z" },
+    ],
+    "2050-09-07": [
+      { startTime: "2050-09-07T07:00:00.000Z", endTime: "2050-09-07T08:00:00.000Z" },
+      { startTime: "2050-09-07T08:00:00.000Z", endTime: "2050-09-07T09:00:00.000Z" },
+      { startTime: "2050-09-07T09:00:00.000Z", endTime: "2050-09-07T10:00:00.000Z" },
+      { startTime: "2050-09-07T10:00:00.000Z", endTime: "2050-09-07T11:00:00.000Z" },
+      { startTime: "2050-09-07T11:00:00.000Z", endTime: "2050-09-07T12:00:00.000Z" },
+      { startTime: "2050-09-07T12:00:00.000Z", endTime: "2050-09-07T13:00:00.000Z" },
+      { startTime: "2050-09-07T13:00:00.000Z", endTime: "2050-09-07T14:00:00.000Z" },
+      { startTime: "2050-09-07T14:00:00.000Z", endTime: "2050-09-07T15:00:00.000Z" },
+    ],
+    "2050-09-08": [
+      { startTime: "2050-09-08T07:00:00.000Z", endTime: "2050-09-08T08:00:00.000Z" },
+      { startTime: "2050-09-08T08:00:00.000Z", endTime: "2050-09-08T09:00:00.000Z" },
+      { startTime: "2050-09-08T09:00:00.000Z", endTime: "2050-09-08T10:00:00.000Z" },
+      { startTime: "2050-09-08T10:00:00.000Z", endTime: "2050-09-08T11:00:00.000Z" },
+      { startTime: "2050-09-08T11:00:00.000Z", endTime: "2050-09-08T12:00:00.000Z" },
+      { startTime: "2050-09-08T12:00:00.000Z", endTime: "2050-09-08T13:00:00.000Z" },
+      { startTime: "2050-09-08T13:00:00.000Z", endTime: "2050-09-08T14:00:00.000Z" },
+      { startTime: "2050-09-08T14:00:00.000Z", endTime: "2050-09-08T15:00:00.000Z" },
+    ],
+    "2050-09-09": [
+      { startTime: "2050-09-09T07:00:00.000Z", endTime: "2050-09-09T08:00:00.000Z" },
+      { startTime: "2050-09-09T08:00:00.000Z", endTime: "2050-09-09T09:00:00.000Z" },
+      { startTime: "2050-09-09T09:00:00.000Z", endTime: "2050-09-09T10:00:00.000Z" },
+      { startTime: "2050-09-09T10:00:00.000Z", endTime: "2050-09-09T11:00:00.000Z" },
+      { startTime: "2050-09-09T11:00:00.000Z", endTime: "2050-09-09T12:00:00.000Z" },
+      { startTime: "2050-09-09T12:00:00.000Z", endTime: "2050-09-09T13:00:00.000Z" },
+      { startTime: "2050-09-09T13:00:00.000Z", endTime: "2050-09-09T14:00:00.000Z" },
+      { startTime: "2050-09-09T14:00:00.000Z", endTime: "2050-09-09T15:00:00.000Z" },
+    ],
+  },
+};
+
+const expectedSlotsRomeRange = {
+  slots: {
+    "2050-09-05": [
+      { startTime: "2050-09-05T09:00:00.000+02:00", endTime: "2050-09-05T10:00:00.000+02:00" },
+      { startTime: "2050-09-05T10:00:00.000+02:00", endTime: "2050-09-05T11:00:00.000+02:00" },
+      { startTime: "2050-09-05T11:00:00.000+02:00", endTime: "2050-09-05T12:00:00.000+02:00" },
+      { startTime: "2050-09-05T12:00:00.000+02:00", endTime: "2050-09-05T13:00:00.000+02:00" },
+      { startTime: "2050-09-05T13:00:00.000+02:00", endTime: "2050-09-05T14:00:00.000+02:00" },
+      { startTime: "2050-09-05T14:00:00.000+02:00", endTime: "2050-09-05T15:00:00.000+02:00" },
+      { startTime: "2050-09-05T15:00:00.000+02:00", endTime: "2050-09-05T16:00:00.000+02:00" },
+      { startTime: "2050-09-05T16:00:00.000+02:00", endTime: "2050-09-05T17:00:00.000+02:00" },
+    ],
+    "2050-09-06": [
+      { startTime: "2050-09-06T09:00:00.000+02:00", endTime: "2050-09-06T10:00:00.000+02:00" },
+      { startTime: "2050-09-06T10:00:00.000+02:00", endTime: "2050-09-06T11:00:00.000+02:00" },
+      { startTime: "2050-09-06T11:00:00.000+02:00", endTime: "2050-09-06T12:00:00.000+02:00" },
+      { startTime: "2050-09-06T12:00:00.000+02:00", endTime: "2050-09-06T13:00:00.000+02:00" },
+      { startTime: "2050-09-06T13:00:00.000+02:00", endTime: "2050-09-06T14:00:00.000+02:00" },
+      { startTime: "2050-09-06T14:00:00.000+02:00", endTime: "2050-09-06T15:00:00.000+02:00" },
+      { startTime: "2050-09-06T15:00:00.000+02:00", endTime: "2050-09-06T16:00:00.000+02:00" },
+      { startTime: "2050-09-06T16:00:00.000+02:00", endTime: "2050-09-06T17:00:00.000+02:00" },
+    ],
+    "2050-09-07": [
+      { startTime: "2050-09-07T09:00:00.000+02:00", endTime: "2050-09-07T10:00:00.000+02:00" },
+      { startTime: "2050-09-07T10:00:00.000+02:00", endTime: "2050-09-07T11:00:00.000+02:00" },
+      { startTime: "2050-09-07T11:00:00.000+02:00", endTime: "2050-09-07T12:00:00.000+02:00" },
+      { startTime: "2050-09-07T12:00:00.000+02:00", endTime: "2050-09-07T13:00:00.000+02:00" },
+      { startTime: "2050-09-07T13:00:00.000+02:00", endTime: "2050-09-07T14:00:00.000+02:00" },
+      { startTime: "2050-09-07T14:00:00.000+02:00", endTime: "2050-09-07T15:00:00.000+02:00" },
+      { startTime: "2050-09-07T15:00:00.000+02:00", endTime: "2050-09-07T16:00:00.000+02:00" },
+      { startTime: "2050-09-07T16:00:00.000+02:00", endTime: "2050-09-07T17:00:00.000+02:00" },
+    ],
+    "2050-09-08": [
+      { startTime: "2050-09-08T09:00:00.000+02:00", endTime: "2050-09-08T10:00:00.000+02:00" },
+      { startTime: "2050-09-08T10:00:00.000+02:00", endTime: "2050-09-08T11:00:00.000+02:00" },
+      { startTime: "2050-09-08T11:00:00.000+02:00", endTime: "2050-09-08T12:00:00.000+02:00" },
+      { startTime: "2050-09-08T12:00:00.000+02:00", endTime: "2050-09-08T13:00:00.000+02:00" },
+      { startTime: "2050-09-08T13:00:00.000+02:00", endTime: "2050-09-08T14:00:00.000+02:00" },
+      { startTime: "2050-09-08T14:00:00.000+02:00", endTime: "2050-09-08T15:00:00.000+02:00" },
+      { startTime: "2050-09-08T15:00:00.000+02:00", endTime: "2050-09-08T16:00:00.000+02:00" },
+      { startTime: "2050-09-08T16:00:00.000+02:00", endTime: "2050-09-08T17:00:00.000+02:00" },
+    ],
+    "2050-09-09": [
+      { startTime: "2050-09-09T09:00:00.000+02:00", endTime: "2050-09-09T10:00:00.000+02:00" },
+      { startTime: "2050-09-09T10:00:00.000+02:00", endTime: "2050-09-09T11:00:00.000+02:00" },
+      { startTime: "2050-09-09T11:00:00.000+02:00", endTime: "2050-09-09T12:00:00.000+02:00" },
+      { startTime: "2050-09-09T12:00:00.000+02:00", endTime: "2050-09-09T13:00:00.000+02:00" },
+      { startTime: "2050-09-09T13:00:00.000+02:00", endTime: "2050-09-09T14:00:00.000+02:00" },
+      { startTime: "2050-09-09T14:00:00.000+02:00", endTime: "2050-09-09T15:00:00.000+02:00" },
+      { startTime: "2050-09-09T15:00:00.000+02:00", endTime: "2050-09-09T16:00:00.000+02:00" },
+      { startTime: "2050-09-09T16:00:00.000+02:00", endTime: "2050-09-09T17:00:00.000+02:00" },
+    ],
+  },
+};
+
+describe("Slots Endpoints", () => {
+  describe("Individual user slots", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let schedulesService: SchedulesService_2024_06_11;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let selectedSlotsRepositoryFixture: SelectedSlotsRepositoryFixture;
+    let bookingsRepositoryFixture: BookingsRepositoryFixture;
+
+    const userEmail = `slots-${randomNumber()}-controller-e2e@api.com`;
+    const userName = "bob";
+    let user: User;
+    let eventTypeId: number;
+    let eventTypeSlug: string;
+    let reservedSlotUid: string;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [
+            AppModule,
+            PrismaModule,
+            UsersModule,
+            TokensModule,
+            SchedulesModule_2024_06_11,
+            SlotsModule,
+          ],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      schedulesService = moduleRef.get<SchedulesService_2024_06_11>(SchedulesService_2024_06_11);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      selectedSlotsRepositoryFixture = new SelectedSlotsRepositoryFixture(moduleRef);
+      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        name: "bob slot",
+        username: userName,
+      });
+
+      // 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 event = await eventTypesRepositoryFixture.create(
+        { title: "frisbee match", slug: "frisbee-match", length: 60 },
+        user.id
+      );
+      eventTypeId = event.id;
+      eventTypeSlug = event.slug;
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should get slots in UTC by event type id", async () => {
+      return request(app.getHttpServer())
+        .get(`/api/v2/slots/available?eventTypeId=${eventTypeId}&startTime=2050-09-05&endTime=2050-09-10`)
+        .expect(200)
+        .expect((res) => {
+          expect(res.body).toEqual({
+            status: SUCCESS_STATUS,
+            data: expectedSlotsUTC,
+          });
+        });
+    });
+
+    it("should get slots in specified time zone by event type id", async () => {
+      return request(app.getHttpServer())
+        .get(
+          `/api/v2/slots/available?eventTypeId=${eventTypeId}&startTime=2050-09-05&endTime=2050-09-10&timeZone=Europe/Rome`
+        )
+        .expect(200)
+        .expect((res) => {
+          expect(res.body).toEqual({
+            status: SUCCESS_STATUS,
+            data: expectedSlotsRome,
+          });
+        });
+    });
+
+    it("should get slots in UTC by event type id in range format", async () => {
+      return request(app.getHttpServer())
+        .get(
+          `/api/v2/slots/available?eventTypeId=${eventTypeId}&startTime=2050-09-05&endTime=2050-09-10&slotFormat=range`
+        )
+        .expect(200)
+        .expect((res) => {
+          expect(res.body).toEqual({
+            status: SUCCESS_STATUS,
+            data: expectedSlotsUTCRange,
+          });
+        });
+    });
+
+    it("should get slots in specified time zone by event type id in range format", async () => {
+      return request(app.getHttpServer())
+        .get(
+          `/api/v2/slots/available?eventTypeId=${eventTypeId}&startTime=2050-09-05&endTime=2050-09-10&timeZone=Europe/Rome&slotFormat=range`
+        )
+        .expect(200)
+        .expect((res) => {
+          expect(res.body).toEqual({
+            status: SUCCESS_STATUS,
+            data: expectedSlotsRomeRange,
+          });
+        });
+    });
+
+    it("should get slots in UTC by event type slug", async () => {
+      return request(app.getHttpServer())
+        .get(
+          `/api/v2/slots/available?eventTypeSlug=${eventTypeSlug}&usernameList[]=${userName}&startTime=2050-09-05&endTime=2050-09-10`
+        )
+        .expect(200)
+        .expect((res) => {
+          expect(res.body).toEqual({
+            status: SUCCESS_STATUS,
+            data: expectedSlotsUTC,
+          });
+        });
+    });
+
+    it("should get slots in specified time zone by event type slug", async () => {
+      return request(app.getHttpServer())
+        .get(
+          `/api/v2/slots/available?eventTypeSlug=${eventTypeSlug}&usernameList[]=${userName}&startTime=2050-09-05&endTime=2050-09-10&timeZone=Europe/Rome`
+        )
+        .expect(200)
+        .expect((res) => {
+          expect(res.body).toEqual({
+            status: SUCCESS_STATUS,
+            data: expectedSlotsRome,
+          });
+        });
+    });
+
+    it("should reserve a slot and it should not appear in available slots", async () => {
+      const slotStartTime = "2050-09-05T10:00:00.000Z";
+      const reserveResponse = await request(app.getHttpServer())
+        .post(`/api/v2/slots/reserve`)
+        .send({
+          eventTypeId,
+          slotUtcStartDate: slotStartTime,
+          slotUtcEndDate: "2050-09-05T11:00:00.000Z",
+        })
+        .expect(201);
+
+      const reserveResponseBody = reserveResponse.body;
+      expect(reserveResponseBody.status).toEqual(SUCCESS_STATUS);
+      const uid: string = reserveResponseBody.data;
+      expect(uid).toBeDefined();
+      if (!uid) {
+        throw new Error("Reserved slot uid is undefined");
+      }
+      reservedSlotUid = uid;
+
+      const response = await request(app.getHttpServer())
+        .get(`/api/v2/slots/available?eventTypeId=${eventTypeId}&startTime=2050-09-05&endTime=2050-09-10`)
+        .expect(200);
+
+      const responseBody = response.body;
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      const slots = responseBody.data;
+
+      expect(slots).toBeDefined();
+      const days = Object.keys(slots.slots);
+      expect(days.length).toEqual(5);
+
+      const expectedSlotsUTC2050_09_05 = expectedSlotsUTC.slots["2050-09-05"].filter(
+        (slot) => slot.time !== slotStartTime
+      );
+      expect(slots).toEqual({
+        slots: { ...expectedSlotsUTC.slots, "2050-09-05": expectedSlotsUTC2050_09_05 },
+      });
+    });
+
+    it("should delete reserved slot", async () => {
+      await request(app.getHttpServer())
+        .delete(`/api/v2/slots/selected-slot?uid=${reservedSlotUid}`)
+        .expect(200);
+    });
+
+    it("should do a booking and slot should not be available at that time", async () => {
+      const startTime = "2050-09-05T11:00:00.000Z";
+      await bookingsRepositoryFixture.create({
+        uid: `booking-uid-${eventTypeId}`,
+        title: "booking title",
+        startTime,
+        endTime: "2050-09-05T12:00:00.000Z",
+        eventType: {
+          connect: {
+            id: eventTypeId,
+          },
+        },
+        metadata: {},
+        responses: {
+          name: "tester",
+          email: "tester@example.com",
+          guests: [],
+        },
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+      });
+
+      const response = await request(app.getHttpServer())
+        .get(`/api/v2/slots/available?eventTypeId=${eventTypeId}&startTime=2050-09-05&endTime=2050-09-10`)
+        .expect(200);
+
+      const responseBody = response.body;
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      const slots = responseBody.data;
+
+      expect(slots).toBeDefined();
+      const days = Object.keys(slots.slots);
+      expect(days.length).toEqual(5);
+
+      const expectedSlotsUTC2050_09_05 = expectedSlotsUTC.slots["2050-09-05"].filter(
+        (slot) => slot.time !== startTime
+      );
+      expect(slots).toEqual({
+        slots: { ...expectedSlotsUTC.slots, "2050-09-05": expectedSlotsUTC2050_09_05 },
+      });
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await selectedSlotsRepositoryFixture.deleteByUId(reservedSlotUid);
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+
+      await app.close();
+    });
+  });
+});

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

@@ -1,11 +1,11 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { SlotsOutputService } from "@/modules/slots/services/slots-output.service";
 import { SlotsService } from "@/modules/slots/services/slots.service";
 import { Query, Body, Controller, Get, Delete, Post, Req, Res } from "@nestjs/common";
 import { ApiTags as DocsTags, ApiCreatedResponse, ApiOkResponse, ApiOperation } from "@nestjs/swagger";
 import { Response as ExpressResponse, Request as ExpressRequest } from "express";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
-import { SlotFormat } from "@calcom/platform-enums";
 import { getAvailableSlots } from "@calcom/platform-libraries";
 import type { AvailableSlotsType } from "@calcom/platform-libraries";
 import { RemoveSelectedSlotInput, ReserveSlotInput } from "@calcom/platform-types";
@@ -17,7 +17,10 @@ import { ApiResponse, GetAvailableSlotsInput } from "@calcom/platform-types";
 })
 @DocsTags("Slots")
 export class SlotsController {
-  constructor(private readonly slotsService: SlotsService) {}
+  constructor(
+    private readonly slotsService: SlotsService,
+    private readonly slotsOutputService: SlotsOutputService
+  ) {}
 
   @Post("/reserve")
   @ApiCreatedResponse({
@@ -159,19 +162,17 @@ export class SlotsController {
       },
     });
 
-    const transformedSlots =
-      query.slotFormat === SlotFormat.Range
-        ? await this.slotsService.formatSlots(
-            availableSlots,
-            query.duration,
-            query.eventTypeId,
-            query.slotFormat
-          )
-        : availableSlots.slots;
+    const { slots } = await this.slotsOutputService.getOutputSlots(
+      availableSlots,
+      query.duration,
+      query.eventTypeId,
+      query.slotFormat,
+      query.timeZone
+    );
 
     return {
       data: {
-        slots: transformedSlots,
+        slots,
       },
       status: SUCCESS_STATUS,
     };

apps/api/v2/src/modules/slots/services/slots-output.service.ts

@@ -0,0 +1,96 @@
+import { EventTypesRepository_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.repository";
+import { Injectable, BadRequestException } from "@nestjs/common";
+import { DateTime } from "luxon";
+
+import { SlotFormat } from "@calcom/platform-enums";
+
+type TimeSlots = { slots: Record<string, { time: string }[]> };
+type RangeSlots = { slots: Record<string, { startTime: string; endTime: string }[]> };
+
+@Injectable()
+export class SlotsOutputService {
+  constructor(private readonly eventTypesRepository: EventTypesRepository_2024_04_15) {}
+
+  async getOutputSlots(
+    availableSlots: TimeSlots,
+    duration?: number,
+    eventTypeId?: number,
+    slotFormat?: SlotFormat,
+    timeZone?: string
+  ): Promise<TimeSlots | RangeSlots> {
+    if (!slotFormat) {
+      return timeZone ? this.setTimeZone(availableSlots, timeZone) : availableSlots;
+    }
+
+    const formattedSlots = await this.formatSlots(availableSlots, duration, eventTypeId, slotFormat);
+    return timeZone ? this.setTimeZoneRange(formattedSlots, timeZone) : formattedSlots;
+  }
+
+  private setTimeZone(slots: TimeSlots, timeZone: string): TimeSlots {
+    const formattedSlots = Object.entries(slots.slots).reduce((acc, [date, daySlots]) => {
+      acc[date] = daySlots.map((slot) => ({
+        time: DateTime.fromISO(slot.time).setZone(timeZone).toISO() || "unknown-time",
+      }));
+      return acc;
+    }, {} as Record<string, { time: string }[]>);
+
+    return { slots: formattedSlots };
+  }
+
+  private setTimeZoneRange(slots: RangeSlots, timeZone: string): RangeSlots {
+    const formattedSlots = Object.entries(slots.slots).reduce((acc, [date, daySlots]) => {
+      acc[date] = daySlots.map((slot) => ({
+        startTime: DateTime.fromISO(slot.startTime).setZone(timeZone).toISO() || "unknown-start-time",
+        endTime: DateTime.fromISO(slot.endTime).setZone(timeZone).toISO() || "unknown-end-time",
+      }));
+      return acc;
+    }, {} as Record<string, { startTime: string; endTime: string }[]>);
+
+    return { slots: formattedSlots };
+  }
+
+  private async formatSlots(
+    availableSlots: TimeSlots,
+    duration?: number,
+    eventTypeId?: number,
+    slotFormat?: SlotFormat
+  ): Promise<RangeSlots> {
+    if (slotFormat && !Object.values(SlotFormat).includes(slotFormat)) {
+      throw new BadRequestException("Invalid slot format. Must be either 'range' or 'time'");
+    }
+
+    const slotDuration = await this.getDuration(duration, eventTypeId);
+
+    const slots = Object.entries(availableSlots.slots).reduce<
+      Record<string, { startTime: string; endTime: string }[]>
+    >((acc, [date, slots]) => {
+      acc[date] = (slots as { time: string }[]).map((slot) => {
+        const startTime = new Date(slot.time);
+        const endTime = new Date(startTime.getTime() + slotDuration * 60000);
+        return {
+          startTime: startTime.toISOString(),
+          endTime: endTime.toISOString(),
+        };
+      });
+      return acc;
+    }, {});
+
+    return { slots };
+  }
+
+  private async getDuration(duration?: number, eventTypeId?: number): Promise<number> {
+    if (duration) {
+      return duration;
+    }
+
+    if (eventTypeId) {
+      const eventType = await this.eventTypesRepository.getEventTypeWithDuration(eventTypeId);
+      if (!eventType) {
+        throw new Error("Event type not found");
+      }
+      return eventType.length;
+    }
+
+    throw new Error("duration or eventTypeId is required");
+  }
+}

apps/api/v2/src/modules/slots/services/slots.service.ts

@@ -1,6 +1,7 @@
 import { EventTypesRepository_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.repository";
 import { SlotsRepository } from "@/modules/slots/slots.repository";
 import { Injectable, NotFoundException, BadRequestException } from "@nestjs/common";
+import { DateTime } from "luxon";
 import { v4 as uuid } from "uuid";
 
 import { SlotFormat } from "@calcom/platform-enums";
@@ -55,51 +56,4 @@ export class SlotsService {
     const event = await this.eventTypeRepo.getEventTypeById(eventTypeId);
     return !!event?.teamId;
   }
-
-  async getEventTypeWithDuration(eventTypeId: number) {
-    return await this.eventTypeRepo.getEventTypeWithDuration(eventTypeId);
-  }
-
-  async getDuration(duration?: number, eventTypeId?: number): Promise<number> {
-    if (duration) {
-      return duration;
-    }
-
-    if (eventTypeId) {
-      const eventType = await this.eventTypeRepo.getEventTypeWithDuration(eventTypeId);
-      if (!eventType) {
-        throw new Error("Event type not found");
-      }
-      return eventType.length;
-    }
-
-    throw new Error("duration or eventTypeId is required");
-  }
-
-  async formatSlots(
-    availableSlots: { slots: Record<string, { time: string }[]> },
-    duration?: number,
-    eventTypeId?: number,
-    slotFormat?: SlotFormat
-  ): Promise<Record<string, { startTime: string; endTime: string }[]>> {
-    if (slotFormat && !Object.values(SlotFormat).includes(slotFormat)) {
-      throw new BadRequestException("Invalid slot format. Must be either 'range' or 'time'");
-    }
-
-    const slotDuration = await this.getDuration(duration, eventTypeId);
-
-    return Object.entries(availableSlots.slots).reduce<
-      Record<string, { startTime: string; endTime: string }[]>
-    >((acc, [date, slots]) => {
-      acc[date] = (slots as { time: string }[]).map((slot) => {
-        const startTime = new Date(slot.time);
-        const endTime = new Date(startTime.getTime() + slotDuration * 60000);
-        return {
-          startTime: startTime.toISOString(),
-          endTime: endTime.toISOString(),
-        };
-      });
-      return acc;
-    }, {});
-  }
 }

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

@@ -1,13 +1,14 @@
 import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { SlotsController } from "@/modules/slots/controllers/slots.controller";
+import { SlotsOutputService } from "@/modules/slots/services/slots-output.service";
 import { SlotsService } from "@/modules/slots/services/slots.service";
 import { SlotsRepository } from "@/modules/slots/slots.repository";
 import { Module } from "@nestjs/common";
 
 @Module({
   imports: [PrismaModule, EventTypesModule_2024_04_15],
-  providers: [SlotsRepository, SlotsService],
+  providers: [SlotsRepository, SlotsService, SlotsOutputService],
   controllers: [SlotsController],
   exports: [SlotsService],
 })

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

@@ -0,0 +1,570 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+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";
+import { Test } from "@nestjs/testing";
+import { User } from "@prisma/client";
+import * as request from "supertest";
+import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
+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 { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import {
+  BookingWindowPeriodInputTypeEnum_2024_06_14,
+  BookerLayoutsInputEnum_2024_06_14,
+  ConfirmationPolicyEnum,
+  NoticeThresholdUnitEnum,
+} from "@calcom/platform-enums";
+import {
+  ApiSuccessResponse,
+  CreateTeamEventTypeInput_2024_06_14,
+  Host,
+  TeamEventTypeOutput_2024_06_14,
+  UpdateTeamEventTypeInput_2024_06_14,
+} from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+describe("Organizations Event Types Endpoints", () => {
+  describe("User Authentication - User is Org Admin", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: OrganizationRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+
+    let team: Team;
+    let falseTestTeam: Team;
+
+    const userEmail = `auth-${randomNumber()}@api.com`;
+    let userAdmin: User;
+
+    const teammate1Email = "teammate111@team.com";
+    const teammate2Email = "teammate221@team.com";
+    const falseTestUserEmail = "false-user@false-team.com";
+    let teamMember1: User;
+    let teamMember2: User;
+    let falseTestUser: User;
+
+    let collectiveEventType: TeamEventTypeOutput_2024_06_14;
+    let managedEventType: TeamEventTypeOutput_2024_06_14;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new OrganizationRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+
+      userAdmin = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        role: "ADMIN",
+      });
+
+      teamMember1 = await userRepositoryFixture.create({
+        email: teammate1Email,
+        username: teammate1Email,
+      });
+
+      teamMember2 = await userRepositoryFixture.create({
+        email: teammate2Email,
+        username: teammate2Email,
+      });
+
+      falseTestUser = await userRepositoryFixture.create({
+        email: falseTestUserEmail,
+        username: falseTestUserEmail,
+      });
+
+      team = await teamsRepositoryFixture.create({
+        name: "Test org team",
+        isOrganization: false,
+      });
+
+      falseTestTeam = await teamsRepositoryFixture.create({
+        name: "Outside org team",
+        isOrganization: false,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: userAdmin.id } },
+        team: { connect: { id: team.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: teamMember1.id } },
+        team: { connect: { id: team.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: teamMember2.id } },
+        team: { connect: { id: team.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: falseTestUser.id } },
+        team: { connect: { id: falseTestTeam.id } },
+        accepted: true,
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should not be able to create event-type for user outside team", async () => {
+      const userId = falseTestUser.id;
+
+      const body: CreateTeamEventTypeInput_2024_06_14 = {
+        title: "Coding consultation",
+        slug: "coding-consultation",
+        description: "Our team will review your codebase.",
+        lengthInMinutes: 60,
+        locations: [
+          {
+            type: "integration",
+            integration: "cal-video",
+          },
+        ],
+        schedulingType: "COLLECTIVE",
+        hosts: [
+          {
+            userId,
+            mandatory: true,
+            priority: "high",
+          },
+        ],
+      };
+
+      return request(app.getHttpServer()).post(`/v2/teams/${team.id}/event-types`).send(body).expect(404);
+    });
+
+    it("should create a collective team event-type", async () => {
+      const body: CreateTeamEventTypeInput_2024_06_14 = {
+        title: "Coding consultation collective",
+        slug: "coding-consultation collective",
+        description: "Our team will review your codebase.",
+        lengthInMinutes: 60,
+        locations: [
+          {
+            type: "integration",
+            integration: "cal-video",
+          },
+        ],
+        bookingFields: [
+          {
+            type: "select",
+            label: "select which language is your codebase in",
+            slug: "select-language",
+            required: true,
+            placeholder: "select language",
+            options: ["javascript", "python", "cobol"],
+          },
+        ],
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        schedulingType: "collective",
+        hosts: [
+          {
+            userId: teamMember1.id,
+          },
+          {
+            userId: teamMember2.id,
+          },
+        ],
+        bookingLimitsCount: {
+          day: 2,
+          week: 5,
+        },
+        onlyShowFirstAvailableSlot: true,
+        bookingLimitsDuration: {
+          day: 60,
+          week: 100,
+        },
+        offsetStart: 30,
+        bookingWindow: {
+          type: BookingWindowPeriodInputTypeEnum_2024_06_14.calendarDays,
+          value: 30,
+          rolling: true,
+        },
+        bookerLayouts: {
+          enabledLayouts: [
+            BookerLayoutsInputEnum_2024_06_14.column,
+            BookerLayoutsInputEnum_2024_06_14.month,
+            BookerLayoutsInputEnum_2024_06_14.week,
+          ],
+          defaultLayout: BookerLayoutsInputEnum_2024_06_14.month,
+        },
+
+        confirmationPolicy: {
+          type: ConfirmationPolicyEnum.TIME,
+          noticeThreshold: {
+            count: 60,
+            unit: NoticeThresholdUnitEnum.MINUTES,
+          },
+          blockUnconfirmedBookingsInBooker: true,
+        },
+        requiresBookerEmailVerification: true,
+        hideCalendarNotes: true,
+        hideCalendarEventDetails: true,
+        lockTimeZoneToggleOnBookingPage: true,
+        color: {
+          darkThemeHex: "#292929",
+          lightThemeHex: "#fafafa",
+        },
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/teams/${team.id}/event-types`)
+        .send(body)
+        .expect(201)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.title).toEqual(body.title);
+          expect(data.hosts.length).toEqual(2);
+          expect(data.schedulingType).toEqual("COLLECTIVE");
+          evaluateHost(body.hosts[0], data.hosts[0]);
+          evaluateHost(body.hosts[1], data.hosts[1]);
+          expect(data.bookingLimitsCount).toEqual(body.bookingLimitsCount);
+          expect(data.onlyShowFirstAvailableSlot).toEqual(body.onlyShowFirstAvailableSlot);
+          expect(data.bookingLimitsDuration).toEqual(body.bookingLimitsDuration);
+          expect(data.offsetStart).toEqual(body.offsetStart);
+          expect(data.bookingWindow).toEqual(body.bookingWindow);
+          expect(data.bookerLayouts).toEqual(body.bookerLayouts);
+          expect(data.confirmationPolicy).toEqual(body.confirmationPolicy);
+          expect(data.requiresBookerEmailVerification).toEqual(body.requiresBookerEmailVerification);
+          expect(data.hideCalendarNotes).toEqual(body.hideCalendarNotes);
+          expect(data.hideCalendarEventDetails).toEqual(body.hideCalendarEventDetails);
+          expect(data.lockTimeZoneToggleOnBookingPage).toEqual(body.lockTimeZoneToggleOnBookingPage);
+          expect(data.color).toEqual(body.color);
+
+          collectiveEventType = responseBody.data;
+        });
+    });
+
+    it("should create a managed team event-type", async () => {
+      const body: CreateTeamEventTypeInput_2024_06_14 = {
+        title: "Coding consultation managed",
+        slug: "coding-consultation-managed",
+        description: "Our team will review your codebase.",
+        lengthInMinutes: 60,
+        locations: [
+          {
+            type: "integration",
+            integration: "cal-video",
+          },
+        ],
+        schedulingType: "MANAGED",
+        hosts: [
+          {
+            userId: teamMember1.id,
+            mandatory: true,
+            priority: "high",
+          },
+          {
+            userId: teamMember2.id,
+            mandatory: false,
+            priority: "low",
+          },
+        ],
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/teams/${team.id}/event-types`)
+        .send(body)
+        .expect(201)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.length).toEqual(3);
+
+          const teammate1EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teamMember1.id);
+          const teammate2EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teamMember2.id);
+          const teamEventTypes = await eventTypesRepositoryFixture.getAllTeamEventTypes(team.id);
+
+          expect(teammate1EventTypes.length).toEqual(1);
+          expect(teammate2EventTypes.length).toEqual(1);
+          expect(teamEventTypes.filter((eventType) => eventType.schedulingType === "MANAGED").length).toEqual(
+            1
+          );
+
+          const responseTeamEvent = responseBody.data.find((event) => event.teamId === team.id);
+          expect(responseTeamEvent).toBeDefined();
+          if (!responseTeamEvent) {
+            throw new Error("Team event not found");
+          }
+
+          const responseTeammate1Event = responseBody.data.find((event) => event.ownerId === teamMember1.id);
+          expect(responseTeammate1Event).toBeDefined();
+          expect(responseTeammate1Event?.parentEventTypeId).toEqual(responseTeamEvent?.id);
+
+          const responseTeammate2Event = responseBody.data.find((event) => event.ownerId === teamMember2.id);
+          expect(responseTeammate2Event).toBeDefined();
+          expect(responseTeammate2Event?.parentEventTypeId).toEqual(responseTeamEvent?.id);
+
+          managedEventType = responseTeamEvent;
+        });
+    });
+
+    it("should not get a non existing event-type", async () => {
+      return request(app.getHttpServer()).get(`/v2/teams/${team.id}/event-types/999999`).expect(404);
+    });
+
+    it("should get a team event-type", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/event-types/${collectiveEventType.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.title).toEqual(collectiveEventType.title);
+          expect(data.hosts.length).toEqual(2);
+          evaluateHost(collectiveEventType.hosts[0], data.hosts[0]);
+          evaluateHost(collectiveEventType.hosts[1], data.hosts[1]);
+
+          collectiveEventType = responseBody.data;
+        });
+    });
+
+    it("should get team event-types", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/event-types`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.length).toEqual(2);
+
+          const eventTypeCollective = data.find((eventType) => eventType.schedulingType === "COLLECTIVE");
+          const eventTypeManaged = data.find((eventType) => eventType.schedulingType === "MANAGED");
+
+          expect(eventTypeCollective?.title).toEqual(collectiveEventType.title);
+          expect(eventTypeCollective?.hosts.length).toEqual(2);
+
+          expect(eventTypeManaged?.title).toEqual(managedEventType.title);
+          expect(eventTypeManaged?.hosts.length).toEqual(2);
+          evaluateHost(collectiveEventType.hosts[0], eventTypeCollective?.hosts[0]);
+          evaluateHost(collectiveEventType.hosts[1], eventTypeCollective?.hosts[1]);
+        });
+    });
+
+    it("should not be able to update non existing event-type", async () => {
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        title: "Clean code consultation",
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/teams/${team.id}/event-types/999999`)
+        .send(body)
+        .expect(400);
+    });
+
+    it("should update collective event-type", async () => {
+      const newHosts: UpdateTeamEventTypeInput_2024_06_14["hosts"] = [
+        {
+          userId: teamMember1.id,
+        },
+      ];
+
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        hosts: newHosts,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/teams/${team.id}/event-types/${collectiveEventType.id}`)
+        .send(body)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const eventType = responseBody.data;
+          expect(eventType.title).toEqual(collectiveEventType.title);
+          expect(eventType.hosts.length).toEqual(1);
+          evaluateHost(eventType.hosts[0], newHosts[0]);
+        });
+    });
+
+    it("should update managed event-type", async () => {
+      const newTitle = "Coding consultation managed updated";
+      const newHosts: UpdateTeamEventTypeInput_2024_06_14["hosts"] = [
+        {
+          userId: teamMember1.id,
+          mandatory: true,
+          priority: "medium",
+        },
+      ];
+
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        title: newTitle,
+        hosts: newHosts,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/teams/${team.id}/event-types/${managedEventType.id}`)
+        .send(body)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.length).toEqual(2);
+
+          const teammate1EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teamMember1.id);
+          const teammate2EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teamMember2.id);
+          const teamEventTypes = await eventTypesRepositoryFixture.getAllTeamEventTypes(team.id);
+          const managedTeamEventTypes = teamEventTypes.filter(
+            (eventType) => eventType.schedulingType === "MANAGED"
+          );
+
+          expect(teammate1EventTypes.length).toEqual(1);
+          expect(teammate1EventTypes[0].title).toEqual(newTitle);
+          expect(teammate2EventTypes.length).toEqual(0);
+          expect(managedTeamEventTypes.length).toEqual(1);
+          expect(managedTeamEventTypes[0].assignAllTeamMembers).toEqual(false);
+          expect(
+            teamEventTypes.filter((eventType) => eventType.schedulingType === "MANAGED")?.[0]?.title
+          ).toEqual(newTitle);
+
+          const responseTeamEvent = responseBody.data.find(
+            (eventType) => eventType.schedulingType === "MANAGED"
+          );
+          expect(responseTeamEvent).toBeDefined();
+          expect(responseTeamEvent?.title).toEqual(newTitle);
+          expect(responseTeamEvent?.assignAllTeamMembers).toEqual(false);
+
+          const responseTeammate1Event = responseBody.data.find(
+            (eventType) => eventType.ownerId === teamMember1.id
+          );
+          expect(responseTeammate1Event).toBeDefined();
+          expect(responseTeammate1Event?.title).toEqual(newTitle);
+
+          managedEventType = responseBody.data[0];
+        });
+    });
+
+    it("should assign all members to managed event-type", async () => {
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        assignAllTeamMembers: true,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/teams/${team.id}/event-types/${managedEventType.id}`)
+        .send(body)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          // note(Lauris): we expect 4 because we have 2 team members, 1 team admin and 4th is the event object itself.
+          expect(data.length).toEqual(4);
+
+          const teammate1EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teamMember1.id);
+          const teammate2EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teamMember2.id);
+          const teamEventTypes = await eventTypesRepositoryFixture.getAllTeamEventTypes(team.id);
+          const managedTeamEventTypes = teamEventTypes.filter(
+            (eventType) => eventType.schedulingType === "MANAGED"
+          );
+
+          expect(teammate1EventTypes.length).toEqual(1);
+          expect(teammate2EventTypes.length).toEqual(1);
+          expect(managedTeamEventTypes.length).toEqual(1);
+          expect(managedTeamEventTypes[0].assignAllTeamMembers).toEqual(true);
+
+          const responseTeamEvent = responseBody.data.find(
+            (eventType) => eventType.schedulingType === "MANAGED"
+          );
+          expect(responseTeamEvent).toBeDefined();
+          expect(responseTeamEvent?.teamId).toEqual(team.id);
+          expect(responseTeamEvent?.assignAllTeamMembers).toEqual(true);
+
+          const responseTeammate1Event = responseBody.data.find(
+            (eventType) => eventType.ownerId === teamMember1.id
+          );
+          expect(responseTeammate1Event).toBeDefined();
+          expect(responseTeammate1Event?.parentEventTypeId).toEqual(responseTeamEvent?.id);
+
+          const responseTeammate2Event = responseBody.data.find(
+            (eventType) => eventType.ownerId === teamMember2.id
+          );
+          expect(responseTeammate1Event).toBeDefined();
+          expect(responseTeammate2Event?.parentEventTypeId).toEqual(responseTeamEvent?.id);
+
+          if (responseTeamEvent) {
+            managedEventType = responseTeamEvent;
+          }
+        });
+    });
+
+    it("should delete event-type not part of the team", async () => {
+      return request(app.getHttpServer()).delete(`/v2/teams/${team.id}/event-types/99999`).expect(404);
+    });
+
+    it("should delete collective event-type", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/teams/${team.id}/event-types/${collectiveEventType.id}`)
+        .expect(200);
+    });
+
+    it("should delete managed event-type", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/teams/${team.id}/event-types/${managedEventType.id}`)
+        .expect(200);
+    });
+
+    function evaluateHost(expected: Host, received: Host | undefined) {
+      expect(expected.userId).toEqual(received?.userId);
+      expect(expected.mandatory).toEqual(received?.mandatory);
+      expect(expected.priority).toEqual(received?.priority);
+    }
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(userAdmin.email);
+      await userRepositoryFixture.deleteByEmail(teamMember1.email);
+      await userRepositoryFixture.deleteByEmail(teamMember2.email);
+      await userRepositoryFixture.deleteByEmail(falseTestUser.email);
+      await teamsRepositoryFixture.delete(team.id);
+      await teamsRepositoryFixture.delete(falseTestTeam.id);
+      await app.close();
+    });
+  });
+});

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

@@ -0,0 +1,208 @@
+import { CreatePhoneCallInput } from "@/ee/event-types/event-types_2024_06_14/inputs/create-phone-call.input";
+import { CreatePhoneCallOutput } from "@/ee/event-types/event-types_2024_06_14/outputs/create-phone-call.output";
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { OutputTeamEventTypesResponsePipe } from "@/modules/organizations/controllers/pipes/event-types/team-event-types-response.transformer";
+import { InputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/input.service";
+import { DatabaseTeamEventType } from "@/modules/organizations/services/event-types/output.service";
+import { CreateTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/create-team-event-type.output";
+import { DeleteTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/delete-team-event-type.output";
+import { GetTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/get-team-event-type.output";
+import { GetTeamEventTypesOutput } from "@/modules/teams/event-types/outputs/get-team-event-types.output";
+import { UpdateTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/update-team-event-type.output";
+import { TeamsEventTypesService } from "@/modules/teams/event-types/services/teams-event-types.service";
+import { UserWithProfile } from "@/modules/users/users.repository";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Post,
+  Param,
+  ParseIntPipe,
+  Body,
+  Patch,
+  Delete,
+  HttpCode,
+  HttpStatus,
+  NotFoundException,
+  Query,
+} from "@nestjs/common";
+import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+import { handleCreatePhoneCall } from "@calcom/platform-libraries";
+import {
+  CreateTeamEventTypeInput_2024_06_14,
+  GetTeamEventTypesQuery_2024_06_14,
+  SkipTakePagination,
+  TeamEventTypeOutput_2024_06_14,
+  UpdateTeamEventTypeInput_2024_06_14,
+} from "@calcom/platform-types";
+
+export type EventTypeHandlerResponse = {
+  data: DatabaseTeamEventType[] | DatabaseTeamEventType;
+  status: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+};
+
+@Controller({
+  path: "/v2/teams/:teamId/event-types",
+  version: API_VERSIONS_VALUES,
+})
+@DocsTags("Teams / Event Types")
+export class TeamsEventTypesController {
+  constructor(
+    private readonly teamsEventTypesService: TeamsEventTypesService,
+    private readonly inputService: InputOrganizationsEventTypesService,
+    private readonly outputTeamEventTypesResponsePipe: OutputTeamEventTypesResponsePipe
+  ) {}
+
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @UseGuards(ApiAuthGuard, RolesGuard)
+  @Post("/")
+  @ApiOperation({ summary: "Create an event type" })
+  async createTeamEventType(
+    @GetUser() user: UserWithProfile,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Body() bodyEventType: CreateTeamEventTypeInput_2024_06_14
+  ): Promise<CreateTeamEventTypeOutput> {
+    const transformedBody = await this.inputService.transformAndValidateCreateTeamEventTypeInput(
+      user.id,
+      teamId,
+      bodyEventType
+    );
+
+    const eventType = await this.teamsEventTypesService.createTeamEventType(user, teamId, transformedBody);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: await this.outputTeamEventTypesResponsePipe.transform(eventType),
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @UseGuards(ApiAuthGuard, RolesGuard)
+  @Get("/:eventTypeId")
+  @ApiOperation({ summary: "Get an event type" })
+  async getTeamEventType(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("eventTypeId") eventTypeId: number
+  ): Promise<GetTeamEventTypeOutput> {
+    const eventType = await this.teamsEventTypesService.getTeamEventType(teamId, eventTypeId);
+
+    if (!eventType) {
+      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
+    }
+
+    return {
+      status: SUCCESS_STATUS,
+      data: (await this.outputTeamEventTypesResponsePipe.transform(
+        eventType
+      )) as TeamEventTypeOutput_2024_06_14,
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @Post("/:eventTypeId/create-phone-call")
+  @UseGuards(ApiAuthGuard, RolesGuard)
+  @ApiOperation({ summary: "Create a phone call" })
+  async createPhoneCall(
+    @Param("eventTypeId") eventTypeId: number,
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Body() body: CreatePhoneCallInput,
+    @GetUser() user: UserWithProfile
+  ): Promise<CreatePhoneCallOutput> {
+    const data = await handleCreatePhoneCall({
+      user: {
+        id: user.id,
+        timeZone: user.timeZone,
+        profile: { organization: { id: orgId } },
+      },
+      input: { ...body, eventTypeId },
+    });
+
+    return {
+      status: SUCCESS_STATUS,
+      data,
+    };
+  }
+
+  @Get("/")
+  @ApiOperation({ summary: "Get a team event type" })
+  async getTeamEventTypes(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() queryParams: GetTeamEventTypesQuery_2024_06_14
+  ): Promise<GetTeamEventTypesOutput> {
+    const { eventSlug } = queryParams;
+
+    if (eventSlug) {
+      const eventType = await this.teamsEventTypesService.getTeamEventTypeBySlug(teamId, eventSlug);
+
+      return {
+        status: SUCCESS_STATUS,
+        data: await this.outputTeamEventTypesResponsePipe.transform(eventType ? [eventType] : []),
+      };
+    }
+
+    const eventTypes = await this.teamsEventTypesService.getTeamEventTypes(teamId);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: await this.outputTeamEventTypesResponsePipe.transform(eventTypes),
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @UseGuards(ApiAuthGuard, RolesGuard)
+  @Patch("/:eventTypeId")
+  @ApiOperation({ summary: "Update a team event type" })
+  async updateTeamEventType(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("eventTypeId", ParseIntPipe) eventTypeId: number,
+    @GetUser() user: UserWithProfile,
+    @Body() bodyEventType: UpdateTeamEventTypeInput_2024_06_14
+  ): Promise<UpdateTeamEventTypeOutput> {
+    const transformedBody = await this.inputService.transformAndValidateUpdateTeamEventTypeInput(
+      user.id,
+      eventTypeId,
+      teamId,
+      bodyEventType
+    );
+
+    const eventType = await this.teamsEventTypesService.updateTeamEventType(
+      eventTypeId,
+      teamId,
+      transformedBody,
+      user
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: await this.outputTeamEventTypesResponsePipe.transform(eventType),
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @UseGuards(ApiAuthGuard, RolesGuard)
+  @Delete("/:eventTypeId")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: "Delete a team event type" })
+  async deleteTeamEventType(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("eventTypeId", ParseIntPipe) eventTypeId: number
+  ): Promise<DeleteTeamEventTypeOutput> {
+    const eventType = await this.teamsEventTypesService.deleteTeamEventType(teamId, eventTypeId);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: {
+        id: eventTypeId,
+        title: eventType.title,
+      },
+    };
+  }
+}