chore: release v4.7.19

* wip

* use light imports

* fix

* perf: Reduce bundle size via better imports with `googleapis` (#17811)

* fix test

* refactor

* update vite.config.js

* fix

* fix unit test failing

.env.example

@@ -119,7 +119,7 @@ NEXT_PUBLIC_FRESHCHAT_HOST=
 
 # Google OAuth credentials
 # To enable Login with Google you need to:
-# 1. Set `GOOGLE_API_CREDENTIALS` above
+# 1. Set `GOOGLE_API_CREDENTIALS` below
 # 2. Set `GOOGLE_LOGIN_ENABLED` to `true`
 # When self-hosting please ensure you configure the Google integration as an Internal app so no one else can login to your instance
 # @see https://support.google.com/cloud/answer/6158849#public-and-internal&zippy=%2Cpublic-and-internal-applications
@@ -129,6 +129,10 @@ GOOGLE_LOGIN_ENABLED=false
 # Needed to enable Google Calendar integration and Login with Google
 # @see https://github.com/calcom/cal.com#obtaining-the-google-api-credentials
 GOOGLE_API_CREDENTIALS=
+# Token to verify incoming webhooks from Google Calendar
+GOOGLE_WEBHOOK_TOKEN=
+# Optional URL to override for tunelling webhooks. Defaults to NEXT_PUBLIC_WEBAPP_URL.
+GOOGLE_WEBHOOK_URL=
 
 # Inbox to send user feedback
 SEND_FEEDBACK_EMAIL=
@@ -143,6 +147,8 @@ NEXT_PUBLIC_SENDGRID_SENDER_NAME=
 # Used for capturing exceptions and logging messages
 NEXT_PUBLIC_SENTRY_DSN=
 SENTRY_DEBUG=
+SENTRY_DISABLE_CLIENT_SOURCE_MAPS=
+SENTRY_DISABLE_SERVER_SOURCE_MAPS=
 SENTRY_MAX_SPANS=
 SENTRY_TRACES_SAMPLE_RATE=
 
@@ -341,8 +347,6 @@ E2E_TEST_OIDC_USER_PASSWORD=
 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_SETTINGS_DEVELOPER_ENABLED=0
-APP_ROUTER_SETTINGS_ORG_ENABLED=0
 APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED=0
 APP_ROUTER_APPS_SLUG_ENABLED=0
 APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
@@ -353,7 +357,6 @@ APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
 APP_ROUTER_BOOKING_ENABLED=0
 APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
 APP_ROUTER_WORKFLOWS_ENABLED=0
-APP_ROUTER_SETTINGS_TEAMS_ENABLED=0
 APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
 APP_ROUTER_APPS_ENABLED=0
 APP_ROUTER_VIDEO_ENABLED=0
@@ -408,3 +411,6 @@ NEXT_PUBLIC_WEBSITE_TERMS_URL=
 # NEXT_PUBLIC_LOGGER_LEVEL=3 sets to log info, warn, error and fatal logs.
 # [0: silly & upwards, 1: trace & upwards, 2: debug & upwards, 3: info & upwards, 4: warn & upwards, 5: error & fatal, 6: fatal]
 NEXT_PUBLIC_LOGGER_LEVEL=
+
+# Used to use Replexica SDK, a tool for real-time AI-powered localization
+REPLEXICA_API_KEY=

.github/workflows/draft-release.yml

@@ -0,0 +1,50 @@
+name: Draft release
+run-name: Draft release ${{ inputs.next_version }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        required: true
+        type: string
+        description: 'Version name'
+
+permissions:
+  contents: write
+
+jobs:
+  draft_release:
+    runs-on: ubuntu-latest
+
+    steps:
+      
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: 'main'
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+
+      - name: Configure git
+        run: |
+          git config --local user.email "github-actions@github.com"
+          git config --local user.name "GitHub Actions"
+
+      - uses: ./.github/actions/yarn-install
+
+      - name: Bump version
+        run: |
+          cd apps/web
+          yarn version ${{ inputs.next_version }}
+
+      - name: Commit changes
+        run: |
+          git add .
+          git commit -m "chore: release v${{ inputs.next_version }}"
+          git push
+
+      - name: Draft release
+        run: gh release create v$VERSION --generate-notes --draft
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VERSION: ${{ inputs.next_version }}

.github/workflows/e2e-api-v2.yml

@@ -17,6 +17,7 @@ env:
   NEXTAUTH_URL: ${{ secrets.CI_NEXTAUTH_URL }}
   NODE_OPTIONS: --max-old-space-size=29000
   REDIS_URL: "redis://localhost:6379"
+  REPLEXICA_API_KEY: ${{ secrets.CI_REPLEXICA_API_KEY }}
   STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
   STRIPE_API_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
   STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}

.github/workflows/on-changes-requested.yml

@@ -0,0 +1,21 @@
+name: Changes Requested
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  changes-requested:
+    if: github.event.review.state == 'changes_requested'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Explanation
+        run: echo "This workflow triggers a workflow_run; it's necessary because otherwise the repo secrets aren't available for 'pull_request_review' events from externally forked pull requests"
+      - name: Save PR number to context.json
+        run: |
+            printf '{
+              "pr_number": ${{ github.event.pull_request.number }}
+            }' >> context.json
+      - uses: actions/upload-artifact@v3
+        with:
+          name: context.json
+          path: ./

.github/workflows/post-release.yml

@@ -0,0 +1,25 @@
+name: Post release
+on:
+  workflow_dispatch:
+  push:
+    # Pattern matched against refs/tags
+    tags:
+      - "*"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: 'main'
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+
+      - name: Configure git
+        run: |
+          git config --local user.email "github-actions@github.com"
+          git config --local user.name "GitHub Actions"
+
+      - run: git push origin +main:production

.github/workflows/re-draft.yml

@@ -0,0 +1,104 @@
+name: Re-draft
+on:
+  workflow_run:
+    workflows:
+      - Changes Requested
+    types:
+      - completed
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  statuses: write
+
+jobs:
+  download-context:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Download artifact'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "context.json"
+            })[0];
+            
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/context.zip`, Buffer.from(download.data));
+            
+      - name: 'Unzip artifact'
+        run: unzip context.zip
+
+      - name: 'Return Parsed JSON'
+        uses: actions/github-script@v7
+        id: return-parsed-json
+        with:
+          script: |
+            let fs = require('fs');
+            let data = fs.readFileSync('./context.json');
+            return JSON.parse(data);
+
+    outputs:
+      pr_number: ${{fromJSON(steps.return-parsed-json.outputs.result).pr_number}}
+
+  re-draft:
+    needs:
+      - download-context
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+      statuses: write
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "This PR was rejected"
+      - name: Convert PR to draft when changes are requested
+        uses: actions/github-script@v7
+        with:
+          script: |
+            async function getPullRequestId() {
+              const pull_number = ${{ needs.download-context.outputs.pr_number }}; 
+              const pullRequest = await github.rest.pulls.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number,
+              });
+              if (!pullRequest.data.node_id) throw new Error(`pullRequestId no found for '${pull_number}'`);
+              return pullRequest.data.node_id;
+            }
+            const query = `
+              mutation($id: ID!) {
+                convertPullRequestToDraft(input: { pullRequestId: $id }) {
+                  pullRequest {
+                    id
+                    number
+                    isDraft
+                  }
+                }
+              }
+            `;
+            const pullRequestId = await getPullRequestId();
+            const variables = {
+              id: pullRequestId,
+            }
+            const response = await github.graphql(query, variables)
+            if (!response.convertPullRequestToDraft) {
+              throw new Error("Failed to convert pull request to draft");
+            }
+            console.info("Pull request successfully converted to draft.");
+            console.info(`Draft conversion response: ${JSON.stringify(response, null, 2)}`);

.github/workflows/release.yml

@@ -1,17 +0,0 @@
-on:
-  workflow_dispatch:
-  push:
-    # Pattern matched against refs/tags
-    tags:
-      - "*" # Push events to every tag not containing /
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: main # Always checkout main even for tagged releases
-          fetch-depth: 0
-          token: ${{ secrets.GH_ACCESS_TOKEN }}
-      - run: git push origin +main:production

.github/workflows/unit-tests.yml

@@ -1,6 +1,8 @@
 name: Unit
 on:
   workflow_call:
+env:
+  REPLEXICA_API_KEY: ${{ secrets.CI_REPLEXICA_API_KEY }}
 permissions:
   contents: read
 jobs:

.yarn/versions/2e3d771e.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/354f3ba3.yml

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

.yarn/versions/8f86d7b6.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/94d54193.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/a33020ce.yml

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

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

.yarnrc.yml

@@ -5,5 +5,7 @@ plugins:
     spec: "@yarnpkg/plugin-interactive-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
+    spec: "@yarnpkg/plugin-version"
 
 yarnPath: .yarn/releases/yarn-3.4.1.cjs

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

@@ -6,6 +6,7 @@ import { IS_PRODUCTION } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";
 
 import { isAdminGuard } from "../utils/isAdmin";
+import { isLockedOrBlocked } from "../utils/isLockedOrBlocked";
 import { ScopeOfAdmin } from "../utils/scopeOfAdmin";
 
 // Used to check if the apiKey is not expired, could be extracted if reused. but not for now.
@@ -24,23 +25,35 @@ export const verifyApiKey: NextMiddleware = async (req, res, next) => {
   if (!hasValidLicense && IS_PRODUCTION) {
     return res.status(401).json({ error: "Invalid or missing CALCOM_LICENSE_KEY environment variable" });
   }
-  // Check if the apiKey query param is provided.
+
   if (!req.query.apiKey) return res.status(401).json({ message: "No apiKey provided" });
-  // remove the prefix from the user provided api_key. If no env set default to "cal_"
+
   const strippedApiKey = `${req.query.apiKey}`.replace(process.env.API_KEY_PREFIX || "cal_", "");
-  // Hash the key again before matching against the database records.
   const hashedKey = hashAPIKey(strippedApiKey);
-  // Check if the hashed api key exists in database.
-  const apiKey = await prisma.apiKey.findUnique({ where: { hashedKey } });
-  // If cannot find any api key. Throw a 401 Unauthorized.
-  if (!apiKey) return res.status(401).json({ error: "Your apiKey is not valid" });
+  const apiKey = await prisma.apiKey.findUnique({
+    where: { hashedKey },
+    include: {
+      user: {
+        select: { role: true, locked: true, email: true },
+      },
+    },
+  });
+  if (!apiKey) return res.status(401).json({ error: "Your API key is not valid." });
   if (apiKey.expiresAt && dateNotInPast(apiKey.expiresAt)) {
-    return res.status(401).json({ error: "This apiKey is expired" });
+    return res.status(401).json({ error: "This API key is expired." });
   }
-  if (!apiKey.userId) return res.status(404).json({ error: "No user found for this apiKey" });
+  if (!apiKey.userId || !apiKey.user)
+    return res.status(404).json({ error: "No user found for this API key." });
+
   // save the user id in the request for later use
   req.userId = apiKey.userId;
+  req.user = apiKey.user;
+
   const { isAdmin, scope } = await isAdminGuard(req);
+  const userIsLockedOrBlocked = await isLockedOrBlocked(req);
+
+  if (userIsLockedOrBlocked)
+    return res.status(403).json({ error: "You are not authorized to perform this request." });
 
   req.isSystemWideAdmin = isAdmin && scope === ScopeOfAdmin.SystemWide;
   req.isOrganizationOwnerOrAdmin = isAdmin && scope === ScopeOfAdmin.OrgOwnerOrAdmin;

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

@@ -6,8 +6,7 @@ import { UserPermissionRole, MembershipRole } from "@calcom/prisma/enums";
 import { ScopeOfAdmin } from "./scopeOfAdmin";
 
 export const isAdminGuard = async (req: NextApiRequest) => {
-  const { userId } = req;
-  const user = await prisma.user.findUnique({ where: { id: userId }, select: { role: true } });
+  const { user, userId } = req;
   if (!user) return { isAdmin: false, scope: null };
 
   const { role: userRole } = user;
@@ -34,7 +33,7 @@ export const isAdminGuard = async (req: NextApiRequest) => {
       },
     },
   });
-  if (!orgOwnerOrAdminMemberships.length) return { isAdmin: false, scope: null };
+  if (orgOwnerOrAdminMemberships.length > 0) return { isAdmin: true, scope: ScopeOfAdmin.OrgOwnerOrAdmin };
 
-  return { isAdmin: true, scope: ScopeOfAdmin.OrgOwnerOrAdmin };
+  return { isAdmin: false, scope: null };
 };

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

@@ -0,0 +1,9 @@
+import type { NextApiRequest } from "next";
+
+import { checkIfEmailInWatchlistController } 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));
+}

apps/api/v1/next.d.ts

@@ -8,6 +8,7 @@ export declare module "next" {
     session?: Session | null;
 
     userId: number;
+    user?: { role: string; locked: boolean; email: string } | null;
     method: string;
     // session: { user: { id: number } };
     // query: Partial<{ [key: string]: string | string[] }>;

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

@@ -1,17 +1,17 @@
-import prismaMock from "../../../../../../tests/libs/__mocks__/prismaMock";
+import prismock from "../../../../../../tests/libs/__mocks__/prisma";
 
 import type { Request, Response } from "express";
 import type { NextApiRequest, NextApiResponse } from "next";
 import { createMocks } from "node-mocks-http";
-import { describe, vi, it, expect, afterEach, beforeEach } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import LicenseKeyService from "@calcom/ee/common/server/LicenseKeyService";
 import prisma from "@calcom/prisma";
+import { MembershipRole, UserPermissionRole } from "@calcom/prisma/enums";
 
-import { isAdminGuard } from "~/lib/utils/isAdmin";
+import { hashAPIKey } from "~/../../../packages/features/ee/api-keys/lib/apiKeys";
 
 import { verifyApiKey } from "../../../lib/helpers/verifyApiKey";
-import { ScopeOfAdmin } from "../../../lib/utils/scopeOfAdmin";
 
 type CustomNextApiRequest = NextApiRequest & Request;
 type CustomNextApiResponse = NextApiResponse & Response;
@@ -20,11 +20,6 @@ afterEach(() => {
   vi.resetAllMocks();
 });
 
-vi.mock("@calcom/prisma");
-vi.mock("~/lib/utils/isAdmin", () => ({
-  isAdminGuard: vi.fn(),
-}));
-
 describe("Verify API key", () => {
   let service: LicenseKeyService;
 
@@ -45,7 +40,6 @@ describe("Verify API key", () => {
     };
 
     vi.mocked(service.checkLicense).mockResolvedValue(false);
-    vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: false, scope: null });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
 
@@ -69,7 +63,6 @@ describe("Verify API key", () => {
     };
 
     vi.mocked(service.checkLicense).mockResolvedValue(true);
-    vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: false, scope: null });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
 
@@ -91,10 +84,18 @@ describe("Verify API key", () => {
       },
       prisma,
     });
-
-    prismaMock.apiKey.findUnique.mockResolvedValue({
-      id: 1,
-      userId: 2,
+    const hashedKey = hashAPIKey("test_key");
+    await prismock.apiKey.create({
+      data: {
+        hashedKey,
+        user: {
+          create: {
+            email: "admin@example.com",
+            role: UserPermissionRole.ADMIN,
+            locked: false,
+          },
+        },
+      },
     });
 
     const middleware = {
@@ -102,7 +103,6 @@ describe("Verify API key", () => {
     };
 
     vi.mocked(service.checkLicense).mockResolvedValue(true);
-    vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: true, scope: ScopeOfAdmin.SystemWide });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
 
@@ -125,10 +125,36 @@ describe("Verify API key", () => {
       },
       prisma,
     });
-
-    prismaMock.apiKey.findUnique.mockResolvedValue({
-      id: 1,
-      userId: 2,
+    const hashedKey = hashAPIKey("test_key");
+    await prismock.apiKey.create({
+      data: {
+        hashedKey,
+        user: {
+          create: {
+            email: "org-admin@acme.com",
+            role: UserPermissionRole.USER,
+            locked: false,
+            teams: {
+              create: {
+                accepted: true,
+                role: MembershipRole.OWNER,
+                team: {
+                  create: {
+                    name: "ACME",
+                    isOrganization: true,
+                    organizationSettings: {
+                      create: {
+                        isAdminAPIEnabled: true,
+                        orgAutoAcceptEmail: "acme.com",
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
     });
 
     const middleware = {
@@ -136,7 +162,6 @@ describe("Verify API key", () => {
     };
 
     vi.mocked(service.checkLicense).mockResolvedValue(true);
-    vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: true, scope: ScopeOfAdmin.OrgOwnerOrAdmin });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
 
@@ -149,4 +174,44 @@ describe("Verify API key", () => {
     expect(req.isSystemWideAdmin).toBe(false);
     expect(req.isOrganizationOwnerOrAdmin).toBe(true);
   });
+
+  it("should return 403 if user is locked or blocked", async () => {
+    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "POST",
+      body: {},
+      query: {
+        apiKey: "cal_test_key",
+      },
+      prisma,
+    });
+    const hashedKey = hashAPIKey("test_key");
+    await prismock.apiKey.create({
+      data: {
+        hashedKey,
+        user: {
+          create: {
+            email: "locked@example.com",
+            role: UserPermissionRole.USER,
+            locked: true,
+          },
+        },
+      },
+    });
+
+    const middleware = {
+      fn: verifyApiKey,
+    };
+
+    vi.mocked(service.checkLicense).mockResolvedValue(true);
+
+    const serverNext = vi.fn((next: void) => Promise.resolve(next));
+    const middlewareSpy = vi.spyOn(middleware, "fn");
+
+    await middleware.fn(req, res, serverNext);
+
+    expect(middlewareSpy).toBeCalled();
+    expect(res.statusCode).toBe(403);
+    expect(JSON.parse(res._getData())).toEqual({ error: "You are not authorized to perform this request." });
+    expect(serverNext).not.toHaveBeenCalled();
+  });
 });

apps/api/v1/test/lib/utils/isAdmin.integration-test.ts

@@ -19,6 +19,7 @@ describe("isAdmin guard", () => {
     });
 
     req.userId = 0;
+    req.user = undefined;
 
     const { isAdmin, scope } = await isAdminGuard(req);
 
@@ -35,6 +36,7 @@ describe("isAdmin guard", () => {
     const memberUser = await prisma.user.findFirstOrThrow({ where: { email: "member2-acme@example.com" } });
 
     req.userId = memberUser.id;
+    req.user = memberUser;
 
     const { isAdmin, scope } = await isAdminGuard(req);
 
@@ -51,6 +53,7 @@ describe("isAdmin guard", () => {
     const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "admin@example.com" } });
 
     req.userId = adminUser.id;
+    req.user = adminUser;
 
     const { isAdmin, scope } = await isAdminGuard(req);
 
@@ -67,6 +70,8 @@ describe("isAdmin guard", () => {
     const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
 
     req.userId = adminUser.id;
+    req.user = adminUser;
+
     const { isAdmin, scope } = await isAdminGuard(req);
     expect(isAdmin).toBe(true);
     expect(scope).toBe(ScopeOfAdmin.OrgOwnerOrAdmin);
@@ -81,6 +86,8 @@ describe("isAdmin guard", () => {
     const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-dunder@example.com" } });
 
     req.userId = adminUser.id;
+    req.user = adminUser;
+
     const { isAdmin } = await isAdminGuard(req);
     expect(isAdmin).toBe(false);
   });

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

@@ -0,0 +1,88 @@
+import prismock from "../../../../../../tests/libs/__mocks__/prisma";
+
+import { describe, expect, it, beforeEach } from "vitest";
+
+import { isLockedOrBlocked } from "../../../lib/utils/isLockedOrBlocked";
+
+describe("isLockedOrBlocked", () => {
+  beforeEach(async () => {
+    await prismock.watchlist.createMany({
+      data: [
+        {
+          type: "DOMAIN",
+          value: "spam.com",
+          createdById: 1,
+        },
+        {
+          type: "DOMAIN",
+          value: "blocked.com",
+          createdById: 1,
+        },
+      ],
+    });
+  });
+
+  it("should return false if no user in request", async () => {
+    const req = { userId: null, user: null } as any;
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(false);
+  });
+
+  it("should return false if user has no email", async () => {
+    const req = { userId: 123, user: { email: null } } as any;
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(false);
+  });
+
+  it("should return true if user is locked", async () => {
+    const req = {
+      userId: 123,
+      user: {
+        locked: true,
+        email: "test@example.com",
+      },
+    } as any;
+
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(true);
+  });
+
+  it("should return true if user email domain is watchlisted", async () => {
+    const req = {
+      userId: 123,
+      user: {
+        locked: false,
+        email: "test@blocked.com",
+      },
+    } as any;
+
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(true);
+  });
+
+  it("should return false if user is not locked and email domain is not watchlisted", async () => {
+    const req = {
+      userId: 123,
+      user: {
+        locked: false,
+        email: "test@example.com",
+      },
+    } as any;
+
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(false);
+  });
+
+  it("should handle email domains case-insensitively", async () => {
+    const req = {
+      userId: 123,
+      user: {
+        locked: false,
+        email: "test@BLOCKED.COM",
+      },
+    } as any;
+
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(true);
+  });
+});

apps/api/v1/tsconfig.json

@@ -12,6 +12,7 @@
   },
   "include": [
     "next-env.d.ts",
+    "./next.d.ts",
     "**/*.ts",
     "**/*.tsx",
     "../../../packages/types/*.d.ts",

apps/api/v2/jest-e2e.json

@@ -10,7 +10,7 @@
   "transform": {
     "^.+\\.(t|j)s$": "ts-jest"
   },
-  "setupFiles": ["<rootDir>/test/setEnvVars.ts"],
+  "setupFiles": ["<rootDir>/test/setEnvVars.ts", "jest-date-mock"],
   "reporters": ["default", "jest-summarizing-reporter"],
   "workerIdleMemoryLimit": "512MB",
   "maxWorkers": 2

apps/api/v2/package.json

@@ -11,7 +11,7 @@
     "start": "nest start",
     "dev:build:watch": "yarn workspace @calcom/platform-constants build:watch & yarn workspace @calcom/platform-utils build:watch & yarn workspace @calcom/platform-types build:watch",
     "dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-enums build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build ",
-    "dev": "yarn dev:build && docker-compose up -d && yarn copy-swagger-module && yarn start --watch",
+    "dev": "yarn dev:build && ts-node scripts/docker-start.ts && yarn copy-swagger-module && yarn start --watch",
     "dev:no-docker": "yarn dev:build && yarn copy-swagger-module && yarn start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node ./dist/apps/api/v2/src/main.js",
@@ -29,7 +29,7 @@
     "@axiomhq/winston": "^1.2.0",
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.60",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.69",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
@@ -87,6 +87,7 @@
     "@types/passport-jwt": "^3.0.13",
     "@types/supertest": "^2.0.12",
     "jest": "^29.7.0",
+    "jest-date-mock": "^1.0.10",
     "prettier": "^2.8.6",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.3",

apps/api/v2/scripts/docker-start.ts

@@ -0,0 +1,35 @@
+import { execSync } from "child_process";
+
+function checkCommandExists(command: string): boolean {
+  try {
+    execSync(`${command} --version`, { stdio: "ignore" });
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+try {
+  // Check if docker is installed
+  if (!checkCommandExists("docker")) {
+    throw new Error("Docker is not installed");
+  }
+
+  // Try docker compose first (new syntax)
+  try {
+    execSync("docker compose version", { stdio: "ignore" });
+    console.log("Starting containers with docker compose...");
+    execSync("docker compose up -d", { stdio: "inherit" });
+  } catch (e) {
+    // Fall back to docker-compose if the above fails
+    if (checkCommandExists("docker-compose")) {
+      console.log("Starting containers with docker-compose...");
+      execSync("docker-compose up -d", { stdio: "inherit" });
+    } else {
+      throw new Error("Neither 'docker compose' nor 'docker-compose' command is available");
+    }
+  }
+} catch (error) {
+  console.error(`Error: ${error instanceof Error ? error.message : "Unknown error occurred"}`);
+  process.exit(1);
+}

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

@@ -333,7 +333,7 @@ export class BookingsController_2024_04_15 {
   }
 
   private async getOAuthClientsParams(clientId: string): Promise<OAuthRequestParams> {
-    const res = DEFAULT_PLATFORM_PARAMS;
+    const res = { ...DEFAULT_PLATFORM_PARAMS };
     try {
       const client = await this.oAuthClientRepository.getOAuthClient(clientId);
       // fetch oAuthClient from db and use data stored in db to set these values

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

@@ -1,160 +0,0 @@
-import { bootstrap } from "@/app";
-import { AppModule } from "@/app.module";
-import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
-import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
-import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
-import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
-import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
-import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { 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 { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture";
-import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
-import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
-import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
-import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
-import { withApiAuth } from "test/utils/withApiAuth";
-
-import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
-import { CreateBookingInput_2024_08_13, BookingOutput_2024_08_13 } from "@calcom/platform-types";
-import { Team } from "@calcom/prisma/client";
-
-describe("Bookings Endpoints 2024-08-13", () => {
-  describe("With api key", () => {
-    let app: INestApplication;
-    let organization: Team;
-
-    let userRepositoryFixture: UserRepositoryFixture;
-    let bookingsRepositoryFixture: BookingsRepositoryFixture;
-    let schedulesService: SchedulesService_2024_04_15;
-    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
-    let teamRepositoryFixture: TeamRepositoryFixture;
-    let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
-    let apiKeyString: string;
-
-    const userEmail = "bookings-controller-e2e@api.com";
-    let user: User;
-
-    let eventTypeId: number;
-
-    beforeAll(async () => {
-      const moduleRef = await withApiAuth(
-        userEmail,
-        Test.createTestingModule({
-          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
-        })
-      )
-        .overrideGuard(PermissionsGuard)
-        .useValue({
-          canActivate: () => true,
-        })
-        .compile();
-
-      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
-      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
-      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
-      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
-      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
-      apiKeysRepositoryFixture = new ApiKeysRepositoryFixture(moduleRef);
-
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
-
-      user = await userRepositoryFixture.create({
-        email: userEmail,
-      });
-
-      const { keyString } = await apiKeysRepositoryFixture.createApiKey(user.id, null);
-      apiKeyString = keyString;
-
-      const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
-        timeZone: "Europe/Rome",
-        isDefault: true,
-      };
-      await schedulesService.createUserSchedule(user.id, userSchedule);
-      const event = await eventTypesRepositoryFixture.create(
-        { title: "peer coding", slug: "peer-coding", length: 60 },
-        user.id
-      );
-      eventTypeId = event.id;
-
-      app = moduleRef.createNestApplication();
-      bootstrap(app as NestExpressApplication);
-
-      await app.init();
-    });
-
-    it("should be defined", () => {
-      expect(userRepositoryFixture).toBeDefined();
-      expect(user).toBeDefined();
-    });
-
-    describe("create bookings", () => {
-      it("should create a booking with api key", async () => {
-        const body: CreateBookingInput_2024_08_13 = {
-          start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
-          eventTypeId,
-          attendee: {
-            name: "Mr Key",
-            email: "mr_key@gmail.com",
-            timeZone: "Europe/Rome",
-            language: "it",
-          },
-          meetingUrl: "https://meet.google.com/abc-def-ghi",
-        };
-
-        return request(app.getHttpServer())
-          .post("/v2/bookings")
-          .send(body)
-          .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
-          .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[0].id).toEqual(user.id);
-              expect(data.status).toEqual("accepted");
-              expect(data.start).toEqual(body.start);
-              expect(data.end).toEqual(new Date(Date.UTC(2030, 0, 8, 14, 0, 0)).toISOString());
-              expect(data.duration).toEqual(60);
-              expect(data.eventTypeId).toEqual(eventTypeId);
-              expect(data.attendees[0]).toEqual({
-                name: body.attendee.name,
-                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"
-              );
-            }
-          });
-      });
-    });
-
-    function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
-      return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
-    }
-
-    afterAll(async () => {
-      await teamRepositoryFixture.delete(organization.id);
-      await userRepositoryFixture.deleteByEmail(user.email);
-      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
-      await app.close();
-    });
-  });
-});

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

@@ -191,7 +191,12 @@ export class BookingsController_2024_08_13 {
   @Post("/:bookingUid/cancel")
   @UseGuards(BookingUidGuard)
   @HttpCode(HttpStatus.OK)
-  @ApiOperation({ summary: "Cancel a booking" })
+  @ApiOperation({
+    summary: "Cancel a booking",
+    description: `:bookingUid can be :bookingUid of an usual booking, individual recurrence or recurring booking to cancel all recurrences.
+    For seated bookings to cancel one individual booking provide :bookingUid and :seatUid in the request body. For recurring seated bookings it is not possible to cancel all of them with 1 call
+    like with non-seated recurring bookings by providing recurring bookind uid - you have to cancel each recurrence booking by its bookingUid + seatUid.`,
+  })
   async cancelBooking(
     @Req() request: Request,
     @Param("bookingUid") bookingUid: string,

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

@@ -0,0 +1,291 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output";
+import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
+import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
+import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { 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 { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture";
+import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
+import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
+import {
+  AttendeeScheduledEmail,
+  OrganizerScheduledEmail,
+  AttendeeRescheduledEmail,
+  OrganizerRescheduledEmail,
+  AttendeeCancelledEmail,
+  OrganizerCancelledEmail,
+} from "@calcom/platform-libraries";
+import {
+  CreateBookingInput_2024_08_13,
+  BookingOutput_2024_08_13,
+  RescheduleBookingInput_2024_08_13,
+  CancelBookingInput_2024_08_13,
+} from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+jest.spyOn(AttendeeScheduledEmail.prototype as any, "getHtml").mockImplementation(async function () {
+  return "<html><body>Mocked Email Content</body></html>";
+});
+
+jest.spyOn(OrganizerScheduledEmail.prototype as any, "getHtml").mockImplementation(async function () {
+  return "<html><body>Mocked Email Content</body></html>";
+});
+
+jest
+  .spyOn(AttendeeRescheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerRescheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeCancelledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerCancelledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+
+describe("Bookings Endpoints 2024-08-13", () => {
+  describe("With api key", () => {
+    let app: INestApplication;
+    let organization: Team;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let bookingsRepositoryFixture: BookingsRepositoryFixture;
+    let schedulesService: SchedulesService_2024_04_15;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+    let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
+    let apiKeyString: string;
+
+    const userEmail = "bookings-controller-e2e@api.com";
+    let user: User;
+
+    let eventTypeId: number;
+
+    let createdBooking: BookingOutput_2024_08_13;
+    let rescheduledBooking: BookingOutput_2024_08_13;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+      apiKeysRepositoryFixture = new ApiKeysRepositoryFixture(moduleRef);
+
+      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+      });
+
+      const { keyString } = await apiKeysRepositoryFixture.createApiKey(user.id, null);
+      apiKeyString = keyString;
+
+      const userSchedule: CreateScheduleInput_2024_04_15 = {
+        name: "working time",
+        timeZone: "Europe/Rome",
+        isDefault: true,
+      };
+      await schedulesService.createUserSchedule(user.id, userSchedule);
+      const event = await eventTypesRepositoryFixture.create(
+        { title: "peer coding", slug: "peer-coding", length: 60 },
+        user.id
+      );
+      eventTypeId = event.id;
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+    });
+
+    it("should create a booking with api key", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+        eventTypeId,
+        attendee: {
+          name: "Mr Key",
+          email: "mr_key@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        meetingUrl: "https://meet.google.com/abc-def-ghi",
+      };
+
+      return request(app.getHttpServer())
+        .post("/v2/bookings")
+        .send(body)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .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[0].id).toEqual(user.id);
+            expect(data.status).toEqual("accepted");
+            expect(data.start).toEqual(body.start);
+            expect(data.end).toEqual(new Date(Date.UTC(2030, 0, 8, 14, 0, 0)).toISOString());
+            expect(data.duration).toEqual(60);
+            expect(data.eventTypeId).toEqual(eventTypeId);
+            expect(data.attendees[0]).toEqual({
+              name: body.attendee.name,
+              timeZone: body.attendee.timeZone,
+              language: body.attendee.language,
+              absent: false,
+            });
+            expect(data.meetingUrl).toEqual(body.meetingUrl);
+            expect(data.absentHost).toEqual(false);
+            expect(AttendeeScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            createdBooking = data;
+          } else {
+            throw new Error(
+              "Invalid response data - expected booking but received array of possibily recurring bookings"
+            );
+          }
+        });
+    });
+
+    it("should reschedule a booking with api key", async () => {
+      const body: RescheduleBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2035, 0, 8, 14, 0, 0)).toISOString(),
+        reschedulingReason: "Flying to mars that day",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${createdBooking.uid}/reschedule`)
+        .send(body)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(201)
+        .then(async (response) => {
+          const responseBody: RescheduleBookingOutput_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)) {
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            const data: BookingOutput_2024_08_13 = responseBody.data;
+            expect(data.reschedulingReason).toEqual(body.reschedulingReason);
+            expect(data.start).toEqual(body.start);
+            expect(data.end).toEqual(new Date(Date.UTC(2035, 0, 8, 15, 0, 0)).toISOString());
+            expect(data.rescheduledFromUid).toEqual(createdBooking.uid);
+            expect(data.id).toBeDefined();
+            expect(data.uid).toBeDefined();
+            expect(data.hosts[0].id).toEqual(user.id);
+            expect(data.status).toEqual(createdBooking.status);
+            expect(data.duration).toEqual(createdBooking.duration);
+            expect(data.eventTypeId).toEqual(createdBooking.eventTypeId);
+            expect(data.attendees[0]).toEqual(createdBooking.attendees[0]);
+            expect(data.location).toEqual(createdBooking.location);
+            expect(data.absentHost).toEqual(createdBooking.absentHost);
+            expect(data.metadata).toEqual(createdBooking.metadata);
+            expect(AttendeeRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            rescheduledBooking = data;
+          } else {
+            throw new Error(
+              "Invalid response data - expected booking but received array of possibily recurring bookings"
+            );
+          }
+        });
+    });
+
+    it("should cancel booking", async () => {
+      const body: CancelBookingInput_2024_08_13 = {
+        cancellationReason: "Going on a vacation",
+      };
+
+      const booking = await bookingsRepositoryFixture.getByUid(rescheduledBooking.uid);
+      expect(booking).toBeDefined();
+      expect(booking?.status).toEqual("ACCEPTED");
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${rescheduledBooking.uid}/cancel`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          const data: BookingOutput_2024_08_13 = responseBody.data;
+          expect(data.id).toBeDefined();
+          expect(data.uid).toBeDefined();
+          expect(data.hosts[0].id).toEqual(user.id);
+          expect(data.status).toEqual("cancelled");
+          expect(data.cancellationReason).toEqual(body.cancellationReason);
+          expect(data.start).toEqual(rescheduledBooking.start);
+          expect(data.end).toEqual(rescheduledBooking.end);
+          expect(data.duration).toEqual(rescheduledBooking.duration);
+          expect(data.eventTypeId).toEqual(rescheduledBooking.eventTypeId);
+          expect(data.attendees[0]).toEqual(rescheduledBooking.attendees[0]);
+          expect(data.location).toEqual(rescheduledBooking.location);
+          expect(data.absentHost).toEqual(rescheduledBooking.absentHost);
+
+          const cancelledBooking = await bookingsRepositoryFixture.getByUid(rescheduledBooking.uid);
+          expect(cancelledBooking).toBeDefined();
+          expect(cancelledBooking?.status).toEqual("CANCELLED");
+          expect(AttendeeCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+          expect(OrganizerCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+        });
+    });
+
+    function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
+      return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
+    }
+
+    afterAll(async () => {
+      await teamRepositoryFixture.delete(organization.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+      await app.close();
+    });
+  });
+});

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

@@ -0,0 +1,526 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
+import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+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 { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomNumber } from "test/utils/randomNumber";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
+import {
+  CreateBookingInput_2024_08_13,
+  GetBookingOutput_2024_08_13,
+  GetSeatedBookingOutput_2024_08_13,
+} from "@calcom/platform-types";
+import { BookingOutput_2024_08_13 } from "@calcom/platform-types";
+import { Booking, PlatformOAuthClient, Team, User } from "@calcom/prisma/client";
+
+const suffix = randomNumber();
+
+describe("Bookings Endpoints 2024-08-13", () => {
+  describe("Booking fields", () => {
+    let app: INestApplication;
+    let organization: Team;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let bookingsRepositoryFixture: BookingsRepositoryFixture;
+    let schedulesService: SchedulesService_2024_04_15;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+    let oAuthClient: PlatformOAuthClient;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+
+    const userEmail = `alice-${suffix}@api.com`;
+    let user: User;
+
+    let bookingWithSplitName: Booking;
+    const splitName = {
+      firstName: "Oldie",
+      lastName: "Goldie",
+    };
+
+    let seatedBookingWithSplitName: Booking;
+
+    let eventTypeWithBookingFieldsId: number;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+      organization = await teamRepositoryFixture.create({ name: `booking fields ${suffix}` });
+      oAuthClient = await createOAuthClient(organization.id);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
+      });
+
+      const userSchedule: CreateScheduleInput_2024_04_15 = {
+        name: "working time",
+        timeZone: "Europe/Rome",
+        isDefault: true,
+      };
+      await schedulesService.createUserSchedule(user.id, userSchedule);
+      const event = await eventTypesRepositoryFixture.create(
+        { title: "peer coding", slug: `normal-booking-${randomNumber()}`, length: 60 },
+        user.id
+      );
+
+      bookingWithSplitName = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2020, 0, 8, 12, 0, 0)),
+        endTime: new Date(Date.UTC(2020, 0, 8, 13, 0, 0)),
+        title: "peer coding lets goo",
+        uid: "booking",
+        eventType: {
+          connect: {
+            id: event.id,
+          },
+        },
+        location: "integrations:daily",
+        customInputs: {},
+        metadata: {},
+        responses: {
+          name: splitName,
+          email: "oldie@gmail.com",
+        },
+        attendees: {
+          create: {
+            email: "oldie@gmail.com",
+            name: "Oldie Goldie",
+            locale: "lv",
+            timeZone: "Europe/Rome",
+          },
+        },
+      });
+
+      const seatedEvent = await eventTypesRepositoryFixture.create(
+        { title: "peer coding", slug: `seated-${randomNumber()}`, length: 60, seatsPerTimeSlot: 3 },
+        user.id
+      );
+
+      seatedBookingWithSplitName = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2020, 0, 8, 14, 0, 0)),
+        endTime: new Date(Date.UTC(2020, 0, 8, 15, 0, 0)),
+        title: "peer coding lets goo",
+        uid: "seated-booking",
+        eventType: {
+          connect: {
+            id: seatedEvent.id,
+          },
+        },
+        location: "integrations:daily",
+        customInputs: {},
+        metadata: {},
+        responses: {
+          name: splitName,
+          email: "oldie@gmail.com",
+        },
+        attendees: {
+          create: {
+            email: "oldie@gmail.com",
+            name: "Oldie Goldie",
+            locale: "lv",
+            timeZone: "Europe/Rome",
+            bookingSeat: {
+              create: {
+                referenceUid: "unique-seat-uid",
+                data: {
+                  responses: {
+                    email: "oldie@gmail.com",
+                    name: {
+                      firstName: "Oldie",
+                      lastName: "Goldie",
+                    },
+                  },
+                },
+                metadata: {},
+                booking: {
+                  connect: {
+                    uid: "seated-booking",
+                  },
+                },
+              },
+            },
+          },
+        },
+      });
+
+      const eventTypeWithBookingFields = await eventTypesRepositoryFixture.create(
+        {
+          title: "peer coding with booking fields",
+          slug: `with-custom-booking-fields-${randomNumber()}`,
+          length: 60,
+          bookingFields: [
+            {
+              name: "name",
+              type: "name",
+              label: "",
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              variant: "fullName",
+              editable: "system",
+              required: true,
+              placeholder: "",
+              defaultLabel: "your_name",
+              variantsConfig: {
+                variants: {
+                  fullName: {
+                    fields: [
+                      {
+                        name: "fullName",
+                        type: "text",
+                        label: "your_name",
+                        required: true,
+                        placeholder: "",
+                      },
+                    ],
+                  },
+                  firstAndLastName: {
+                    fields: [
+                      {
+                        name: "firstName",
+                        type: "text",
+                        label: "name",
+                        required: true,
+                        placeholder: "lauris",
+                      },
+                      {
+                        name: "lastName",
+                        type: "text",
+                        label: "surname",
+                        required: true,
+                        placeholder: "skraucis",
+                      },
+                    ],
+                  },
+                },
+              },
+              disableOnPrefill: false,
+            },
+            {
+              name: "email",
+              type: "email",
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system",
+              required: true,
+              defaultLabel: "email_address",
+            },
+            {
+              name: "location",
+              type: "radioInput",
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system",
+              required: false,
+              defaultLabel: "location",
+              getOptionsAt: "locations",
+              optionsInputs: {
+                phone: {
+                  type: "phone",
+                  required: true,
+                  placeholder: "",
+                },
+                somewhereElse: {
+                  type: "text",
+                  required: true,
+                  placeholder: "",
+                },
+                attendeeInPerson: {
+                  type: "address",
+                  required: true,
+                  placeholder: "",
+                },
+              },
+              hideWhenJustOneOption: true,
+            },
+            {
+              name: "title",
+              type: "text",
+              hidden: true,
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system-but-optional",
+              required: true,
+              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",
+              hidden: false,
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system-but-optional",
+              required: false,
+              defaultLabel: "additional_guests",
+              defaultPlaceholder: "email",
+            },
+            {
+              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",
+            },
+            {
+              name: "favorite-movie",
+              type: "text",
+              label: "favorite movie",
+              sources: [
+                {
+                  id: "user",
+                  type: "user",
+                  label: "User",
+                  fieldRequired: true,
+                },
+              ],
+              editable: "user",
+              required: true,
+              placeholder: "matrix",
+              disableOnPrefill: false,
+            },
+          ],
+        },
+        user.id
+      );
+      eventTypeWithBookingFieldsId = eventTypeWithBookingFields.id;
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    async function createOAuthClient(organizationId: number) {
+      const data = {
+        logo: "logo-url",
+        name: "name",
+        redirectUris: ["http://localhost:5555"],
+        permissions: 32,
+      };
+      const secret = "secret";
+
+      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+      return client;
+    }
+
+    describe("get individual booking", () => {
+      it("should should get a seated booking with split name responses", async () => {
+        return request(app.getHttpServer())
+          .get(`/v2/bookings/${bookingWithSplitName.uid}`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: GetBookingOutput_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.attendees[0].name).toEqual(`${splitName.firstName} ${splitName.lastName}`);
+              expect(data.bookingFieldsResponses.name).toEqual(splitName);
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+
+      it("should should get a seated booking with split name responses", async () => {
+        return request(app.getHttpServer())
+          .get(`/v2/bookings/${seatedBookingWithSplitName.uid}`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: GetBookingOutput_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)) {
+              // eslint-disable-next-line
+              // @ts-ignore
+              const data: GetSeatedBookingOutput_2024_08_13 = responseBody.data;
+              console.log("asap data", JSON.stringify(data, null, 2));
+              expect(data.attendees[0].name).toEqual(`${splitName.firstName} ${splitName.lastName}`);
+              expect(data.attendees[0].bookingFieldsResponses.name).toEqual(splitName);
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+    });
+
+    describe("make booking", () => {
+      it("should not be able to book an event type with custom required booking fields if they are missing in bookingFieldsResponses", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+          eventTypeId: eventTypeWithBookingFieldsId,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "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(400);
+      });
+
+      it("should be able to book an event type with custom required booking fields", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+          eventTypeId: eventTypeWithBookingFieldsId,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+          bookingFieldsResponses: {
+            "favorite-movie": "lord of the rings",
+          },
+        };
+        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.bookingFieldsResponses["favorite-movie"]).toEqual("lord of the rings");
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+    });
+
+    afterAll(async () => {
+      await oauthClientRepositoryFixture.delete(oAuthClient.id);
+      await teamRepositoryFixture.delete(organization.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+      await app.close();
+    });
+  });
+
+  function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
+    return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
+  }
+});

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

@@ -1,6 +1,5 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
 import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
@@ -20,26 +19,9 @@ import { UserRepositoryFixture } from "test/fixtures/repository/users.repository
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
-import {
-  AttendeeScheduledEmail,
-  OrganizerScheduledEmail,
-  AttendeeDeclinedEmail,
-} from "@calcom/platform-libraries";
 import { BookingOutput_2024_08_13, GetBookingOutput_2024_08_13 } from "@calcom/platform-types";
 import { Booking, PlatformOAuthClient, Team } from "@calcom/prisma/client";
 
-jest.spyOn(AttendeeScheduledEmail.prototype as any, "getHtml").mockImplementation(async function () {
-  return "<html><body>Mocked Email Content</body></html>";
-});
-
-jest.spyOn(OrganizerScheduledEmail.prototype as any, "getHtml").mockImplementation(async function () {
-  return "<html><body>Mocked Email Content</body></html>";
-});
-
-jest.spyOn(AttendeeDeclinedEmail.prototype as any, "getHtml").mockImplementation(async function () {
-  return "<html><body>Mocked Email Content</body></html>";
-});
-
 describe("Bookings Endpoints 2024-08-13", () => {
   describe("Bookings confirmation", () => {
     let app: INestApplication;
@@ -87,6 +69,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       user = await userRepositoryFixture.create({
         email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {

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

@@ -0,0 +1,474 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output";
+import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
+import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
+import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.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 { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
+import {
+  OrganizerScheduledEmail,
+  AttendeeScheduledEmail,
+  OrganizerRescheduledEmail,
+  AttendeeRescheduledEmail,
+  OrganizerCancelledEmail,
+  AttendeeCancelledEmail,
+  AttendeeRequestEmail,
+  OrganizerRequestEmail,
+  AttendeeDeclinedEmail,
+} from "@calcom/platform-libraries";
+import {
+  CreateBookingInput_2024_08_13,
+  BookingOutput_2024_08_13,
+  RescheduleBookingInput_2024_08_13,
+  GetBookingOutput_2024_08_13,
+} from "@calcom/platform-types";
+import { CancelBookingInput_2024_08_13 } from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+jest
+  .spyOn(AttendeeScheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerScheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeRescheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerRescheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeCancelledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerCancelledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeRequestEmail.prototype, "getHtmlRequestEmail")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerRequestEmail.prototype, "getHtmlRequestEmail")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeDeclinedEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+
+type EmailSetup = {
+  user: User;
+  eventTypeId: number;
+  createdBookingUid: string;
+  rescheduledBookingUid: string;
+};
+
+describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
+  let app: INestApplication;
+  let organization: Team;
+
+  let userRepositoryFixture: UserRepositoryFixture;
+  let bookingsRepositoryFixture: BookingsRepositoryFixture;
+  let schedulesService: SchedulesService_2024_04_15;
+  let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+  let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+  let teamRepositoryFixture: TeamRepositoryFixture;
+
+  let emailsEnabledSetup: EmailSetup;
+  let emailsDisabledSetup: EmailSetup;
+
+  const authEmail = `admin-${Math.floor(Math.random() * 1000)}@example.com`;
+
+  beforeAll(async () => {
+    const moduleRef = await withApiAuth(
+      authEmail,
+      Test.createTestingModule({
+        imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+      })
+    )
+      .overrideGuard(PermissionsGuard)
+      .useValue({
+        canActivate: () => true,
+      })
+      .compile();
+
+    userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+    bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+    eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+    oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+    teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+    schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+    organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+
+    await setupEnabledEmails();
+    await setupDisabledEmails();
+
+    await userRepositoryFixture.create({
+      email: authEmail,
+      organization: {
+        connect: {
+          id: organization.id,
+        },
+      },
+      role: "ADMIN",
+    });
+
+    app = moduleRef.createNestApplication();
+    bootstrap(app as NestExpressApplication);
+
+    await app.init();
+  });
+
+  async function setupEnabledEmails() {
+    const oAuthClientEmailsEnabled = await createOAuthClient(organization.id, true);
+
+    const user = await userRepositoryFixture.create({
+      email: `alice-${Math.floor(Math.random() * 1000)}@gmail.com`,
+      platformOAuthClients: {
+        connect: {
+          id: oAuthClientEmailsEnabled.id,
+        },
+      },
+    });
+
+    const userSchedule: CreateScheduleInput_2024_04_15 = {
+      name: "working time",
+      timeZone: "Europe/Rome",
+      isDefault: true,
+    };
+    await schedulesService.createUserSchedule(user.id, userSchedule);
+
+    const event = await eventTypesRepositoryFixture.create(
+      { title: "peer coding", slug: "peer-coding", length: 60, requiresConfirmation: true },
+      user.id
+    );
+
+    emailsEnabledSetup = {
+      user,
+      eventTypeId: event.id,
+      createdBookingUid: "",
+      rescheduledBookingUid: "",
+    };
+  }
+
+  async function setupDisabledEmails() {
+    const oAuthClientEmailsDisabled = await createOAuthClient(organization.id, false);
+
+    const user = await userRepositoryFixture.create({
+      email: `bob-${Math.floor(Math.random() * 1000)}@gmail.com`,
+      platformOAuthClients: {
+        connect: {
+          id: oAuthClientEmailsDisabled.id,
+        },
+      },
+    });
+    const userSchedule: CreateScheduleInput_2024_04_15 = {
+      name: "working time",
+      timeZone: "Europe/Rome",
+      isDefault: true,
+    };
+    await schedulesService.createUserSchedule(user.id, userSchedule);
+    const event = await eventTypesRepositoryFixture.create(
+      { title: "peer coding", slug: "peer-coding", length: 60, requiresConfirmation: true },
+      user.id
+    );
+
+    emailsDisabledSetup = {
+      user,
+      eventTypeId: event.id,
+      createdBookingUid: "",
+      rescheduledBookingUid: "",
+    };
+  }
+
+  async function createOAuthClient(organizationId: number, emailsEnabled: boolean) {
+    const data = {
+      logo: "logo-url",
+      name: "name",
+      redirectUris: ["http://localhost:5555"],
+      permissions: 32,
+      areEmailsEnabled: emailsEnabled,
+    };
+    const secret = "secret";
+
+    const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+    return client;
+  }
+
+  describe("OAuth client managed user bookings - emails disabled", () => {
+    beforeEach(async () => {
+      jest.clearAllMocks();
+    });
+
+    it("should not send an email when creating a booking that requires confirmation", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+        eventTypeId: emailsDisabledSetup.eventTypeId,
+        attendee: {
+          name: "Mr Proper",
+          email: "mr_proper@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        bookingFieldsResponses: {
+          customField: "customValue",
+        },
+        metadata: {
+          userId: "100",
+        },
+      };
+
+      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);
+          if (responseDataIsBooking(responseBody.data)) {
+            expect(responseBody.data.status).toEqual("pending");
+            expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).not.toHaveBeenCalled();
+            expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).not.toHaveBeenCalled();
+            emailsDisabledSetup.createdBookingUid = responseBody.data.uid;
+          } else {
+            throw new Error(
+              "Invalid response data - expected booking but received array of possibily recurring bookings"
+            );
+          }
+        });
+    });
+
+    it("should not send an email when confirming a booking", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsDisabledSetup.createdBookingUid}/confirm`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: GetBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          emailsDisabledSetup.rescheduledBookingUid = responseBody.data.uid;
+        });
+    });
+
+    it("should not send an email when creating a booking that requires confirmation", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 10, 0, 0)).toISOString(),
+        eventTypeId: emailsDisabledSetup.eventTypeId,
+        attendee: {
+          name: "Mr Proper",
+          email: "mr_proper@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        bookingFieldsResponses: {
+          customField: "customValue",
+        },
+        metadata: {
+          userId: "100",
+        },
+      };
+
+      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);
+          if (responseDataIsBooking(responseBody.data)) {
+            expect(responseBody.data.status).toEqual("pending");
+            expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).not.toHaveBeenCalled();
+            expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).not.toHaveBeenCalled();
+            emailsDisabledSetup.createdBookingUid = responseBody.data.uid;
+          } else {
+            throw new Error(
+              "Invalid response data - expected booking but received array of possibily recurring bookings"
+            );
+          }
+        });
+    });
+
+    it("should not send an email when declining a booking", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsDisabledSetup.createdBookingUid}/decline`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: GetBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeDeclinedEmail.prototype.getHtml).not.toHaveBeenCalled();
+
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          emailsDisabledSetup.rescheduledBookingUid = responseBody.data.uid;
+        });
+    });
+  });
+
+  describe("OAuth client managed user bookings - emails enabled", () => {
+    beforeEach(async () => {
+      jest.clearAllMocks();
+    });
+
+    it("should send an email when creating a booking that requires confirmation", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+        eventTypeId: emailsEnabledSetup.eventTypeId,
+        attendee: {
+          name: "Mr Proper",
+          email: "mr_proper@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        bookingFieldsResponses: {
+          customField: "customValue",
+        },
+        metadata: {
+          userId: "100",
+        },
+      };
+
+      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);
+          if (responseDataIsBooking(responseBody.data)) {
+            expect(responseBody.data.status).toEqual("pending");
+            expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+            expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+            emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
+          } else {
+            throw new Error(
+              "Invalid response data - expected booking but received array of possibily recurring bookings"
+            );
+          }
+        });
+    });
+
+    it("should send an email when confirming a booking", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsEnabledSetup.createdBookingUid}/confirm`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: GetBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+          expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
+        });
+    });
+
+    it("should send an email when creating a booking that requires confirmation", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 10, 0, 0)).toISOString(),
+        eventTypeId: emailsEnabledSetup.eventTypeId,
+        attendee: {
+          name: "Mr Proper",
+          email: "mr_proper@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        bookingFieldsResponses: {
+          customField: "customValue",
+        },
+        metadata: {
+          userId: "100",
+        },
+      };
+
+      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);
+          if (responseDataIsBooking(responseBody.data)) {
+            expect(responseBody.data.status).toEqual("pending");
+            expect(AttendeeRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+            expect(OrganizerRequestEmail.prototype.getHtmlRequestEmail).toHaveBeenCalled();
+            emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
+          } else {
+            throw new Error(
+              "Invalid response data - expected booking but received array of possibily recurring bookings"
+            );
+          }
+        });
+    });
+
+    it("should send an email when declining a booking", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsEnabledSetup.createdBookingUid}/decline`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: GetBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeDeclinedEmail.prototype.getHtml).toHaveBeenCalled();
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
+        });
+    });
+  });
+
+  afterAll(async () => {
+    await teamRepositoryFixture.delete(organization.id);
+    await userRepositoryFixture.deleteByEmail(emailsEnabledSetup.user.email);
+    await userRepositoryFixture.deleteByEmail(emailsDisabledSetup.user.email);
+    await userRepositoryFixture.deleteByEmail(authEmail);
+    await bookingsRepositoryFixture.deleteAllBookings(
+      emailsEnabledSetup.user.id,
+      emailsEnabledSetup.user.email
+    );
+    await bookingsRepositoryFixture.deleteAllBookings(
+      emailsDisabledSetup.user.id,
+      emailsDisabledSetup.user.email
+    );
+    await app.close();
+  });
+
+  function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
+    return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
+  }
+});

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

@@ -0,0 +1,986 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output";
+import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
+import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
+import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { createParamDecorator, 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 { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.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 { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
+import {
+  OrganizerScheduledEmail,
+  AttendeeScheduledEmail,
+  OrganizerRescheduledEmail,
+  AttendeeRescheduledEmail,
+  OrganizerCancelledEmail,
+  AttendeeCancelledEmail,
+  OrganizerReassignedEmail,
+  AttendeeUpdatedEmail,
+} from "@calcom/platform-libraries";
+import {
+  CreateBookingInput_2024_08_13,
+  BookingOutput_2024_08_13,
+  RescheduleBookingInput_2024_08_13,
+} from "@calcom/platform-types";
+import { CancelBookingInput_2024_08_13 } from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+jest
+  .spyOn(AttendeeScheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerScheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeRescheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerRescheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeCancelledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerCancelledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerReassignedEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeUpdatedEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+
+type EmailSetup = {
+  team: Team;
+  member1: User;
+  member2: User;
+  collectiveEventType: {
+    id: number;
+    createdBookingUid: string;
+    rescheduledBookingUid: string;
+  };
+  roundRobinEventType: {
+    id: number;
+    createdBookingUid: string;
+    rescheduledBookingUid: string;
+    currentHostId: number;
+  };
+};
+
+describe("Bookings Endpoints 2024-08-13 team emails", () => {
+  let app: INestApplication;
+  let organization: Team;
+
+  let userRepositoryFixture: UserRepositoryFixture;
+  let bookingsRepositoryFixture: BookingsRepositoryFixture;
+  let schedulesService: SchedulesService_2024_04_15;
+  let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+  let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+  let teamRepositoryFixture: TeamRepositoryFixture;
+  let profileRepositoryFixture: ProfileRepositoryFixture;
+  let membershipsRepositoryFixture: MembershipRepositoryFixture;
+  let hostsRepositoryFixture: HostsRepositoryFixture;
+
+  let emailsEnabledSetup: EmailSetup;
+  let emailsDisabledSetup: EmailSetup;
+
+  const authEmail = "admin@example.com";
+
+  beforeAll(async () => {
+    const moduleRef = await withApiAuth(
+      authEmail,
+      Test.createTestingModule({
+        imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+      })
+    )
+      .overrideGuard(PermissionsGuard)
+      .useValue({
+        canActivate: () => true,
+      })
+      .compile();
+
+    userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+    bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+    eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+    oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+    teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+    profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+    membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+    hostsRepositoryFixture = new HostsRepositoryFixture(moduleRef);
+    schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+    organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+
+    await setupEnabledEmails();
+    await setupDisabledEmails();
+
+    await userRepositoryFixture.create({
+      email: authEmail,
+      organization: {
+        connect: {
+          id: organization.id,
+        },
+      },
+    });
+
+    app = moduleRef.createNestApplication();
+    bootstrap(app as NestExpressApplication);
+
+    await app.init();
+  });
+
+  async function setupEnabledEmails() {
+    const oAuthClientEmailsEnabled = await createOAuthClient(organization.id, true);
+
+    const team = await teamRepositoryFixture.create({
+      name: "team 1",
+      isOrganization: false,
+      parent: { connect: { id: organization.id } },
+      createdByOAuthClient: {
+        connect: {
+          id: oAuthClientEmailsEnabled.id,
+        },
+      },
+    });
+
+    const member1 = await userRepositoryFixture.create({
+      email: "alice@gmail.com",
+      platformOAuthClients: {
+        connect: {
+          id: oAuthClientEmailsEnabled.id,
+        },
+      },
+    });
+
+    const member2 = await userRepositoryFixture.create({
+      email: "bob@gmail.com",
+      platformOAuthClients: {
+        connect: {
+          id: oAuthClientEmailsEnabled.id,
+        },
+      },
+    });
+
+    const userSchedule: CreateScheduleInput_2024_04_15 = {
+      name: "working time",
+      timeZone: "Europe/Rome",
+      isDefault: true,
+    };
+    await schedulesService.createUserSchedule(member1.id, userSchedule);
+    await schedulesService.createUserSchedule(member2.id, userSchedule);
+
+    await profileRepositoryFixture.create({
+      uid: `usr-${member1.id}`,
+      username: member1.email,
+      organization: {
+        connect: {
+          id: organization.id,
+        },
+      },
+      user: {
+        connect: {
+          id: member1.id,
+        },
+      },
+    });
+
+    await profileRepositoryFixture.create({
+      uid: `usr-${member2.id}`,
+      username: member2.email,
+      organization: {
+        connect: {
+          id: organization.id,
+        },
+      },
+      user: {
+        connect: {
+          id: member2.id,
+        },
+      },
+    });
+
+    await membershipsRepositoryFixture.create({
+      role: "MEMBER",
+      user: { connect: { id: member1.id } },
+      team: { connect: { id: team.id } },
+      accepted: true,
+    });
+
+    await membershipsRepositoryFixture.create({
+      role: "MEMBER",
+      user: { connect: { id: member2.id } },
+      team: { connect: { id: team.id } },
+      accepted: true,
+    });
+
+    const collectiveEvent = await eventTypesRepositoryFixture.createTeamEventType({
+      schedulingType: "COLLECTIVE",
+      team: {
+        connect: { id: team.id },
+      },
+      title: "Collective Event Type",
+      slug: "collective-event-type",
+      length: 60,
+      assignAllTeamMembers: true,
+      bookingFields: [],
+      locations: [],
+    });
+
+    await hostsRepositoryFixture.create({
+      isFixed: true,
+      user: {
+        connect: {
+          id: member1.id,
+        },
+      },
+      eventType: {
+        connect: {
+          id: collectiveEvent.id,
+        },
+      },
+    });
+
+    await hostsRepositoryFixture.create({
+      isFixed: true,
+      user: {
+        connect: {
+          id: member2.id,
+        },
+      },
+      eventType: {
+        connect: {
+          id: collectiveEvent.id,
+        },
+      },
+    });
+
+    const roundRobinEvent = await eventTypesRepositoryFixture.createTeamEventType({
+      schedulingType: "ROUND_ROBIN",
+      team: {
+        connect: { id: team.id },
+      },
+      title: "Round Robin Event Type",
+      slug: "round-robin-event-type",
+      length: 60,
+      assignAllTeamMembers: false,
+      bookingFields: [],
+      locations: [],
+    });
+
+    await hostsRepositoryFixture.create({
+      isFixed: false,
+      user: {
+        connect: {
+          id: member1.id,
+        },
+      },
+      eventType: {
+        connect: {
+          id: roundRobinEvent.id,
+        },
+      },
+    });
+
+    await hostsRepositoryFixture.create({
+      isFixed: false,
+      user: {
+        connect: {
+          id: member2.id,
+        },
+      },
+      eventType: {
+        connect: {
+          id: roundRobinEvent.id,
+        },
+      },
+    });
+
+    emailsEnabledSetup = {
+      team,
+      member1: member1,
+      member2: member2,
+      collectiveEventType: {
+        id: collectiveEvent.id,
+        createdBookingUid: "",
+        rescheduledBookingUid: "",
+      },
+      roundRobinEventType: {
+        id: roundRobinEvent.id,
+        createdBookingUid: "",
+        rescheduledBookingUid: "",
+        currentHostId: 0,
+      },
+    };
+  }
+
+  async function setupDisabledEmails() {
+    const oAuthClientEmailsDisabled = await createOAuthClient(organization.id, false);
+
+    const team = await teamRepositoryFixture.create({
+      name: "team 2",
+      isOrganization: false,
+      parent: { connect: { id: organization.id } },
+      createdByOAuthClient: {
+        connect: {
+          id: oAuthClientEmailsDisabled.id,
+        },
+      },
+    });
+
+    const member1 = await userRepositoryFixture.create({
+      email: "charlie@gmail.com",
+      platformOAuthClients: {
+        connect: {
+          id: oAuthClientEmailsDisabled.id,
+        },
+      },
+    });
+
+    const member2 = await userRepositoryFixture.create({
+      email: "dean@gmail.com",
+      platformOAuthClients: {
+        connect: {
+          id: oAuthClientEmailsDisabled.id,
+        },
+      },
+    });
+
+    const userSchedule: CreateScheduleInput_2024_04_15 = {
+      name: "working time",
+      timeZone: "Europe/Rome",
+      isDefault: true,
+    };
+    await schedulesService.createUserSchedule(member1.id, userSchedule);
+    await schedulesService.createUserSchedule(member2.id, userSchedule);
+
+    await profileRepositoryFixture.create({
+      uid: `usr-${member1.id}`,
+      username: member1.email,
+      organization: {
+        connect: {
+          id: organization.id,
+        },
+      },
+      user: {
+        connect: {
+          id: member1.id,
+        },
+      },
+    });
+
+    await profileRepositoryFixture.create({
+      uid: `usr-${member2.id}`,
+      username: member2.email,
+      organization: {
+        connect: {
+          id: organization.id,
+        },
+      },
+      user: {
+        connect: {
+          id: member2.id,
+        },
+      },
+    });
+
+    await membershipsRepositoryFixture.create({
+      role: "MEMBER",
+      user: { connect: { id: member1.id } },
+      team: { connect: { id: team.id } },
+      accepted: true,
+    });
+
+    await membershipsRepositoryFixture.create({
+      role: "MEMBER",
+      user: { connect: { id: member2.id } },
+      team: { connect: { id: team.id } },
+      accepted: true,
+    });
+
+    const collectiveEvent = await eventTypesRepositoryFixture.createTeamEventType({
+      schedulingType: "COLLECTIVE",
+      team: {
+        connect: { id: team.id },
+      },
+      title: "Collective Event Type",
+      slug: "collective-event-type",
+      length: 60,
+      assignAllTeamMembers: true,
+      bookingFields: [],
+      locations: [],
+    });
+
+    await hostsRepositoryFixture.create({
+      isFixed: true,
+      user: {
+        connect: {
+          id: member1.id,
+        },
+      },
+      eventType: {
+        connect: {
+          id: collectiveEvent.id,
+        },
+      },
+    });
+
+    await hostsRepositoryFixture.create({
+      isFixed: true,
+      user: {
+        connect: {
+          id: member2.id,
+        },
+      },
+      eventType: {
+        connect: {
+          id: collectiveEvent.id,
+        },
+      },
+    });
+
+    const roundRobinEvent = await eventTypesRepositoryFixture.createTeamEventType({
+      schedulingType: "ROUND_ROBIN",
+      team: {
+        connect: { id: team.id },
+      },
+      title: "Round Robin Event Type",
+      slug: "round-robin-event-type",
+      length: 60,
+      assignAllTeamMembers: false,
+      bookingFields: [],
+      locations: [],
+    });
+
+    await hostsRepositoryFixture.create({
+      isFixed: false,
+      user: {
+        connect: {
+          id: member1.id,
+        },
+      },
+      eventType: {
+        connect: {
+          id: roundRobinEvent.id,
+        },
+      },
+    });
+
+    await hostsRepositoryFixture.create({
+      isFixed: false,
+      user: {
+        connect: {
+          id: member2.id,
+        },
+      },
+      eventType: {
+        connect: {
+          id: roundRobinEvent.id,
+        },
+      },
+    });
+
+    emailsDisabledSetup = {
+      team,
+      member1: member1,
+      member2: member2,
+      collectiveEventType: {
+        id: collectiveEvent.id,
+        createdBookingUid: "",
+        rescheduledBookingUid: "",
+      },
+      roundRobinEventType: {
+        id: roundRobinEvent.id,
+        createdBookingUid: "",
+        rescheduledBookingUid: "",
+        currentHostId: 0,
+      },
+    };
+  }
+
+  async function createOAuthClient(organizationId: number, emailsEnabled: boolean) {
+    const data = {
+      logo: "logo-url",
+      name: "name",
+      redirectUris: ["http://localhost:5555"],
+      permissions: 32,
+      areEmailsEnabled: emailsEnabled,
+    };
+    const secret = "secret";
+
+    const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+    return client;
+  }
+
+  beforeEach(async () => {
+    jest.clearAllMocks();
+  });
+
+  describe("OAuth client team bookings - emails disabled", () => {
+    describe("book", () => {
+      it("should not send an email when booking collective event", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 9, 0, 0)).toISOString(),
+          eventTypeId: emailsDisabledSetup.collectiveEventType.id,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+          bookingFieldsResponses: {
+            customField: "customValue",
+          },
+          metadata: {
+            userId: "100",
+          },
+        };
+
+        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);
+            if (responseDataIsBooking(responseBody.data)) {
+              expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+              expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+              emailsDisabledSetup.collectiveEventType.createdBookingUid = responseBody.data.uid;
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+
+      it("should not send an email when booking round robin event", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 10, 0, 0)).toISOString(),
+          eventTypeId: emailsDisabledSetup.roundRobinEventType.id,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+          bookingFieldsResponses: {
+            customField: "customValue",
+          },
+          metadata: {
+            userId: "100",
+          },
+        };
+
+        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);
+            if (responseDataIsBooking(responseBody.data)) {
+              expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+              expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+              emailsDisabledSetup.roundRobinEventType.createdBookingUid = responseBody.data.uid;
+              emailsDisabledSetup.roundRobinEventType.currentHostId = responseBody.data.hosts[0].id;
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+    });
+
+    describe("reschedule", () => {
+      it("should not send an email when rescheduling collective booking", async () => {
+        const body: RescheduleBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2035, 0, 8, 11, 0, 0)).toISOString(),
+          reschedulingReason: "Flying to mars that day",
+        };
+
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsDisabledSetup.collectiveEventType.createdBookingUid}/reschedule`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            emailsDisabledSetup.collectiveEventType.rescheduledBookingUid = responseBody.data.uid;
+          });
+      });
+
+      it("should not send an email when rescheduling round robin booking", async () => {
+        const body: RescheduleBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2035, 0, 8, 12, 0, 0)).toISOString(),
+          reschedulingReason: "Flying to mars that day",
+        };
+
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsDisabledSetup.roundRobinEventType.createdBookingUid}/reschedule`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            emailsDisabledSetup.roundRobinEventType.rescheduledBookingUid = responseBody.data.uid;
+            emailsDisabledSetup.roundRobinEventType.currentHostId = responseBody.data.hosts[0].id;
+          });
+      });
+    });
+
+    describe("reassign", () => {
+      it("should not send an email when manually reassigning round robin booking", async () => {
+        const reassignToId =
+          emailsDisabledSetup.roundRobinEventType.currentHostId === emailsDisabledSetup.member1.id
+            ? emailsDisabledSetup.member2.id
+            : emailsDisabledSetup.member1.id;
+
+        return request(app.getHttpServer())
+          .post(
+            `/v2/bookings/${emailsDisabledSetup.roundRobinEventType.rescheduledBookingUid}/reassign/${reassignToId}`
+          )
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeUpdatedEmail.prototype.getHtml).not.toHaveBeenCalled();
+            emailsDisabledSetup.roundRobinEventType.currentHostId = reassignToId;
+          });
+      });
+
+      it("should not send an email when automatically reassigning round robin booking", async () => {
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsDisabledSetup.roundRobinEventType.rescheduledBookingUid}/reassign`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerReassignedEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeUpdatedEmail.prototype.getHtml).not.toHaveBeenCalled();
+          });
+      });
+    });
+
+    describe("cancel", () => {
+      it("should not send an email when cancelling a collective booking", async () => {
+        const body: CancelBookingInput_2024_08_13 = {
+          cancellationReason: "Going on a vacation",
+        };
+
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsDisabledSetup.collectiveEventType.rescheduledBookingUid}/cancel`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          });
+      });
+    });
+
+    it("should not send an email when cancelling a round robin booking", async () => {
+      const body: CancelBookingInput_2024_08_13 = {
+        cancellationReason: "Going on a vacation",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsDisabledSetup.roundRobinEventType.rescheduledBookingUid}/cancel`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          expect(OrganizerCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+        });
+    });
+  });
+
+  describe("OAuth client team bookings - emails enabled", () => {
+    beforeEach(async () => {
+      jest.clearAllMocks();
+    });
+
+    describe("book", () => {
+      it("should send an email when booking collective event", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 9, 0, 0)).toISOString(),
+          eventTypeId: emailsEnabledSetup.collectiveEventType.id,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+          bookingFieldsResponses: {
+            customField: "customValue",
+          },
+          metadata: {
+            userId: "100",
+          },
+        };
+
+        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);
+            if (responseDataIsBooking(responseBody.data)) {
+              expect(AttendeeScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+              expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+              emailsEnabledSetup.collectiveEventType.createdBookingUid = responseBody.data.uid;
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+
+      it("should send an email when booking round robin event", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 10, 0, 0)).toISOString(),
+          eventTypeId: emailsEnabledSetup.roundRobinEventType.id,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+          bookingFieldsResponses: {
+            customField: "customValue",
+          },
+          metadata: {
+            userId: "100",
+          },
+        };
+
+        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);
+            if (responseDataIsBooking(responseBody.data)) {
+              expect(AttendeeScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+              expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+              emailsEnabledSetup.roundRobinEventType.createdBookingUid = responseBody.data.uid;
+              emailsEnabledSetup.roundRobinEventType.currentHostId = responseBody.data.hosts[0].id;
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+    });
+
+    describe("reschedule", () => {
+      it("should send an email when rescheduling collective booking", async () => {
+        const body: RescheduleBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2035, 0, 8, 11, 0, 0)).toISOString(),
+          reschedulingReason: "Flying to mars that day",
+        };
+
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsEnabledSetup.collectiveEventType.createdBookingUid}/reschedule`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            emailsEnabledSetup.collectiveEventType.rescheduledBookingUid = responseBody.data.uid;
+          });
+      });
+
+      it("should send an email when rescheduling round robin booking", async () => {
+        const body: RescheduleBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2035, 0, 8, 12, 0, 0)).toISOString(),
+          reschedulingReason: "Flying to mars that day",
+        };
+
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsEnabledSetup.roundRobinEventType.createdBookingUid}/reschedule`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+
+            expect(OrganizerRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+            emailsEnabledSetup.roundRobinEventType.rescheduledBookingUid = responseBody.data.uid;
+            emailsEnabledSetup.roundRobinEventType.currentHostId = responseBody.data.hosts[0].id;
+          });
+      });
+    });
+
+    describe("reassign", () => {
+      it("should send an email when manually reassigning round robin booking", async () => {
+        const reassignToId =
+          emailsEnabledSetup.roundRobinEventType.currentHostId === emailsEnabledSetup.member1.id
+            ? emailsEnabledSetup.member2.id
+            : emailsEnabledSetup.member1.id;
+
+        return request(app.getHttpServer())
+          .post(
+            `/v2/bookings/${emailsEnabledSetup.roundRobinEventType.rescheduledBookingUid}/reassign/${reassignToId}`
+          )
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(AttendeeUpdatedEmail.prototype.getHtml).toHaveBeenCalled();
+            emailsDisabledSetup.roundRobinEventType.currentHostId = reassignToId;
+          });
+      });
+
+      it("should send an email when automatically reassigning round robin booking", async () => {
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsEnabledSetup.roundRobinEventType.rescheduledBookingUid}/reassign`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerReassignedEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(AttendeeUpdatedEmail.prototype.getHtml).toHaveBeenCalled();
+          });
+      });
+    });
+
+    describe("cancel", () => {
+      it("should send an email when cancelling a collective booking", async () => {
+        const body: CancelBookingInput_2024_08_13 = {
+          cancellationReason: "Going on a vacation",
+        };
+
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsEnabledSetup.collectiveEventType.rescheduledBookingUid}/cancel`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+          });
+      });
+
+      it("should send an email when cancelling round robin booking", async () => {
+        const body: CancelBookingInput_2024_08_13 = {
+          cancellationReason: "Going on a vacation",
+        };
+
+        return request(app.getHttpServer())
+          .post(`/v2/bookings/${emailsEnabledSetup.roundRobinEventType.rescheduledBookingUid}/cancel`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(AttendeeCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+          });
+      });
+    });
+  });
+  afterAll(async () => {
+    await teamRepositoryFixture.delete(organization.id);
+    await userRepositoryFixture.deleteByEmail(emailsEnabledSetup.member1.email);
+    await userRepositoryFixture.deleteByEmail(emailsDisabledSetup.member1.email);
+    await bookingsRepositoryFixture.deleteAllBookings(
+      emailsEnabledSetup.member1.id,
+      emailsEnabledSetup.member1.email
+    );
+    await bookingsRepositoryFixture.deleteAllBookings(
+      emailsDisabledSetup.member1.id,
+      emailsDisabledSetup.member1.email
+    );
+    await app.close();
+  });
+
+  function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
+    return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
+  }
+});

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

@@ -0,0 +1,482 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output";
+import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
+import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
+import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.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 { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+
+import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
+import {
+  OrganizerScheduledEmail,
+  AttendeeScheduledEmail,
+  OrganizerRescheduledEmail,
+  AttendeeRescheduledEmail,
+  OrganizerCancelledEmail,
+  AttendeeCancelledEmail,
+} from "@calcom/platform-libraries";
+import {
+  CreateBookingInput_2024_08_13,
+  BookingOutput_2024_08_13,
+  RescheduleBookingInput_2024_08_13,
+  RecurringBookingOutput_2024_08_13,
+} from "@calcom/platform-types";
+import { CancelBookingInput_2024_08_13 } from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+jest
+  .spyOn(AttendeeScheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerScheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeRescheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerRescheduledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeCancelledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(OrganizerCancelledEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
+
+type EmailSetup = {
+  user: User;
+  eventTypeId: number;
+  recurringEventTypeId: number;
+  createdBookingUid: string;
+  rescheduledBookingUid: string;
+};
+
+describe("Bookings Endpoints 2024-08-13 user emails", () => {
+  let app: INestApplication;
+  let organization: Team;
+
+  let userRepositoryFixture: UserRepositoryFixture;
+  let bookingsRepositoryFixture: BookingsRepositoryFixture;
+  let schedulesService: SchedulesService_2024_04_15;
+  let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+  let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+  let teamRepositoryFixture: TeamRepositoryFixture;
+
+  let emailsEnabledSetup: EmailSetup;
+  let emailsDisabledSetup: EmailSetup;
+
+  beforeAll(async () => {
+    const moduleRef = await Test.createTestingModule({
+      imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+    })
+      .overrideGuard(PermissionsGuard)
+      .useValue({
+        canActivate: () => true,
+      })
+      .overrideGuard(ApiAuthGuard)
+      .useValue({
+        canActivate: () => true,
+      })
+      .compile();
+
+    userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+    bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+    eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+    oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+    teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+    schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+    organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+
+    await setupEnabledEmails();
+    await setupDisabledEmails();
+
+    app = moduleRef.createNestApplication();
+    bootstrap(app as NestExpressApplication);
+
+    await app.init();
+  });
+
+  async function setupEnabledEmails() {
+    const oAuthClientEmailsEnabled = await createOAuthClient(organization.id, true);
+
+    const user = await userRepositoryFixture.create({
+      email: `alice-${Math.floor(Math.random() * 1000)}@gmail.com`,
+      platformOAuthClients: {
+        connect: {
+          id: oAuthClientEmailsEnabled.id,
+        },
+      },
+    });
+
+    const userSchedule: CreateScheduleInput_2024_04_15 = {
+      name: "working time",
+      timeZone: "Europe/Rome",
+      isDefault: true,
+    };
+    await schedulesService.createUserSchedule(user.id, userSchedule);
+
+    const event = await eventTypesRepositoryFixture.create(
+      { title: "peer coding", slug: "peer-coding", length: 60 },
+      user.id
+    );
+
+    const recurringEvent = await eventTypesRepositoryFixture.create(
+      // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
+      {
+        title: "peer coding recurring",
+        slug: "peer-coding-recurring",
+        length: 60,
+        recurringEvent: { freq: 2, count: 3, interval: 1 },
+      },
+      user.id
+    );
+
+    emailsEnabledSetup = {
+      user,
+      eventTypeId: event.id,
+      recurringEventTypeId: recurringEvent.id,
+      createdBookingUid: "",
+      rescheduledBookingUid: "",
+    };
+  }
+
+  async function setupDisabledEmails() {
+    const oAuthClientEmailsDisabled = await createOAuthClient(organization.id, false);
+
+    const user = await userRepositoryFixture.create({
+      email: `bob-${Math.floor(Math.random() * 1000)}@gmail.com`,
+      platformOAuthClients: {
+        connect: {
+          id: oAuthClientEmailsDisabled.id,
+        },
+      },
+    });
+    const userSchedule: CreateScheduleInput_2024_04_15 = {
+      name: "working time",
+      timeZone: "Europe/Rome",
+      isDefault: true,
+    };
+    await schedulesService.createUserSchedule(user.id, userSchedule);
+    const event = await eventTypesRepositoryFixture.create(
+      { title: "peer coding", slug: "peer-coding", length: 60 },
+      user.id
+    );
+
+    const recurringEvent = await eventTypesRepositoryFixture.create(
+      // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
+      {
+        title: "peer coding recurring",
+        slug: "peer-coding-recurring",
+        length: 60,
+        recurringEvent: { freq: 2, count: 3, interval: 1 },
+      },
+      user.id
+    );
+
+    emailsDisabledSetup = {
+      user,
+      eventTypeId: event.id,
+      recurringEventTypeId: recurringEvent.id,
+      createdBookingUid: "",
+      rescheduledBookingUid: "",
+    };
+  }
+
+  async function createOAuthClient(organizationId: number, emailsEnabled: boolean) {
+    const data = {
+      logo: "logo-url",
+      name: "name",
+      redirectUris: ["http://localhost:5555"],
+      permissions: 32,
+      areEmailsEnabled: emailsEnabled,
+    };
+    const secret = "secret";
+
+    const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+    return client;
+  }
+
+  beforeEach(async () => {
+    jest.clearAllMocks();
+  });
+
+  describe("OAuth client managed user bookings - emails disabled", () => {
+    it("should not send an email when creating a booking", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+        eventTypeId: emailsDisabledSetup.eventTypeId,
+        attendee: {
+          name: "Mr Proper",
+          email: "mr_proper@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        bookingFieldsResponses: {
+          customField: "customValue",
+        },
+        metadata: {
+          userId: "100",
+        },
+      };
+
+      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);
+          if (responseDataIsBooking(responseBody.data)) {
+            expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            emailsDisabledSetup.createdBookingUid = responseBody.data.uid;
+          } else {
+            throw new Error(
+              "Invalid response data - expected booking but received array of possibily recurring bookings"
+            );
+          }
+        });
+    });
+
+    it("should not send an email when creating a recurring booking", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 9, 0, 0)).toISOString(),
+        eventTypeId: emailsDisabledSetup.recurringEventTypeId,
+        attendee: {
+          name: "Mr Proper",
+          email: "mr_proper@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        bookingFieldsResponses: {
+          customField: "customValue",
+        },
+        metadata: {
+          userId: "100",
+        },
+      };
+
+      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);
+          if (responseDataIsRecurringBooking(responseBody.data)) {
+            expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          } else {
+            throw new Error("Invalid response data - expected booking array but received single booking");
+          }
+        });
+    });
+
+    it("should not send an email when rescheduling a booking", async () => {
+      const body: RescheduleBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2035, 0, 8, 14, 0, 0)).toISOString(),
+        reschedulingReason: "Flying to mars that day",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsDisabledSetup.createdBookingUid}/reschedule`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(201)
+        .then(async (response) => {
+          const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          expect(AttendeeRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          expect(OrganizerRescheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          emailsDisabledSetup.rescheduledBookingUid = responseBody.data.uid;
+        });
+    });
+
+    it("should not send an email when cancelling a booking", async () => {
+      const body: CancelBookingInput_2024_08_13 = {
+        cancellationReason: "Going on a vacation",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsDisabledSetup.rescheduledBookingUid}/cancel`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          expect(OrganizerCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
+        });
+    });
+  });
+
+  describe("OAuth client managed user bookings - emails enabled", () => {
+    it("should send an email when creating a booking", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+        eventTypeId: emailsEnabledSetup.eventTypeId,
+        attendee: {
+          name: "Mr Proper",
+          email: "mr_proper@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        bookingFieldsResponses: {
+          customField: "customValue",
+        },
+        metadata: {
+          userId: "100",
+        },
+      };
+
+      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);
+          if (responseDataIsBooking(responseBody.data)) {
+            const data: BookingOutput_2024_08_13 = responseBody.data;
+            expect(AttendeeScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
+          } else {
+            throw new Error(
+              "Invalid response data - expected booking but received array of possibily recurring bookings"
+            );
+          }
+        });
+    });
+
+    it("should send an email when creating a recurring booking", async () => {
+      const body: CreateBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 0, 8, 9, 0, 0)).toISOString(),
+        eventTypeId: emailsEnabledSetup.recurringEventTypeId,
+        attendee: {
+          name: "Mr Proper",
+          email: "mr_proper@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        bookingFieldsResponses: {
+          customField: "customValue",
+        },
+        metadata: {
+          userId: "100",
+        },
+      };
+
+      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);
+          if (responseDataIsRecurringBooking(responseBody.data)) {
+            expect(AttendeeScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+          } else {
+            throw new Error("Invalid response data - expected booking array but received single booking");
+          }
+        });
+    });
+
+    it("should send an email when rescheduling a booking", async () => {
+      const body: RescheduleBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2035, 0, 8, 14, 0, 0)).toISOString(),
+        reschedulingReason: "Flying to mars that day",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsEnabledSetup.createdBookingUid}/reschedule`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(201)
+        .then(async (response) => {
+          const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+          expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+
+          expect(AttendeeRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+          expect(OrganizerRescheduledEmail.prototype.getHtml).toHaveBeenCalled();
+
+          emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
+        });
+    });
+
+    it("should send an email when cancelling a booking", async () => {
+      const body: CancelBookingInput_2024_08_13 = {
+        cancellationReason: "Going on a vacation",
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${emailsEnabledSetup.rescheduledBookingUid}/cancel`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: CancelBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(AttendeeCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+          expect(OrganizerCancelledEmail.prototype.getHtml).toHaveBeenCalled();
+        });
+    });
+  });
+
+  afterAll(async () => {
+    await teamRepositoryFixture.delete(organization.id);
+    await userRepositoryFixture.deleteByEmail(emailsEnabledSetup.user.email);
+    await userRepositoryFixture.deleteByEmail(emailsDisabledSetup.user.email);
+    await bookingsRepositoryFixture.deleteAllBookings(
+      emailsEnabledSetup.user.id,
+      emailsEnabledSetup.user.email
+    );
+    await bookingsRepositoryFixture.deleteAllBookings(
+      emailsDisabledSetup.user.id,
+      emailsDisabledSetup.user.email
+    );
+    await app.close();
+  });
+
+  function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
+    return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
+  }
+
+  function responseDataIsRecurringBooking(data: any): data is RecurringBookingOutput_2024_08_13[] {
+    return Array.isArray(data);
+  }
+});

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

@@ -1,6 +1,5 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
 import { ReassignBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reassign-booking.output";
 import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
@@ -25,13 +24,7 @@ import { UserRepositoryFixture } from "test/fixtures/repository/users.repository
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
-import {
-  CreateBookingInput_2024_08_13,
-  BookingOutput_2024_08_13,
-  RecurringBookingOutput_2024_08_13,
-  GetBookingsOutput_2024_08_13,
-  GetSeatedBookingOutput_2024_08_13,
-} from "@calcom/platform-types";
+import { CreateBookingInput_2024_08_13, BookingOutput_2024_08_13 } from "@calcom/platform-types";
 import { PlatformOAuthClient, Team } from "@calcom/prisma/client";
 
 describe("Bookings Endpoints 2024-08-13", () => {
@@ -86,14 +79,19 @@ describe("Bookings Endpoints 2024-08-13", () => {
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
       organization = await organizationsRepositoryFixture.create({ name: "organization team bookings" });
+      oAuthClient = await createOAuthClient(organization.id);
+
       team = await teamRepositoryFixture.create({
         name: "team 1",
         isOrganization: false,
         parent: { connect: { id: organization.id } },
+        createdByOAuthClient: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
-      oAuthClient = await createOAuthClient(organization.id);
-
       teamUser1 = await userRepositoryFixture.create({
         email: teamUserEmail,
         locale: "it",

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

@@ -0,0 +1,706 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
+import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { 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 { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
+import { AttendeeCancelledEmail, OrganizerCancelledEmail } from "@calcom/platform-libraries";
+import {
+  CreateRecurringBookingInput_2024_08_13,
+  RecurringBookingOutput_2024_08_13,
+} from "@calcom/platform-types";
+import { CancelBookingInput_2024_08_13 } from "@calcom/platform-types";
+import { PlatformOAuthClient, Team } from "@calcom/prisma/client";
+
+describe("Bookings Endpoints 2024-08-13", () => {
+  describe("Creating recurring bookings", () => {
+    let app: INestApplication;
+    let organization: Team;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let bookingsRepositoryFixture: BookingsRepositoryFixture;
+    let schedulesService: SchedulesService_2024_04_15;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+    let oAuthClient: PlatformOAuthClient;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+
+    const userEmail = "bookings-controller-e2e@api.com";
+    let user: User;
+
+    const maxRecurrenceCount = 3;
+    let recurringEventTypeId: number;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      oAuthClient = await createOAuthClient(organization.id);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
+      });
+
+      const userSchedule: CreateScheduleInput_2024_04_15 = {
+        name: "working time",
+        timeZone: "Europe/Rome",
+        isDefault: true,
+      };
+      await schedulesService.createUserSchedule(user.id, userSchedule);
+
+      const recurringEvent = await eventTypesRepositoryFixture.create(
+        // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
+        {
+          title: "peer coding recurring",
+          slug: "peer-coding-recurring",
+          length: 60,
+          recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
+        },
+        user.id
+      );
+      recurringEventTypeId = recurringEvent.id;
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    async function createOAuthClient(organizationId: number) {
+      const data = {
+        logo: "logo-url",
+        name: "name",
+        redirectUris: ["http://localhost:5555"],
+        permissions: 32,
+      };
+      const secret = "secret";
+
+      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+      return client;
+    }
+
+    it("should not create recurring booking with recurrenceCount larger than event type recurrence count", async () => {
+      const recurrenceCount = 1000;
+
+      const body: CreateRecurringBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString(),
+        eventTypeId: recurringEventTypeId,
+        attendee: {
+          name: "Mr Proper Recurring",
+          email: "mr_proper_recurring@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        recurrenceCount,
+      };
+
+      return request(app.getHttpServer())
+        .post("/v2/bookings")
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(400);
+    });
+
+    it("should create a recurring booking with recurrenceCount smaller than event type recurrence count", async () => {
+      const recurrenceCount = maxRecurrenceCount - 1;
+      const body: CreateRecurringBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString(),
+        eventTypeId: recurringEventTypeId,
+        attendee: {
+          name: "Mr Proper Recurring",
+          email: "mr_proper_recurring@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        recurrenceCount,
+      };
+
+      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(responseDataIsRecurringBooking(responseBody.data)).toBe(true);
+
+          if (responseDataIsRecurringBooking(responseBody.data)) {
+            const data: RecurringBookingOutput_2024_08_13[] = responseBody.data;
+            expect(data.length).toEqual(maxRecurrenceCount - 1);
+
+            const firstBooking = data[0];
+            expect(firstBooking.id).toBeDefined();
+            expect(firstBooking.uid).toBeDefined();
+            expect(firstBooking.hosts[0].id).toEqual(user.id);
+            expect(firstBooking.status).toEqual("accepted");
+            expect(firstBooking.start).toEqual(new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString());
+            expect(firstBooking.end).toEqual(new Date(Date.UTC(2030, 1, 4, 14, 0, 0)).toISOString());
+            expect(firstBooking.duration).toEqual(60);
+            expect(firstBooking.eventTypeId).toEqual(recurringEventTypeId);
+            expect(firstBooking.attendees[0]).toEqual({
+              name: body.attendee.name,
+              timeZone: body.attendee.timeZone,
+              language: body.attendee.language,
+              absent: false,
+            });
+            expect(firstBooking.location).toEqual(body.location);
+            expect(firstBooking.recurringBookingUid).toBeDefined();
+            expect(firstBooking.absentHost).toEqual(false);
+
+            const secondBooking = data[1];
+            expect(secondBooking.id).toBeDefined();
+            expect(secondBooking.uid).toBeDefined();
+            expect(secondBooking.hosts[0].id).toEqual(user.id);
+            expect(secondBooking.status).toEqual("accepted");
+            expect(secondBooking.start).toEqual(new Date(Date.UTC(2030, 1, 11, 13, 0, 0)).toISOString());
+            expect(secondBooking.end).toEqual(new Date(Date.UTC(2030, 1, 11, 14, 0, 0)).toISOString());
+            expect(secondBooking.duration).toEqual(60);
+            expect(secondBooking.eventTypeId).toEqual(recurringEventTypeId);
+            expect(secondBooking.recurringBookingUid).toBeDefined();
+            expect(secondBooking.attendees[0]).toEqual({
+              name: body.attendee.name,
+              timeZone: body.attendee.timeZone,
+              language: body.attendee.language,
+              absent: false,
+            });
+            expect(secondBooking.location).toEqual(body.location);
+            expect(secondBooking.absentHost).toEqual(false);
+          } else {
+            throw new Error(
+              "Invalid response data - expected recurring booking but received non array response"
+            );
+          }
+        });
+    });
+
+    it("should create a recurring booking with recurrenceCount equal to event type recurrence count", async () => {
+      const recurrenceCount = maxRecurrenceCount;
+      const body: CreateRecurringBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString(),
+        eventTypeId: recurringEventTypeId,
+        attendee: {
+          name: "Mr Proper Recurring",
+          email: "mr_proper_recurring@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "https://meet.google.com/abc-def-ghi",
+        recurrenceCount,
+      };
+
+      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(responseDataIsRecurringBooking(responseBody.data)).toBe(true);
+
+          if (responseDataIsRecurringBooking(responseBody.data)) {
+            const data: RecurringBookingOutput_2024_08_13[] = responseBody.data;
+            expect(data.length).toEqual(maxRecurrenceCount);
+
+            const firstBooking = data[0];
+            expect(firstBooking.id).toBeDefined();
+            expect(firstBooking.uid).toBeDefined();
+            expect(firstBooking.hosts[0].id).toEqual(user.id);
+            expect(firstBooking.status).toEqual("accepted");
+            expect(firstBooking.start).toEqual(new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString());
+            expect(firstBooking.end).toEqual(new Date(Date.UTC(2030, 1, 4, 14, 0, 0)).toISOString());
+            expect(firstBooking.duration).toEqual(60);
+            expect(firstBooking.eventTypeId).toEqual(recurringEventTypeId);
+            expect(firstBooking.attendees[0]).toEqual({
+              name: body.attendee.name,
+              timeZone: body.attendee.timeZone,
+              language: body.attendee.language,
+              absent: false,
+            });
+            expect(firstBooking.location).toEqual(body.location);
+            expect(firstBooking.meetingUrl).toEqual(body.location);
+            expect(firstBooking.recurringBookingUid).toBeDefined();
+            expect(firstBooking.absentHost).toEqual(false);
+
+            const secondBooking = data[1];
+            expect(secondBooking.id).toBeDefined();
+            expect(secondBooking.uid).toBeDefined();
+            expect(secondBooking.hosts[0].id).toEqual(user.id);
+            expect(secondBooking.status).toEqual("accepted");
+            expect(secondBooking.start).toEqual(new Date(Date.UTC(2030, 1, 11, 13, 0, 0)).toISOString());
+            expect(secondBooking.end).toEqual(new Date(Date.UTC(2030, 1, 11, 14, 0, 0)).toISOString());
+            expect(secondBooking.duration).toEqual(60);
+            expect(secondBooking.eventTypeId).toEqual(recurringEventTypeId);
+            expect(secondBooking.recurringBookingUid).toBeDefined();
+            expect(secondBooking.attendees[0]).toEqual({
+              name: body.attendee.name,
+              timeZone: body.attendee.timeZone,
+              language: body.attendee.language,
+              absent: false,
+            });
+            expect(secondBooking.location).toEqual(body.location);
+            expect(secondBooking.absentHost).toEqual(false);
+
+            const thirdBooking = data[2];
+            expect(thirdBooking.id).toBeDefined();
+            expect(thirdBooking.uid).toBeDefined();
+            expect(thirdBooking.hosts[0].id).toEqual(user.id);
+            expect(thirdBooking.status).toEqual("accepted");
+            expect(thirdBooking.start).toEqual(new Date(Date.UTC(2030, 1, 18, 13, 0, 0)).toISOString());
+            expect(thirdBooking.end).toEqual(new Date(Date.UTC(2030, 1, 18, 14, 0, 0)).toISOString());
+            expect(thirdBooking.duration).toEqual(60);
+            expect(thirdBooking.eventTypeId).toEqual(recurringEventTypeId);
+            expect(thirdBooking.recurringBookingUid).toBeDefined();
+            expect(thirdBooking.attendees[0]).toEqual({
+              name: body.attendee.name,
+              timeZone: body.attendee.timeZone,
+              language: body.attendee.language,
+              absent: false,
+            });
+            expect(thirdBooking.location).toEqual(body.location);
+            expect(thirdBooking.absentHost).toEqual(false);
+          } else {
+            throw new Error(
+              "Invalid response data - expected recurring booking but received non array response"
+            );
+          }
+        });
+    });
+
+    afterEach(async () => {
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+    });
+
+    afterAll(async () => {
+      await oauthClientRepositoryFixture.delete(oAuthClient.id);
+      await teamRepositoryFixture.delete(organization.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+      await app.close();
+    });
+  });
+
+  function responseDataIsRecurringBooking(data: any): data is RecurringBookingOutput_2024_08_13[] {
+    return Array.isArray(data);
+  }
+
+  describe("Recurring bookings cancel all subsequent bookings", () => {
+    let app: INestApplication;
+    let organization: Team;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let bookingsRepositoryFixture: BookingsRepositoryFixture;
+    let schedulesService: SchedulesService_2024_04_15;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+    let oAuthClient: PlatformOAuthClient;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+
+    const userEmail = "bookings-controller-e2e@api.com";
+    let user: User;
+
+    const maxRecurrenceCount = 4;
+    let recurringEventTypeId: number;
+
+    let recurringBooking: RecurringBookingOutput_2024_08_13[];
+
+    beforeAll(async () => {
+      jest.spyOn(AttendeeCancelledEmail.prototype as any, "getHtml").mockImplementation(async function () {
+        return "<html><body>Mocked Email Content</body></html>";
+      });
+
+      jest.spyOn(OrganizerCancelledEmail.prototype as any, "getHtml").mockImplementation(async function () {
+        return "<html><body>Mocked Email Content</body></html>";
+      });
+
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      oAuthClient = await createOAuthClient(organization.id);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
+      });
+
+      const userSchedule: CreateScheduleInput_2024_04_15 = {
+        name: "working time",
+        timeZone: "Europe/Rome",
+        isDefault: true,
+      };
+      await schedulesService.createUserSchedule(user.id, userSchedule);
+
+      const recurringEvent = await eventTypesRepositoryFixture.create(
+        // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
+        {
+          title: "peer coding recurring",
+          slug: "peer-coding-recurring",
+          length: 60,
+          recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
+        },
+        user.id
+      );
+      recurringEventTypeId = recurringEvent.id;
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    async function createOAuthClient(organizationId: number) {
+      const data = {
+        logo: "logo-url",
+        name: "name",
+        redirectUris: ["http://localhost:5555"],
+        permissions: 32,
+      };
+      const secret = "secret";
+
+      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+      return client;
+    }
+
+    it("should create a recurring booking", async () => {
+      const body: CreateRecurringBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString(),
+        eventTypeId: recurringEventTypeId,
+        attendee: {
+          name: "Mr Proper Recurring",
+          email: "mr_proper_recurring@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "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(responseDataIsRecurringBooking(responseBody.data)).toBe(true);
+
+          if (responseDataIsRecurringBooking(responseBody.data)) {
+            const data: RecurringBookingOutput_2024_08_13[] = responseBody.data;
+            expect(data.length).toEqual(maxRecurrenceCount);
+            recurringBooking = data;
+          } else {
+            throw new Error(
+              "Invalid response data - expected recurring booking but received non array response"
+            );
+          }
+        });
+    });
+
+    it("should cancel all recurrences after a specific recurrence", async () => {
+      const recurringBookingUid = recurringBooking[2].recurringBookingUid;
+      const bookings = await bookingsRepositoryFixture.getByRecurringBookingUid(recurringBookingUid);
+      for (const booking of bookings) {
+        expect(booking.status).toEqual("ACCEPTED");
+      }
+
+      // note(Lauris): cancel all recurrences after and including third recurrence in the series of 4 recurrences
+      // aka cancel 3rd and 4th recurrences.
+      const thirdRecurrenceUid = recurringBooking[2].uid;
+      const fourthRecurringUid = recurringBooking[3].uid;
+      const body: CancelBookingInput_2024_08_13 = {
+        cancelSubsequentBookings: true,
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${thirdRecurrenceUid}/cancel`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: CreateBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseDataIsRecurringBooking(responseBody.data)).toBe(true);
+
+          if (responseDataIsRecurringBooking(responseBody.data)) {
+            const data: RecurringBookingOutput_2024_08_13[] = responseBody.data;
+            expect(data.length).toEqual(4);
+
+            const firstRecurrence = data.find((booking) => booking.uid === recurringBooking[0].uid);
+            expect(firstRecurrence).toBeDefined();
+            expect(firstRecurrence?.status).toEqual("accepted");
+
+            const secondRecurrence = data.find((booking) => booking.uid === recurringBooking[1].uid);
+            expect(secondRecurrence).toBeDefined();
+            expect(secondRecurrence?.status).toEqual("accepted");
+
+            const thirdRecurrence = data.find((booking) => booking.uid === thirdRecurrenceUid);
+            expect(thirdRecurrence).toBeDefined();
+            expect(thirdRecurrence?.status).toEqual("cancelled");
+
+            const fourthRecurrence = data.find((booking) => booking.uid === fourthRecurringUid);
+            expect(fourthRecurrence).toBeDefined();
+            expect(fourthRecurrence?.status).toEqual("cancelled");
+
+            const bookings = await bookingsRepositoryFixture.getByRecurringBookingUid(recurringBookingUid);
+
+            const bookingFirst = bookings.find((booking) => booking.uid === recurringBooking[0].uid);
+            expect(bookingFirst?.status).toEqual("ACCEPTED");
+            const bookingSecond = bookings.find((booking) => booking.uid === recurringBooking[1].uid);
+            expect(bookingSecond?.status).toEqual("ACCEPTED");
+            const bookingThird = bookings.find((booking) => booking.uid === recurringBooking[2].uid);
+            expect(bookingThird?.status).toEqual("CANCELLED");
+            const bookingFourth = bookings.find((booking) => booking.uid === recurringBooking[3].uid);
+            expect(bookingFourth?.status).toEqual("CANCELLED");
+          } else {
+            throw new Error(
+              "Invalid response data - expected recurring booking but received non array response"
+            );
+          }
+        });
+    });
+
+    afterAll(async () => {
+      await oauthClientRepositoryFixture.delete(oAuthClient.id);
+      await teamRepositoryFixture.delete(organization.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+      await app.close();
+    });
+  });
+
+  describe("Recurring bookings cancel all remaining bookings (bookings with start time greater than this moment)", () => {
+    let app: INestApplication;
+    let organization: Team;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let bookingsRepositoryFixture: BookingsRepositoryFixture;
+    let schedulesService: SchedulesService_2024_04_15;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+    let oAuthClient: PlatformOAuthClient;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+
+    const userEmail = "bookings-controller-e2e@api.com";
+    let user: User;
+
+    const maxRecurrenceCount = 4;
+    let recurringEventTypeId: number;
+
+    let recurringBooking: RecurringBookingOutput_2024_08_13[];
+
+    beforeAll(async () => {
+      jest.spyOn(AttendeeCancelledEmail.prototype as any, "getHtml").mockImplementation(async function () {
+        return "<html><body>Mocked Email Content</body></html>";
+      });
+
+      jest.spyOn(OrganizerCancelledEmail.prototype as any, "getHtml").mockImplementation(async function () {
+        return "<html><body>Mocked Email Content</body></html>";
+      });
+
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
+      oAuthClient = await createOAuthClient(organization.id);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
+      });
+
+      const userSchedule: CreateScheduleInput_2024_04_15 = {
+        name: "working time",
+        timeZone: "Europe/Rome",
+        isDefault: true,
+      };
+      await schedulesService.createUserSchedule(user.id, userSchedule);
+
+      const recurringEvent = await eventTypesRepositoryFixture.create(
+        // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
+        {
+          title: "peer coding recurring",
+          slug: "peer-coding-recurring",
+          length: 60,
+          recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
+        },
+        user.id
+      );
+      recurringEventTypeId = recurringEvent.id;
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    async function createOAuthClient(organizationId: number) {
+      const data = {
+        logo: "logo-url",
+        name: "name",
+        redirectUris: ["http://localhost:5555"],
+        permissions: 32,
+      };
+      const secret = "secret";
+
+      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+      return client;
+    }
+
+    it("should create a recurring booking", async () => {
+      const body: CreateRecurringBookingInput_2024_08_13 = {
+        start: new Date(Date.UTC(2040, 1, 3, 13, 0, 0)).toISOString(),
+        eventTypeId: recurringEventTypeId,
+        attendee: {
+          name: "Mr Proper Recurring",
+          email: "mr_proper_recurring@gmail.com",
+          timeZone: "Europe/Rome",
+          language: "it",
+        },
+        location: "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(responseDataIsRecurringBooking(responseBody.data)).toBe(true);
+
+          if (responseDataIsRecurringBooking(responseBody.data)) {
+            const data: RecurringBookingOutput_2024_08_13[] = responseBody.data;
+            expect(data.length).toEqual(maxRecurrenceCount);
+            recurringBooking = data;
+          } else {
+            throw new Error(
+              "Invalid response data - expected recurring booking but received non array response"
+            );
+          }
+        });
+    });
+
+    it("should cancel all remaning recurrences", async () => {
+      const recurringBookingUid = recurringBooking[0].recurringBookingUid;
+
+      return request(app.getHttpServer())
+        .post(`/v2/bookings/${recurringBookingUid}/cancel`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: CreateBookingOutput_2024_08_13 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseDataIsRecurringBooking(responseBody.data)).toBe(true);
+
+          if (responseDataIsRecurringBooking(responseBody.data)) {
+            const data: RecurringBookingOutput_2024_08_13[] = responseBody.data;
+            expect(data.length).toEqual(4);
+            for (const booking of data) {
+              expect(booking.status).toEqual("cancelled");
+            }
+          } else {
+            throw new Error(
+              "Invalid response data - expected recurring booking but received non array response"
+            );
+          }
+        });
+    });
+
+    afterAll(async () => {
+      await oauthClientRepositoryFixture.delete(oAuthClient.id);
+      await teamRepositoryFixture.delete(organization.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+      await app.close();
+    });
+  });
+});

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

@@ -93,6 +93,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       user = await userRepositoryFixture.create({
         email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
@@ -163,6 +168,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
         bookingFieldsResponses: {
           codingLanguage: "TypeScript",
         },
+        metadata: {
+          userId: "100",
+        },
       };
 
       return request(app.getHttpServer())
@@ -205,6 +213,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
               },
+              metadata: body.metadata,
             });
             expect(data.location).toBeDefined();
             expect(data.absentHost).toEqual(false);
@@ -230,6 +239,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
         bookingFieldsResponses: {
           codingLanguage: "Rust",
         },
+        metadata: {
+          userId: "200",
+        },
       };
 
       return request(app.getHttpServer())
@@ -274,6 +286,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: createdSeatedBooking.attendees[0].name,
                 ...createdSeatedBooking.attendees[0].bookingFieldsResponses,
               },
+              metadata: createdSeatedBooking.attendees[0].metadata,
             });
             const secondAttendee = data.attendees.find((attendee) => attendee.name === nameAttendeeTwo);
             expect(secondAttendee).toEqual({
@@ -286,6 +299,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
               },
+              metadata: body.metadata,
             });
             expect(data.location).toBeDefined();
             expect(data.absentHost).toEqual(false);
@@ -314,6 +328,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
           codingLanguage: "TypeScript",
         },
         recurrenceCount,
+        metadata: {
+          userId: "300",
+        },
       };
 
       return request(app.getHttpServer())
@@ -359,6 +376,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
               },
+              metadata: body.metadata,
             });
             expect(firstBooking.location).toEqual(body.location);
             expect(firstBooking.absentHost).toEqual(false);
@@ -392,6 +410,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
               },
+              metadata: body.metadata,
             });
             expect(secondBooking.location).toEqual(body.location);
             expect(secondBooking.absentHost).toEqual(false);
@@ -565,6 +584,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: attendee?.name,
                 ...attendee?.bookingFieldsResponses,
               },
+              metadata: attendee?.metadata,
             });
             expect(data.location).toBeDefined();
             expect(data.absentHost).toEqual(false);
@@ -697,6 +717,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       user = await userRepositoryFixture.create({
         email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
@@ -769,6 +794,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
         bookingFieldsResponses: {
           codingLanguage: "TypeScript",
         },
+        metadata: {
+          userId: "1000",
+        },
         recurrenceCount,
       };
 
@@ -815,6 +843,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
               },
+              metadata: body.metadata,
             });
             expect(firstBooking.location).toEqual(body.location);
             expect(firstBooking.absentHost).toEqual(false);
@@ -848,6 +877,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: body.attendee.name,
                 ...body.bookingFieldsResponses,
               },
+              metadata: body.metadata,
             });
             expect(secondBooking.location).toEqual(body.location);
             expect(secondBooking.absentHost).toEqual(false);
@@ -875,6 +905,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
         bookingFieldsResponses: {
           codingLanguage: "TypeScript",
         },
+        metadata: {
+          userId: "2000",
+        },
         recurrenceCount,
       };
 
@@ -921,6 +954,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: nameAttendeeOne,
                 ...body.bookingFieldsResponses,
               },
+              metadata: createdRecurringSeatedBooking[0].attendees[0].metadata,
             });
             expect(firstBooking.attendees[1]).toEqual({
               name: nameAttendeeTwo,
@@ -932,6 +966,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: nameAttendeeTwo,
                 ...body.bookingFieldsResponses,
               },
+              metadata: body.metadata,
             });
             expect(firstBooking.location).toEqual(body.location);
             expect(firstBooking.absentHost).toEqual(false);
@@ -965,6 +1000,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: nameAttendeeOne,
                 ...body.bookingFieldsResponses,
               },
+              metadata: createdRecurringSeatedBooking[0].attendees[0].metadata,
             });
             expect(secondBooking.attendees[1]).toEqual({
               name: nameAttendeeTwo,
@@ -976,6 +1012,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 name: nameAttendeeTwo,
                 ...body.bookingFieldsResponses,
               },
+              metadata: body.metadata,
             });
             expect(secondBooking.location).toEqual(body.location);
             expect(secondBooking.absentHost).toEqual(false);

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

@@ -85,30 +85,50 @@ describe("Bookings Endpoints 2024-08-13", () => {
       schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
 
       organization = await organizationsRepositoryFixture.create({ name: "organization team bookings" });
+      oAuthClient = await createOAuthClient(organization.id);
+
       team1 = await teamRepositoryFixture.create({
         name: "team 1",
         isOrganization: false,
         parent: { connect: { id: organization.id } },
+        createdByOAuthClient: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
       team2 = await teamRepositoryFixture.create({
         name: "team 2",
         isOrganization: false,
         parent: { connect: { id: organization.id } },
+        createdByOAuthClient: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
-      oAuthClient = await createOAuthClient(organization.id);
-
       teamUser = await userRepositoryFixture.create({
         email: teamUserEmail,
         locale: "it",
         name: "orgUser1team1",
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
       teamUser2 = await userRepositoryFixture.create({
         email: teamUserEmail2,
         locale: "es",
         name: "orgUser2team1",
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {

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

@@ -14,6 +14,7 @@ import { INestApplication } from "@nestjs/common";
 import { NestExpressApplication } from "@nestjs/platform-express";
 import { Test } from "@nestjs/testing";
 import { User } from "@prisma/client";
+import { advanceTo, clear } from "jest-date-mock";
 import * as request from "supertest";
 import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
 import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
@@ -95,6 +96,12 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       user = await userRepositoryFixture.create({
         email: userEmail,
+        username: `bob-${Math.floor(Math.random() * 1000)}@gmail.com`,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {
@@ -178,6 +185,136 @@ describe("Bookings Endpoints 2024-08-13", () => {
     });
 
     describe("create bookings", () => {
+      describe("invalid metadata", () => {
+        it("should not be able to create a booking with metadata with more than 50 keys", async () => {
+          const body: CreateBookingInput_2024_08_13 = {
+            start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+            eventTypeId,
+            attendee: {
+              name: "Mr Proper",
+              email: "mr_proper@gmail.com",
+              timeZone: "Europe/Rome",
+              language: "it",
+            },
+            location: "https://meet.google.com/abc-def-ghi",
+            bookingFieldsResponses: {
+              customField: "customValue",
+            },
+            metadata: {
+              key1: "1",
+              key2: "2",
+              key3: "3",
+              key4: "4",
+              key5: "5",
+              key6: "6",
+              key7: "7",
+              key8: "8",
+              key9: "9",
+              key10: "10",
+              key11: "11",
+              key12: "12",
+              key13: "13",
+              key14: "14",
+              key15: "15",
+              key16: "16",
+              key17: "17",
+              key18: "18",
+              key19: "19",
+              key20: "20",
+              key21: "21",
+              key22: "22",
+              key23: "23",
+              key24: "24",
+              key25: "25",
+              key26: "26",
+              key27: "27",
+              key28: "28",
+              key29: "29",
+              key30: "30",
+              key31: "31",
+              key32: "32",
+              key33: "33",
+              key34: "34",
+              key35: "35",
+              key36: "36",
+              key37: "37",
+              key38: "38",
+              key39: "39",
+              key40: "40",
+              key41: "41",
+              key42: "42",
+              key43: "43",
+              key44: "44",
+              key45: "45",
+              key46: "46",
+              key47: "47",
+              key48: "48",
+              key49: "49",
+              key50: "50",
+              key51: "51",
+            },
+          };
+
+          return request(app.getHttpServer())
+            .post("/v2/bookings")
+            .send(body)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+            .expect(400);
+        });
+
+        it("should not be able to create a booking with metadata with a key longer than 40 characters", async () => {
+          const body: CreateBookingInput_2024_08_13 = {
+            start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+            eventTypeId,
+            attendee: {
+              name: "Mr Proper",
+              email: "mr_proper@gmail.com",
+              timeZone: "Europe/Rome",
+              language: "it",
+            },
+            location: "https://meet.google.com/abc-def-ghi",
+            bookingFieldsResponses: {
+              customField: "customValue",
+            },
+            metadata: {
+              aaaaaaaaaabbbbbbbbbbccccccccccdddddddddde: "1",
+            },
+          };
+
+          return request(app.getHttpServer())
+            .post("/v2/bookings")
+            .send(body)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+            .expect(400);
+        });
+
+        it("should not be able to create a booking with metadata with a value longer than 500 characters", async () => {
+          const body: CreateBookingInput_2024_08_13 = {
+            start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+            eventTypeId,
+            attendee: {
+              name: "Mr Proper",
+              email: "mr_proper@gmail.com",
+              timeZone: "Europe/Rome",
+              language: "it",
+            },
+            location: "https://meet.google.com/abc-def-ghi",
+            bookingFieldsResponses: {
+              customField: "customValue",
+            },
+            metadata: {
+              key: `${"a".repeat(501)}`,
+            },
+          };
+
+          return request(app.getHttpServer())
+            .post("/v2/bookings")
+            .send(body)
+            .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+            .expect(400);
+        });
+      });
+
       it("should create a booking", async () => {
         const body: CreateBookingInput_2024_08_13 = {
           start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
@@ -192,14 +329,19 @@ describe("Bookings Endpoints 2024-08-13", () => {
           bookingFieldsResponses: {
             customField: "customValue",
           },
+          metadata: {
+            userId: "100",
+          },
         };
 
+        const beforeCreate = new Date();
         return request(app.getHttpServer())
           .post("/v2/bookings")
           .send(body)
           .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
           .expect(201)
           .then(async (response) => {
+            const afterCreate = new Date();
             const responseBody: CreateBookingOutput_2024_08_13 = response.body;
             expect(responseBody.status).toEqual(SUCCESS_STATUS);
             expect(responseBody.data).toBeDefined();
@@ -210,6 +352,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.id).toBeDefined();
               expect(data.uid).toBeDefined();
               expect(data.hosts[0].id).toEqual(user.id);
+              expect(data.hosts[0].username).toEqual(user.username);
               expect(data.status).toEqual("accepted");
               expect(data.start).toEqual(body.start);
               expect(data.end).toEqual(new Date(Date.UTC(2030, 0, 8, 14, 0, 0)).toISOString());
@@ -233,6 +376,13 @@ describe("Bookings Endpoints 2024-08-13", () => {
                 email: body.attendee.email,
                 ...body.bookingFieldsResponses,
               });
+
+              // Check createdAt date is between the time of the request and after the request
+              const createdAtDate = new Date(data.createdAt);
+              expect(createdAtDate.getTime()).toBeGreaterThanOrEqual(beforeCreate.getTime());
+              expect(createdAtDate.getTime()).toBeLessThanOrEqual(afterCreate.getTime());
+
+              expect(data.metadata).toEqual(body.metadata);
               createdBooking = data;
             } else {
               throw new Error(
@@ -253,6 +403,9 @@ describe("Bookings Endpoints 2024-08-13", () => {
             language: "it",
           },
           location: "https://meet.google.com/abc-def-ghi",
+          metadata: {
+            userId: "1000",
+          },
         };
 
         return request(app.getHttpServer())
@@ -288,6 +441,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(firstBooking.location).toEqual(body.location);
               expect(firstBooking.recurringBookingUid).toBeDefined();
               expect(firstBooking.absentHost).toEqual(false);
+              expect(firstBooking.metadata).toEqual(body.metadata);
 
               const secondBooking = data[1];
               expect(secondBooking.id).toBeDefined();
@@ -307,6 +461,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               });
               expect(secondBooking.location).toEqual(body.location);
               expect(secondBooking.absentHost).toEqual(false);
+              expect(secondBooking.metadata).toEqual(body.metadata);
 
               const thirdBooking = data[2];
               expect(thirdBooking.id).toBeDefined();
@@ -326,6 +481,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               });
               expect(thirdBooking.location).toEqual(body.location);
               expect(thirdBooking.absentHost).toEqual(false);
+              expect(thirdBooking.metadata).toEqual(body.metadata);
 
               createdRecurringBooking = data;
             } else {
@@ -354,6 +510,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.id).toEqual(createdBooking.id);
               expect(data.uid).toEqual(createdBooking.uid);
               expect(data.hosts[0].id).toEqual(user.id);
+              expect(data.hosts[0].username).toEqual(user.username);
               expect(data.status).toEqual(createdBooking.status);
               expect(data.start).toEqual(createdBooking.start);
               expect(data.end).toEqual(createdBooking.end);
@@ -362,6 +519,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.attendees[0]).toEqual(createdBooking.attendees[0]);
               expect(data.location).toEqual(createdBooking.location);
               expect(data.absentHost).toEqual(createdBooking.absentHost);
+              expect(data.createdAt).toEqual(createdBooking.createdAt);
             } else {
               throw new Error(
                 "Invalid response data - expected booking but received array of possibily recurring bookings"
@@ -835,12 +993,14 @@ describe("Bookings Endpoints 2024-08-13", () => {
           reschedulingReason: "Flying to mars that day",
         };
 
+        const beforeCreate = new Date();
         return request(app.getHttpServer())
           .post(`/v2/bookings/${createdBooking.uid}/reschedule`)
           .send(body)
           .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
           .expect(201)
           .then(async (response) => {
+            const afterCreate = new Date();
             const responseBody: RescheduleBookingOutput_2024_08_13 = response.body;
             expect(responseBody.status).toEqual(SUCCESS_STATUS);
             expect(responseBody.data).toBeDefined();
@@ -860,6 +1020,13 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.attendees[0]).toEqual(createdBooking.attendees[0]);
             expect(data.location).toEqual(createdBooking.location);
             expect(data.absentHost).toEqual(createdBooking.absentHost);
+            expect(data.metadata).toEqual(createdBooking.metadata);
+
+            // When a booking is rescheduled, a new booking is created and the old booking is cancelled.
+            // We want to make sure the createdAt date of the new booking is between the beforeCreate and afterCreate dates.
+            const createdAtDate = new Date(data.createdAt);
+            expect(createdAtDate.getTime()).toBeGreaterThanOrEqual(beforeCreate.getTime());
+            expect(createdAtDate.getTime()).toBeLessThanOrEqual(afterCreate.getTime());
 
             rescheduledBooking = data;
           });
@@ -913,6 +1080,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.attendees[0]).toEqual(createdRecurringBooking[0].attendees[0]);
             expect(data.location).toEqual(createdRecurringBooking[0].location);
             expect(data.absentHost).toEqual(createdRecurringBooking[0].absentHost);
+            expect(data.metadata).toEqual(createdRecurringBooking[0].metadata);
 
             const oldBooking = await bookingsRepositoryFixture.getByUid(createdRecurringBooking[0].uid);
             expect(oldBooking).toBeDefined();
@@ -952,6 +1120,14 @@ describe("Bookings Endpoints 2024-08-13", () => {
     });
 
     describe("mark absent", () => {
+      beforeAll(() => {
+        advanceTo(new Date(2035, 0, 9, 15, 0, 0));
+      });
+
+      afterAll(() => {
+        clear();
+      });
+
       it("should mark host absent", async () => {
         const body: MarkAbsentBookingInput_2024_08_13 = {
           host: true,
@@ -1018,6 +1194,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
           });
       });
     });
+
     describe("cancel bookings", () => {
       it("should cancel booking", async () => {
         const body: CancelBookingInput_2024_08_13 = {
@@ -1127,293 +1304,4 @@ describe("Bookings Endpoints 2024-08-13", () => {
   function responseDataIsRecurringBooking(data: any): data is RecurringBookingOutput_2024_08_13[] {
     return Array.isArray(data);
   }
-
-  describe("Recurring bookings", () => {
-    let app: INestApplication;
-    let organization: Team;
-
-    let userRepositoryFixture: UserRepositoryFixture;
-    let bookingsRepositoryFixture: BookingsRepositoryFixture;
-    let schedulesService: SchedulesService_2024_04_15;
-    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
-    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
-    let oAuthClient: PlatformOAuthClient;
-    let teamRepositoryFixture: TeamRepositoryFixture;
-
-    const userEmail = "bookings-controller-e2e@api.com";
-    let user: User;
-
-    const maxRecurrenceCount = 3;
-    let recurringEventTypeId: number;
-
-    beforeAll(async () => {
-      const moduleRef = await withApiAuth(
-        userEmail,
-        Test.createTestingModule({
-          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
-        })
-      )
-        .overrideGuard(PermissionsGuard)
-        .useValue({
-          canActivate: () => true,
-        })
-        .compile();
-
-      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
-      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
-      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
-      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
-      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
-      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
-
-      organization = await teamRepositoryFixture.create({ name: "organization bookings" });
-      oAuthClient = await createOAuthClient(organization.id);
-
-      user = await userRepositoryFixture.create({
-        email: userEmail,
-      });
-
-      const userSchedule: CreateScheduleInput_2024_04_15 = {
-        name: "working time",
-        timeZone: "Europe/Rome",
-        isDefault: true,
-      };
-      await schedulesService.createUserSchedule(user.id, userSchedule);
-
-      const recurringEvent = await eventTypesRepositoryFixture.create(
-        // note(Lauris): freq 2 means weekly, interval 1 means every week and count 3 means 3 weeks in a row
-        {
-          title: "peer coding recurring",
-          slug: "peer-coding-recurring",
-          length: 60,
-          recurringEvent: { freq: 2, count: maxRecurrenceCount, interval: 1 },
-        },
-        user.id
-      );
-      recurringEventTypeId = recurringEvent.id;
-
-      app = moduleRef.createNestApplication();
-      bootstrap(app as NestExpressApplication);
-
-      await app.init();
-    });
-
-    async function createOAuthClient(organizationId: number) {
-      const data = {
-        logo: "logo-url",
-        name: "name",
-        redirectUris: ["http://localhost:5555"],
-        permissions: 32,
-      };
-      const secret = "secret";
-
-      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
-      return client;
-    }
-
-    it("should not create recurring booking with recurrenceCount larger than event type recurrence count", async () => {
-      const recurrenceCount = 1000;
-
-      const body: CreateRecurringBookingInput_2024_08_13 = {
-        start: new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString(),
-        eventTypeId: recurringEventTypeId,
-        attendee: {
-          name: "Mr Proper Recurring",
-          email: "mr_proper_recurring@gmail.com",
-          timeZone: "Europe/Rome",
-          language: "it",
-        },
-        location: "https://meet.google.com/abc-def-ghi",
-        recurrenceCount,
-      };
-
-      return request(app.getHttpServer())
-        .post("/v2/bookings")
-        .send(body)
-        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
-        .expect(400);
-    });
-
-    it("should create a recurring booking with recurrenceCount smaller than event type recurrence count", async () => {
-      const recurrenceCount = maxRecurrenceCount - 1;
-      const body: CreateRecurringBookingInput_2024_08_13 = {
-        start: new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString(),
-        eventTypeId: recurringEventTypeId,
-        attendee: {
-          name: "Mr Proper Recurring",
-          email: "mr_proper_recurring@gmail.com",
-          timeZone: "Europe/Rome",
-          language: "it",
-        },
-        location: "https://meet.google.com/abc-def-ghi",
-        recurrenceCount,
-      };
-
-      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(responseDataIsRecurringBooking(responseBody.data)).toBe(true);
-
-          if (responseDataIsRecurringBooking(responseBody.data)) {
-            const data: RecurringBookingOutput_2024_08_13[] = responseBody.data;
-            expect(data.length).toEqual(maxRecurrenceCount - 1);
-
-            const firstBooking = data[0];
-            expect(firstBooking.id).toBeDefined();
-            expect(firstBooking.uid).toBeDefined();
-            expect(firstBooking.hosts[0].id).toEqual(user.id);
-            expect(firstBooking.status).toEqual("accepted");
-            expect(firstBooking.start).toEqual(new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString());
-            expect(firstBooking.end).toEqual(new Date(Date.UTC(2030, 1, 4, 14, 0, 0)).toISOString());
-            expect(firstBooking.duration).toEqual(60);
-            expect(firstBooking.eventTypeId).toEqual(recurringEventTypeId);
-            expect(firstBooking.attendees[0]).toEqual({
-              name: body.attendee.name,
-              timeZone: body.attendee.timeZone,
-              language: body.attendee.language,
-              absent: false,
-            });
-            expect(firstBooking.location).toEqual(body.location);
-            expect(firstBooking.recurringBookingUid).toBeDefined();
-            expect(firstBooking.absentHost).toEqual(false);
-
-            const secondBooking = data[1];
-            expect(secondBooking.id).toBeDefined();
-            expect(secondBooking.uid).toBeDefined();
-            expect(secondBooking.hosts[0].id).toEqual(user.id);
-            expect(secondBooking.status).toEqual("accepted");
-            expect(secondBooking.start).toEqual(new Date(Date.UTC(2030, 1, 11, 13, 0, 0)).toISOString());
-            expect(secondBooking.end).toEqual(new Date(Date.UTC(2030, 1, 11, 14, 0, 0)).toISOString());
-            expect(secondBooking.duration).toEqual(60);
-            expect(secondBooking.eventTypeId).toEqual(recurringEventTypeId);
-            expect(secondBooking.recurringBookingUid).toBeDefined();
-            expect(secondBooking.attendees[0]).toEqual({
-              name: body.attendee.name,
-              timeZone: body.attendee.timeZone,
-              language: body.attendee.language,
-              absent: false,
-            });
-            expect(secondBooking.location).toEqual(body.location);
-            expect(secondBooking.absentHost).toEqual(false);
-          } else {
-            throw new Error(
-              "Invalid response data - expected recurring booking but received non array response"
-            );
-          }
-        });
-    });
-
-    it("should create a recurring booking with recurrenceCount equal to event type recurrence count", async () => {
-      const recurrenceCount = maxRecurrenceCount;
-      const body: CreateRecurringBookingInput_2024_08_13 = {
-        start: new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString(),
-        eventTypeId: recurringEventTypeId,
-        attendee: {
-          name: "Mr Proper Recurring",
-          email: "mr_proper_recurring@gmail.com",
-          timeZone: "Europe/Rome",
-          language: "it",
-        },
-        location: "https://meet.google.com/abc-def-ghi",
-        recurrenceCount,
-      };
-
-      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(responseDataIsRecurringBooking(responseBody.data)).toBe(true);
-
-          if (responseDataIsRecurringBooking(responseBody.data)) {
-            const data: RecurringBookingOutput_2024_08_13[] = responseBody.data;
-            expect(data.length).toEqual(maxRecurrenceCount);
-
-            const firstBooking = data[0];
-            expect(firstBooking.id).toBeDefined();
-            expect(firstBooking.uid).toBeDefined();
-            expect(firstBooking.hosts[0].id).toEqual(user.id);
-            expect(firstBooking.status).toEqual("accepted");
-            expect(firstBooking.start).toEqual(new Date(Date.UTC(2030, 1, 4, 13, 0, 0)).toISOString());
-            expect(firstBooking.end).toEqual(new Date(Date.UTC(2030, 1, 4, 14, 0, 0)).toISOString());
-            expect(firstBooking.duration).toEqual(60);
-            expect(firstBooking.eventTypeId).toEqual(recurringEventTypeId);
-            expect(firstBooking.attendees[0]).toEqual({
-              name: body.attendee.name,
-              timeZone: body.attendee.timeZone,
-              language: body.attendee.language,
-              absent: false,
-            });
-            expect(firstBooking.location).toEqual(body.location);
-            expect(firstBooking.meetingUrl).toEqual(body.location);
-            expect(firstBooking.recurringBookingUid).toBeDefined();
-            expect(firstBooking.absentHost).toEqual(false);
-
-            const secondBooking = data[1];
-            expect(secondBooking.id).toBeDefined();
-            expect(secondBooking.uid).toBeDefined();
-            expect(secondBooking.hosts[0].id).toEqual(user.id);
-            expect(secondBooking.status).toEqual("accepted");
-            expect(secondBooking.start).toEqual(new Date(Date.UTC(2030, 1, 11, 13, 0, 0)).toISOString());
-            expect(secondBooking.end).toEqual(new Date(Date.UTC(2030, 1, 11, 14, 0, 0)).toISOString());
-            expect(secondBooking.duration).toEqual(60);
-            expect(secondBooking.eventTypeId).toEqual(recurringEventTypeId);
-            expect(secondBooking.recurringBookingUid).toBeDefined();
-            expect(secondBooking.attendees[0]).toEqual({
-              name: body.attendee.name,
-              timeZone: body.attendee.timeZone,
-              language: body.attendee.language,
-              absent: false,
-            });
-            expect(secondBooking.location).toEqual(body.location);
-            expect(secondBooking.absentHost).toEqual(false);
-
-            const thirdBooking = data[2];
-            expect(thirdBooking.id).toBeDefined();
-            expect(thirdBooking.uid).toBeDefined();
-            expect(thirdBooking.hosts[0].id).toEqual(user.id);
-            expect(thirdBooking.status).toEqual("accepted");
-            expect(thirdBooking.start).toEqual(new Date(Date.UTC(2030, 1, 18, 13, 0, 0)).toISOString());
-            expect(thirdBooking.end).toEqual(new Date(Date.UTC(2030, 1, 18, 14, 0, 0)).toISOString());
-            expect(thirdBooking.duration).toEqual(60);
-            expect(thirdBooking.eventTypeId).toEqual(recurringEventTypeId);
-            expect(thirdBooking.recurringBookingUid).toBeDefined();
-            expect(thirdBooking.attendees[0]).toEqual({
-              name: body.attendee.name,
-              timeZone: body.attendee.timeZone,
-              language: body.attendee.language,
-              absent: false,
-            });
-            expect(thirdBooking.location).toEqual(body.location);
-            expect(thirdBooking.absentHost).toEqual(false);
-          } else {
-            throw new Error(
-              "Invalid response data - expected recurring booking but received non array response"
-            );
-          }
-        });
-    });
-
-    afterEach(async () => {
-      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
-    });
-
-    afterAll(async () => {
-      await oauthClientRepositoryFixture.delete(oAuthClient.id);
-      await teamRepositoryFixture.delete(organization.id);
-      await userRepositoryFixture.deleteByEmail(user.email);
-      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
-      await app.close();
-    });
-  });
 });

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

@@ -1,9 +1,6 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output";
 import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
-import { MarkAbsentBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/mark-absent.output";
-import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
 import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
@@ -71,6 +68,11 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       user = await userRepositoryFixture.create({
         email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
       });
 
       const userSchedule: CreateScheduleInput_2024_04_15 = {

apps/api/v2/src/ee/bookings/2024-08-13/outputs/cancel-booking.output.ts

@@ -10,7 +10,12 @@ import {
   RecurringBookingOutput_2024_08_13,
 } from "@calcom/platform-types";
 
-@ApiExtraModels(BookingOutput_2024_08_13, RecurringBookingOutput_2024_08_13)
+@ApiExtraModels(
+  BookingOutput_2024_08_13,
+  RecurringBookingOutput_2024_08_13,
+  GetSeatedBookingOutput_2024_08_13,
+  GetRecurringSeatedBookingOutput_2024_08_13
+)
 export class CancelBookingOutput_2024_08_13 {
   @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])

apps/api/v2/src/ee/bookings/2024-08-13/outputs/create-booking.output.ts

@@ -10,7 +10,12 @@ import {
   CreateRecurringSeatedBookingOutput_2024_08_13,
 } from "@calcom/platform-types";
 
-@ApiExtraModels(BookingOutput_2024_08_13, RecurringBookingOutput_2024_08_13)
+@ApiExtraModels(
+  BookingOutput_2024_08_13,
+  RecurringBookingOutput_2024_08_13,
+  CreateSeatedBookingOutput_2024_08_13,
+  CreateRecurringSeatedBookingOutput_2024_08_13
+)
 export class CreateBookingOutput_2024_08_13 {
   @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
@@ -21,6 +26,8 @@ export class CreateBookingOutput_2024_08_13 {
     oneOf: [
       { $ref: getSchemaPath(BookingOutput_2024_08_13) },
       { type: "array", items: { $ref: getSchemaPath(RecurringBookingOutput_2024_08_13) } },
+      { $ref: getSchemaPath(CreateSeatedBookingOutput_2024_08_13) },
+      { type: "array", items: { $ref: getSchemaPath(CreateRecurringSeatedBookingOutput_2024_08_13) } },
     ],
     description:
       "Booking data, which can be either a BookingOutput object or an array of RecurringBookingOutput objects",

apps/api/v2/src/ee/bookings/2024-08-13/outputs/reschedule-booking.output.ts

@@ -12,7 +12,12 @@ import {
   RecurringBookingOutput_2024_08_13,
 } from "@calcom/platform-types";
 
-@ApiExtraModels(BookingOutput_2024_08_13, RecurringBookingOutput_2024_08_13)
+@ApiExtraModels(
+  BookingOutput_2024_08_13,
+  RecurringBookingOutput_2024_08_13,
+  CreateSeatedBookingOutput_2024_08_13,
+  CreateRecurringSeatedBookingOutput_2024_08_13
+)
 export class RescheduleBookingOutput_2024_08_13 {
   @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])

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

@@ -10,6 +10,7 @@ import { UsersRepository, UserWithProfile } from "@/modules/users/users.reposito
 import { Injectable, Logger, NotFoundException } from "@nestjs/common";
 import { BadRequestException } from "@nestjs/common";
 import { Request } from "express";
+import { z } from "zod";
 
 import {
   handleNewBooking,
@@ -38,6 +39,7 @@ import {
   CancelBookingInput,
 } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
+import { EventType } from "@calcom/prisma/client";
 
 type CreatedBooking = {
   hosts: { id: number }[];
@@ -45,6 +47,14 @@ type CreatedBooking = {
   start: string;
 };
 
+const eventTypeBookingFieldSchema = z.object({
+  name: z.string(),
+  required: z.boolean(),
+  editable: z.string(),
+});
+
+const eventTypeBookingFieldsSchema = z.array(eventTypeBookingFieldSchema);
+
 @Injectable()
 export class BookingsService_2024_08_13 {
   private readonly logger = new Logger("BookingsService");
@@ -70,6 +80,8 @@ export class BookingsService_2024_08_13 {
       const isRecurring = !!eventType?.recurringEvent;
       const isSeated = !!eventType?.seatsPerTimeSlot;
 
+      await this.hasRequiredBookingFieldsResponses(body, eventType);
+
       if (isRecurring && isSeated) {
         return await this.createRecurringSeatedBooking(request, body);
       }
@@ -91,6 +103,28 @@ export class BookingsService_2024_08_13 {
     }
   }
 
+  async hasRequiredBookingFieldsResponses(body: CreateBookingInput, eventType: EventType | null) {
+    const bookingFields = body.bookingFieldsResponses;
+    if (!bookingFields || !eventType || !eventType.bookingFields) {
+      return true;
+    }
+
+    // note(Lauris): we filter out system fields, because some of them are set by default and name and email are passed in the body.attendee
+    const eventTypeBookingFields = eventTypeBookingFieldsSchema
+      .parse(eventType.bookingFields)
+      .filter((field) => !field.editable.startsWith("system"));
+
+    for (const field of eventTypeBookingFields) {
+      if (field.required && !(field.name in bookingFields)) {
+        throw new BadRequestException(`
+          Missing required booking field response: ${field.name} - it is required by the event type booking fields, but missing in the bookingFieldsResponses.
+          You can fetch the event type with ID ${eventType.id} to see the required fields.`);
+      }
+    }
+
+    return true;
+  }
+
   async createInstantBooking(request: Request, body: CreateInstantBookingInput_2024_08_13) {
     const bookingRequest = await this.inputService.createBookingRequest(request, body);
     const booking = await handleInstantMeeting(bookingRequest);
@@ -307,17 +341,39 @@ export class BookingsService_2024_08_13 {
 
     const bookingRequest = await this.inputService.createCancelBookingRequest(request, bookingUid, body);
     await handleCancelBooking(bookingRequest);
+
+    if ("cancelSubsequentBookings" in body && body.cancelSubsequentBookings) {
+      return this.getAllRecurringBookingsByIndividualUid(bookingUid);
+    }
+
     return this.getBooking(bookingUid);
   }
 
+  private async getAllRecurringBookingsByIndividualUid(bookingUid: string) {
+    const booking = await this.bookingsRepository.getByUid(bookingUid);
+    const recurringBookingUid = booking?.recurringEventId;
+    if (!recurringBookingUid) {
+      throw new BadRequestException(
+        `Booking with bookingUid=${bookingUid} is not part of a recurring booking.`
+      );
+    }
+
+    return await this.getBooking(recurringBookingUid);
+  }
+
   async markAbsent(bookingUid: string, bookingOwnerId: number, body: MarkAbsentBookingInput_2024_08_13) {
     const bodyTransformed = this.inputService.transformInputMarkAbsentBooking(body);
+    const bookingBefore = await this.bookingsRepository.getByUid(bookingUid);
+    const platformClientParams = bookingBefore?.eventTypeId
+      ? await this.inputService.getOAuthClientParams(bookingBefore.eventTypeId)
+      : undefined;
 
     await handleMarkNoShow({
       bookingUid,
       attendees: bodyTransformed.attendees,
       noShowHost: bodyTransformed.noShowHost,
       userId: bookingOwnerId,
+      platformClientParams,
     });
 
     const booking = await this.bookingsRepository.getByUidWithAttendeesAndUserAndEvent(bookingUid);
@@ -372,11 +428,19 @@ export class BookingsService_2024_08_13 {
       throw new NotFoundException(`Booking with uid=${bookingUid} was not found in the database`);
     }
 
+    const platformClientParams = booking.eventTypeId
+      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
+
+    const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
+
     const profile = this.usersService.getUserMainProfile(requestUser);
 
     await roundRobinReassignment({
       bookingId: booking.id,
       orgId: profile?.organizationId || null,
+      emailsEnabled,
+      platformClientParams,
     });
 
     const reassigned = await this.bookingsRepository.getByUidWithUser(bookingUid);
@@ -403,6 +467,12 @@ export class BookingsService_2024_08_13 {
       throw new NotFoundException(`User with id=${newUserId} was not found in the database`);
     }
 
+    const platformClientParams = booking.eventTypeId
+      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
+
+    const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
+
     const profile = this.usersService.getUserMainProfile(user);
 
     const reassigned = await roundRobinManualReassignment({
@@ -411,6 +481,8 @@ export class BookingsService_2024_08_13 {
       orgId: profile?.organizationId || null,
       reassignReason: body.reason,
       reassignedById,
+      emailsEnabled,
+      platformClientParams,
     });
 
     return this.outputService.getOutputReassignedBooking(reassigned);
@@ -422,6 +494,12 @@ export class BookingsService_2024_08_13 {
       throw new NotFoundException(`Booking with uid=${bookingUid} was not found in the database`);
     }
 
+    const platformClientParams = booking.eventTypeId
+      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
+
+    const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
+
     await confirmBookingHandler({
       ctx: {
         user: requestUser,
@@ -430,6 +508,8 @@ export class BookingsService_2024_08_13 {
         bookingId: booking.id,
         confirmed: true,
         recurringEventId: booking.recurringEventId,
+        emailsEnabled,
+        platformClientParams,
       },
     });
 
@@ -442,6 +522,12 @@ export class BookingsService_2024_08_13 {
       throw new NotFoundException(`Booking with uid=${bookingUid} was not found in the database`);
     }
 
+    const platformClientParams = booking.eventTypeId
+      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
+
+    const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
+
     await confirmBookingHandler({
       ctx: {
         user: requestUser,
@@ -451,6 +537,8 @@ export class BookingsService_2024_08_13 {
         confirmed: false,
         recurringEventId: booking.recurringEventId,
         reason,
+        emailsEnabled,
+        platformClientParams,
       },
     });
 

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

@@ -18,7 +18,6 @@ import { NextApiRequest } from "next/types";
 import { v4 as uuidv4 } from "uuid";
 import { z } from "zod";
 
-import { X_CAL_CLIENT_ID } from "@calcom/platform-constants";
 import { EventTypeMetaDataSchema } from "@calcom/platform-libraries";
 import {
   CancelBookingInput,
@@ -33,19 +32,10 @@ import {
   RescheduleBookingInput_2024_08_13,
   RescheduleSeatedBookingInput_2024_08_13,
 } from "@calcom/platform-types";
-import { EventType } from "@calcom/prisma/client";
+import { EventType, PlatformOAuthClient } from "@calcom/prisma/client";
 
 type BookingRequest = NextApiRequest & { userId: number | undefined } & OAuthRequestParams;
 
-const DEFAULT_PLATFORM_PARAMS = {
-  platformClientId: "",
-  platformCancelUrl: "",
-  platformRescheduleUrl: "",
-  platformBookingUrl: "",
-  arePlatformEmailsEnabled: false,
-  platformBookingLocation: undefined,
-};
-
 type OAuthRequestParams = {
   platformClientId: string;
   platformRescheduleUrl: string;
@@ -92,30 +82,53 @@ export class InputBookingsService_2024_08_13 {
     body: CreateBookingInput_2024_08_13 | CreateInstantBookingInput_2024_08_13
   ): Promise<BookingRequest> {
     const bodyTransformed = await this.transformInputCreateBooking(body);
-    const oAuthClientId = request.get(X_CAL_CLIENT_ID);
-    const requestId = request.get("X-Request-Id");
+    const oAuthClientParams = await this.getOAuthClientParams(body.eventTypeId);
 
     const newRequest = { ...request };
     const userId = (await this.createBookingRequestOwnerId(request)) ?? undefined;
-    const oAuthParams = oAuthClientId
-      ? await this.createBookingRequestOAuthClientParams(oAuthClientId)
-      : DEFAULT_PLATFORM_PARAMS;
 
     const location = request.body.location || request.body.meetingUrl;
     this.logger.log(`createBookingRequest_2024_04_15`, {
-      requestId,
+      requestId: request.get("X-Request-Id"),
       ownerId: userId,
       location,
-      oAuthClientId,
-      ...oAuthParams,
+      oAuthClientParams,
     });
-    Object.assign(newRequest, { userId, ...oAuthParams, platformBookingLocation: location });
 
-    newRequest.body = { ...bodyTransformed, noEmail: !oAuthParams.arePlatformEmailsEnabled };
+    if (oAuthClientParams) {
+      Object.assign(newRequest, { userId, ...oAuthClientParams, platformBookingLocation: location });
+      newRequest.body = { ...bodyTransformed, noEmail: !oAuthClientParams.arePlatformEmailsEnabled };
+    } else {
+      Object.assign(newRequest, { userId, platformBookingLocation: location });
+      newRequest.body = { ...bodyTransformed, noEmail: false };
+    }
 
     return newRequest as unknown as BookingRequest;
   }
 
+  async getOAuthClientParams(eventTypeId: number) {
+    const eventType = await this.eventTypesRepository.getEventTypeById(eventTypeId);
+
+    let oAuthClient: PlatformOAuthClient | null = null;
+    if (eventType?.userId) {
+      oAuthClient = await this.oAuthClientRepository.getByUserId(eventType.userId);
+    } else if (eventType?.teamId) {
+      oAuthClient = await this.oAuthClientRepository.getByTeamId(eventType.teamId);
+    }
+
+    if (oAuthClient) {
+      return {
+        platformClientId: oAuthClient.id,
+        platformCancelUrl: oAuthClient.bookingCancelRedirectUri,
+        platformRescheduleUrl: oAuthClient.bookingRescheduleRedirectUri,
+        platformBookingUrl: oAuthClient.bookingRedirectUri,
+        arePlatformEmailsEnabled: oAuthClient.areEmailsEnabled,
+      };
+    }
+
+    return undefined;
+  }
+
   async transformInputCreateBooking(inputBooking: CreateBookingInput_2024_08_13) {
     const eventType = await this.eventTypesRepository.getEventTypeByIdWithOwnerAndTeam(
       inputBooking.eventTypeId
@@ -139,9 +152,7 @@ export class InputBookingsService_2024_08_13 {
       eventTypeId: inputBooking.eventTypeId,
       timeZone: inputBooking.attendee.timeZone,
       language: inputBooking.attendee.language || "en",
-      // todo(Lauris): expose after refactoring metadata https://app.campsite.co/cal/posts/zysq8w9rwm9c
-      // metadata: inputBooking.metadata || {},
-      metadata: {},
+      metadata: inputBooking.metadata || {},
       hasHashedBookingLink: false,
       guests: inputBooking.guests,
       // note(Lauris): responses with name and email are required by the handleNewBooking
@@ -180,21 +191,23 @@ export class InputBookingsService_2024_08_13 {
   ): Promise<BookingRequest> {
     // note(Lauris): update to this.transformInputCreate when rescheduling is implemented
     const bodyTransformed = await this.transformInputCreateRecurringBooking(body);
-    const oAuthClientId = request.get(X_CAL_CLIENT_ID);
+    const oAuthClientParams = await this.getOAuthClientParams(body.eventTypeId);
 
     const newRequest = { ...request };
     const userId = (await this.createBookingRequestOwnerId(request)) ?? undefined;
-    const oAuthParams = oAuthClientId
-      ? await this.createBookingRequestOAuthClientParams(oAuthClientId)
-      : DEFAULT_PLATFORM_PARAMS;
 
     const location = request.body.location || request.body.meetingUrl;
-    Object.assign(newRequest, {
-      userId,
-      ...oAuthParams,
-      platformBookingLocation: location,
-      noEmail: !oAuthParams.arePlatformEmailsEnabled,
-    });
+
+    if (oAuthClientParams) {
+      Object.assign(newRequest, {
+        userId,
+        ...oAuthClientParams,
+        platformBookingLocation: location,
+        noEmail: !oAuthClientParams.arePlatformEmailsEnabled,
+      });
+    } else {
+      Object.assign(newRequest, { userId, platformBookingLocation: location });
+    }
 
     newRequest.body = bodyTransformed.map((event) => ({
       ...event,
@@ -243,9 +256,7 @@ export class InputBookingsService_2024_08_13 {
         recurringEventId,
         timeZone: inputBooking.attendee.timeZone,
         language: inputBooking.attendee.language || "en",
-        // todo(Lauris): expose after refactoring metadata https://app.campsite.co/cal/posts/zysq8w9rwm9c
-        // metadata: inputBooking.metadata || {},
-        metadata: {},
+        metadata: inputBooking.metadata || {},
         hasHashedBookingLink: false,
         guests: inputBooking.guests,
         // note(Lauris): responses with name and email are required by the handleNewBooking
@@ -285,18 +296,20 @@ export class InputBookingsService_2024_08_13 {
     const bodyTransformed = this.isRescheduleSeatedBody(body)
       ? await this.transformInputRescheduleSeatedBooking(bookingUid, body)
       : await this.transformInputRescheduleBooking(bookingUid, body);
-    const oAuthClientId = request.get(X_CAL_CLIENT_ID);
+
+    const oAuthClientParams = await this.getOAuthClientParams(bodyTransformed.eventTypeId);
 
     const newRequest = { ...request };
     const userId = (await this.createBookingRequestOwnerId(request)) ?? undefined;
-    const oAuthParams = oAuthClientId
-      ? await this.createBookingRequestOAuthClientParams(oAuthClientId)
-      : DEFAULT_PLATFORM_PARAMS;
 
     const location = await this.getRescheduleBookingLocation(bookingUid);
-    Object.assign(newRequest, { userId, ...oAuthParams, platformBookingLocation: location });
-
-    newRequest.body = { ...bodyTransformed, noEmail: !oAuthParams.arePlatformEmailsEnabled };
+    if (oAuthClientParams) {
+      Object.assign(newRequest, { userId, ...oAuthClientParams, platformBookingLocation: location });
+      newRequest.body = { ...bodyTransformed, noEmail: !oAuthClientParams.arePlatformEmailsEnabled };
+    } else {
+      Object.assign(newRequest, { userId, platformBookingLocation: location });
+      newRequest.body = { ...bodyTransformed, noEmail: false };
+    }
 
     return newRequest as unknown as BookingRequest;
   }
@@ -345,9 +358,7 @@ export class InputBookingsService_2024_08_13 {
       eventTypeId: eventType.id,
       timeZone: attendee.timeZone,
       language: attendee.locale,
-      // todo(Lauris): expose after refactoring metadata https://app.campsite.co/cal/posts/zysq8w9rwm9c
-      // metadata: booking.metadata || {},
-      metadata: {},
+      metadata: seat.metadata || {},
       hasHashedBookingLink: false,
       guests: [],
       responses: { ...bookingResponses },
@@ -386,9 +397,7 @@ export class InputBookingsService_2024_08_13 {
       eventTypeId: eventType.id,
       timeZone: attendee.timeZone,
       language: attendee.locale,
-      // todo(Lauris): expose after refactoring metadata https://app.campsite.co/cal/posts/zysq8w9rwm9c
-      // metadata: booking.metadata || {},
-      metadata: {},
+      metadata: booking.metadata || {},
       hasHashedBookingLink: false,
       guests: bookingResponses.guests,
       responses: { ...bookingResponses, rescheduledReason: inputBooking.reschedulingReason },
@@ -423,24 +432,6 @@ export class InputBookingsService_2024_08_13 {
     }
   }
 
-  private async createBookingRequestOAuthClientParams(clientId: string) {
-    const params = DEFAULT_PLATFORM_PARAMS;
-    try {
-      const client = await this.oAuthClientRepository.getOAuthClient(clientId);
-      if (client) {
-        params.platformClientId = clientId;
-        params.platformCancelUrl = client.bookingCancelRedirectUri ?? "";
-        params.platformRescheduleUrl = client.bookingRescheduleRedirectUri ?? "";
-        params.platformBookingUrl = client.bookingRedirectUri ?? "";
-        params.arePlatformEmailsEnabled = client.areEmailsEnabled ?? false;
-      }
-      return params;
-    } catch (err) {
-      this.logger.error(err);
-      return params;
-    }
-  }
-
   transformGetBookingsFilters(queryParams: GetBookingsInput_2024_08_13) {
     return {
       attendeeEmail: queryParams.attendeeEmail,
@@ -473,17 +464,26 @@ export class InputBookingsService_2024_08_13 {
     const bodyTransformed = this.isCancelSeatedBody(body)
       ? await this.transformInputCancelSeatedBooking(bookingUid, body)
       : await this.transformInputCancelBooking(bookingUid, body);
-    const oAuthClientId = request.get(X_CAL_CLIENT_ID);
+
+    const booking = await this.bookingsRepository.getByUid(bodyTransformed.uid);
+    if (!booking) {
+      throw new NotFoundException(`Booking with uid=${bookingUid} not found`);
+    }
+
+    const oAuthClientParams = booking.eventTypeId
+      ? await this.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
 
     const newRequest = { ...request };
     const userId = (await this.createBookingRequestOwnerId(request)) ?? undefined;
-    const oAuthParams = oAuthClientId
-      ? await this.createBookingRequestOAuthClientParams(oAuthClientId)
-      : DEFAULT_PLATFORM_PARAMS;
 
-    Object.assign(newRequest, { userId, ...oAuthParams });
-
-    newRequest.body = { ...bodyTransformed, noEmail: !oAuthParams.arePlatformEmailsEnabled };
+    if (oAuthClientParams) {
+      Object.assign(newRequest, { userId, ...oAuthClientParams });
+      newRequest.body = { ...bodyTransformed, noEmail: !oAuthClientParams.arePlatformEmailsEnabled };
+    } else {
+      Object.assign(newRequest, { userId });
+      newRequest.body = { ...bodyTransformed, noEmail: false };
+    }
 
     return newRequest as unknown as BookingRequest;
   }
@@ -493,23 +493,38 @@ export class InputBookingsService_2024_08_13 {
   }
 
   async transformInputCancelBooking(bookingUid: string, inputBooking: CancelBookingInput_2024_08_13) {
-    let allRemainingBookings = false;
-    let uid = bookingUid;
-    const recurringBooking = await this.bookingsRepository.getRecurringByUidWithAttendeesAndUserAndEvent(
-      bookingUid
-    );
+    const recurringBooking = await this.bookingsRepository.getRecurringByUid(bookingUid);
+    // note(Lauris): isRecurring means that recurringEventId was passed as uid. isRecurring does not refer to the uid of 1 individual booking within a recurring booking consisting of many bookings.
+    // That is what recurringEventId refers to.
+    const isRecurringUid = !!recurringBooking.length;
 
-    if (recurringBooking.length) {
-      // note(Lauirs): this means that bookingUid is equal to recurringEventId on individual bookings of recurring one aka main recurring event
-      allRemainingBookings = true;
-      // note(Lauirs): we need to set uid as one of the individual recurring ids, not the main recurring event id
-      uid = recurringBooking[0].uid;
+    if (isRecurringUid && inputBooking.cancelSubsequentBookings) {
+      throw new BadRequestException(
+        "Cannot cancel subsequent bookings for recurring event - you have to provide uid of one of the individual bookings of a recurring booking."
+      );
+    }
+
+    if (isRecurringUid) {
+      return {
+        // note(Lauris): set uid as one of the oldest individual recurring ids
+        uid: recurringBooking[0].uid,
+        cancellationReason: inputBooking.cancellationReason,
+        allRemainingBookings: true,
+      };
+    }
+
+    if (inputBooking.cancelSubsequentBookings) {
+      return {
+        uid: bookingUid,
+        cancellationReason: inputBooking.cancellationReason,
+        cancelSubsequentBookings: true,
+      };
     }
 
     return {
-      uid,
+      uid: bookingUid,
       cancellationReason: inputBooking.cancellationReason,
-      allRemainingBookings,
+      allRemainingBookings: false,
     };
   }
 
@@ -517,23 +532,12 @@ export class InputBookingsService_2024_08_13 {
     bookingUid: string,
     inputBooking: CancelSeatedBookingInput_2024_08_13
   ) {
-    let allRemainingBookings = false;
-    let uid = bookingUid;
-    const recurringBooking = await this.bookingsRepository.getRecurringByUidWithAttendeesAndUserAndEvent(
-      bookingUid
-    );
-
-    if (recurringBooking.length) {
-      // note(Lauirs): this means that bookingUid is equal to recurringEventId on individual bookings of recurring one aka main recurring event
-      allRemainingBookings = true;
-      // note(Lauirs): we need to set uid as one of the individual recurring ids, not the main recurring event id
-      uid = recurringBooking[0].uid;
-    }
-
+    // note(Lauris): for recurring seated booking it is not possible to cancel all remaining bookings
+    // for an individual person, so api users need to call booking by booking using uid + seatUid to cancel it.
     return {
-      uid,
+      uid: bookingUid,
       cancellationReason: "",
-      allRemainingBookings,
+      allRemainingBookings: false,
       seatReferenceUid: inputBooking.seatUid,
     };
   }

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

@@ -4,6 +4,7 @@ import { plainToClass } from "class-transformer";
 import { DateTime } from "luxon";
 import { z } from "zod";
 
+import { bookingMetadataSchema } from "@calcom/platform-libraries";
 import {
   BookingOutput_2024_08_13,
   CreateRecurringSeatedBookingOutput_2024_08_13,
@@ -19,7 +20,13 @@ import { Booking, BookingSeat } from "@calcom/prisma/client";
 export const bookingResponsesSchema = z
   .object({
     email: z.string(),
-    name: z.string(),
+    name: z.union([
+      z.string(),
+      z.object({
+        firstName: z.string(),
+        lastName: z.string(),
+      }),
+    ]),
     guests: z.array(z.string()).optional(),
     rescheduleReason: z.string().optional(),
   })
@@ -30,12 +37,20 @@ export const seatedBookingResponsesSchema = z
     responses: z
       .object({
         email: z.string(),
-        name: z.string(),
+        name: z.union([
+          z.string(),
+          z.object({
+            firstName: z.string(),
+            lastName: z.string(),
+          }),
+        ]),
       })
       .passthrough(),
   })
   .passthrough();
 
+type DatabaseUser = { id: number; name: string | null; email: string; username: string | null };
+
 type DatabaseBooking = Booking & {
   eventType: {
     id: number;
@@ -49,9 +64,15 @@ type DatabaseBooking = Booking & {
     noShow: boolean | null;
     bookingSeat?: BookingSeat | null;
   }[];
-} & { user: { id: number; name: string | null; email: string } | null };
+  user: DatabaseUser | null;
+  createdAt: Date;
+};
 
-type BookingWithUser = Booking & { user: { id: number; name: string | null; email: string } | null };
+type BookingWithUser = Booking & { user: DatabaseUser | null };
+
+type DatabaseMetadata = z.infer<typeof bookingMetadataSchema>;
+
+const seatedBookingMetadataSchema = z.object({}).catchall(z.string());
 
 @Injectable()
 export class OutputBookingsService_2024_08_13 {
@@ -61,15 +82,16 @@ export class OutputBookingsService_2024_08_13 {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
-
     const bookingResponses = bookingResponsesSchema.parse(databaseBooking.responses);
+    const metadata = bookingMetadataSchema.parse(databaseBooking.metadata);
+    const location = metadata?.videoCallUrl || databaseBooking.location;
 
     const booking = {
       id: databaseBooking.id,
       uid: databaseBooking.uid,
       title: databaseBooking.title,
       description: databaseBooking.description,
-      hosts: [databaseBooking.user],
+      hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
       cancellationReason: databaseBooking.cancellationReason || undefined,
       reschedulingReason: bookingResponses?.rescheduledReason,
@@ -88,18 +110,44 @@ export class OutputBookingsService_2024_08_13 {
         absent: !!attendee.noShow,
       })),
       guests: bookingResponses.guests,
-      location: databaseBooking.location,
+      location,
       // note(Lauris): meetingUrl is deprecated
-      meetingUrl: databaseBooking.location,
+      meetingUrl: location,
       absentHost: !!databaseBooking.noShowHost,
+      createdAt: databaseBooking.createdAt,
     };
 
     const bookingTransformed = plainToClass(BookingOutput_2024_08_13, booking, { strategy: "excludeAll" });
-    // note(Lauris): I don't know why plainToClass erases bookings responses so attaching manually
+    // note(Lauris): I don't know why plainToClass erases bookings responses and metadata so attaching manually
     bookingTransformed.bookingFieldsResponses = bookingResponses;
+    bookingTransformed.metadata = this.getUserDefinedMetadata(metadata);
     return bookingTransformed;
   }
 
+  getUserDefinedMetadata(databaseMetadata: DatabaseMetadata) {
+    if (databaseMetadata === null) return {};
+
+    const { videoCallUrl, ...userDefinedMetadata } = databaseMetadata;
+
+    return userDefinedMetadata;
+  }
+
+  getHost(user: DatabaseUser | null) {
+    if (!user) {
+      return {
+        id: "unknown",
+        name: "unknown",
+        email: "unknown",
+        username: "unknown",
+      };
+    }
+
+    return {
+      ...user,
+      username: user.username || "unknown",
+    };
+  }
+
   async getOutputRecurringBookings(bookingsIds: number[]) {
     const transformed = [];
 
@@ -119,15 +167,16 @@ export class OutputBookingsService_2024_08_13 {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
-
     const bookingResponses = bookingResponsesSchema.parse(databaseBooking.responses);
+    const metadata = bookingMetadataSchema.parse(databaseBooking.metadata);
+    const location = metadata?.videoCallUrl || databaseBooking.location;
 
     const booking = {
       id: databaseBooking.id,
       uid: databaseBooking.uid,
       title: databaseBooking.title,
       description: databaseBooking.description,
-      hosts: [databaseBooking.user],
+      hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
       cancellationReason: databaseBooking.cancellationReason || undefined,
       reschedulingReason: bookingResponses?.rescheduledReason,
@@ -146,15 +195,22 @@ export class OutputBookingsService_2024_08_13 {
         absent: !!attendee.noShow,
       })),
       guests: bookingResponses.guests,
-      location: databaseBooking.location,
+      location,
       // note(Lauris): meetingUrl is deprecated
-      meetingUrl: databaseBooking.location,
+      meetingUrl: location,
       recurringBookingUid: databaseBooking.recurringEventId,
       absentHost: !!databaseBooking.noShowHost,
       bookingFieldsResponses: databaseBooking.responses,
+      createdAt: databaseBooking.createdAt,
     };
 
-    return plainToClass(RecurringBookingOutput_2024_08_13, booking, { strategy: "excludeAll" });
+    const bookingTransformed = plainToClass(RecurringBookingOutput_2024_08_13, booking, {
+      strategy: "excludeAll",
+    });
+    // note(Lauris): I don't know why plainToClass erases bookings responses and metadata so attaching manually
+    bookingTransformed.bookingFieldsResponses = bookingResponses;
+    bookingTransformed.metadata = this.getUserDefinedMetadata(metadata);
+    return bookingTransformed;
   }
 
   getOutputCreateSeatedBooking(
@@ -169,13 +225,15 @@ export class OutputBookingsService_2024_08_13 {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
+    const metadata = bookingMetadataSchema.parse(databaseBooking.metadata);
+    const location = metadata?.videoCallUrl || databaseBooking.location;
 
     const booking = {
       id: databaseBooking.id,
       uid: databaseBooking.uid,
       title: databaseBooking.title,
       description: databaseBooking.description,
-      hosts: [databaseBooking.user],
+      hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
       rescheduledFromUid: databaseBooking.fromReschedule || undefined,
       start: databaseBooking.startTime,
@@ -185,10 +243,11 @@ export class OutputBookingsService_2024_08_13 {
       // note(Lauris): eventTypeId is deprecated
       eventTypeId: databaseBooking.eventTypeId,
       attendees: [],
-      location: databaseBooking.location,
+      location,
       // note(Lauris): meetingUrl is deprecated
-      meetingUrl: databaseBooking.location,
+      meetingUrl: location,
       absentHost: !!databaseBooking.noShowHost,
+      createdAt: databaseBooking.createdAt,
     };
 
     const parsed = plainToClass(GetSeatedBookingOutput_2024_08_13, booking, { strategy: "excludeAll" });
@@ -208,6 +267,7 @@ export class OutputBookingsService_2024_08_13 {
       };
       const attendeeParsed = plainToClass(SeatedAttendee, attendeeData, { strategy: "excludeAll" });
       attendeeParsed.bookingFieldsResponses = responses || {};
+      attendeeParsed.metadata = seatedBookingMetadataSchema.parse(attendee.bookingSeat?.metadata);
       // note(Lauris): as of now email is not returned for privacy
       delete attendeeParsed.bookingFieldsResponses.email;
 
@@ -260,13 +320,15 @@ export class OutputBookingsService_2024_08_13 {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
+    const metadata = bookingMetadataSchema.parse(databaseBooking.metadata);
+    const location = metadata?.videoCallUrl || databaseBooking.location;
 
     const booking = {
       id: databaseBooking.id,
       uid: databaseBooking.uid,
       title: databaseBooking.title,
       description: databaseBooking.description,
-      hosts: [databaseBooking.user],
+      hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
       cancellationReason: databaseBooking.cancellationReason || undefined,
       rescheduledFromUid: databaseBooking.fromReschedule || undefined,
@@ -277,11 +339,12 @@ export class OutputBookingsService_2024_08_13 {
       // note(Lauris): eventTypeId is deprecated
       eventTypeId: databaseBooking.eventTypeId,
       attendees: [],
-      location: databaseBooking.location,
+      location,
       // note(Lauris): meetingUrl is deprecated
-      meetingUrl: databaseBooking.location,
+      meetingUrl: location,
       recurringBookingUid: databaseBooking.recurringEventId,
       absentHost: !!databaseBooking.noShowHost,
+      createdAt: databaseBooking.createdAt,
     };
 
     const parsed = plainToClass(GetRecurringSeatedBookingOutput_2024_08_13, booking, {
@@ -303,9 +366,9 @@ export class OutputBookingsService_2024_08_13 {
       };
       const attendeeParsed = plainToClass(SeatedAttendee, attendeeData, { strategy: "excludeAll" });
       attendeeParsed.bookingFieldsResponses = responses || {};
+      attendeeParsed.metadata = seatedBookingMetadataSchema.parse(attendee.bookingSeat?.metadata);
       // note(Lauris): as of now email is not returned for privacy
       delete attendeeParsed.bookingFieldsResponses.email;
-
       return attendeeParsed;
     });
 

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

@@ -10,7 +10,8 @@ import { Injectable } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { Prisma } from "@prisma/client";
 import { Request } from "express";
-import { google } from "googleapis";
+import { OAuth2Client } from "googleapis-common";
+import { calendar_v3 } from "@googleapis/calendar";
 import { z } from "zod";
 
 import { SUCCESS_STATUS, GOOGLE_CALENDAR_TYPE } from "@calcom/platform-constants";
@@ -78,7 +79,7 @@ export class GoogleCalendarService implements OAuthCalendarApp {
 
     const { client_id, client_secret } = this.gcalResponseSchema.parse(app.keys);
 
-    const oAuth2Client = new google.auth.OAuth2(client_id, client_secret, redirectUri);
+    const oAuth2Client = new OAuth2Client(client_id, client_secret, redirectUri);
     return oAuth2Client;
   }
 
@@ -134,8 +135,7 @@ export class GoogleCalendarService implements OAuthCalendarApp {
 
     oAuth2Client.setCredentials(key);
 
-    const calendar = google.calendar({
-      version: "v3",
+    const calendar = new calendar_v3.Calendar({
       auth: oAuth2Client,
     });
 

apps/api/v2/src/ee/event-types/event-types_2024_04_15/event-types.repository.ts

@@ -78,4 +78,11 @@ export class EventTypesRepository_2024_04_15 {
   async deleteEventType(eventTypeId: number) {
     return this.dbWrite.prisma.eventType.delete({ where: { id: eventTypeId } });
   }
+
+  async getEventTypeWithDuration(eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: { id: eventTypeId },
+      select: { length: true },
+    });
+  }
 }

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

@@ -10,10 +10,12 @@ import { UsersModule } from "@/modules/users/users.module";
 import { INestApplication } from "@nestjs/common";
 import { NestExpressApplication } from "@nestjs/platform-express";
 import { Test } from "@nestjs/testing";
-import { PlatformOAuthClient, Team, User, Schedule } from "@prisma/client";
+import { PlatformOAuthClient, Team, User, Schedule, EventType } 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 { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
@@ -75,18 +77,22 @@ describe("Event types Endpoints", () => {
     let teamRepositoryFixture: TeamRepositoryFixture;
     let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
     let schedulesRepostoryFixture: SchedulesRepositoryFixture;
-
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
     const userEmail = "event-types-test-e2e@api.com";
     const falseTestEmail = "false-event-types@api.com";
     const name = "bob-the-builder";
     const username = name;
     let eventType: EventTypeOutput_2024_06_14;
     let user: User;
+    let orgUser: User;
     let falseTestUser: User;
     let firstSchedule: Schedule;
     let secondSchedule: Schedule;
     let falseTestSchedule: Schedule;
-
+    let orgUserEventType1: EventType;
+    let orgUserEventType2: EventType;
+    let orgUserEventType3: EventType;
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
         userEmail,
@@ -109,8 +115,12 @@ describe("Event types Endpoints", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
       schedulesRepostoryFixture = new SchedulesRepositoryFixture(moduleRef);
-
-      organization = await teamRepositoryFixture.create({ name: "organization" });
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+      organization = await teamRepositoryFixture.create({
+        name: "organization",
+        slug: "event-type-2024-06-14-org-slug",
+      });
       oAuthClient = await createOAuthClient(organization.id);
       user = await userRepositoryFixture.create({
         email: userEmail,
@@ -118,6 +128,49 @@ describe("Event types Endpoints", () => {
         username,
       });
 
+      orgUser = await userRepositoryFixture.create({
+        email: "event-types-2024-06-14-org-user@example.com",
+        name: "event-types-2024-06-14-org-user",
+        username: "event-types-2024-06-14-org-user",
+      });
+
+      profileRepositoryFixture.create({
+        uid: `usr-${orgUser.id}`,
+        username: orgUser.username as string,
+        organization: {
+          connect: {
+            id: organization.id,
+          },
+        },
+        user: {
+          connect: {
+            id: orgUser.id,
+          },
+        },
+      });
+
+      orgUserEventType1 = await eventTypesRepositoryFixture.create(
+        { title: "orgUserEventType1", slug: "org-event-type-1", length: 60, locations: [] },
+        orgUser.id
+      );
+
+      orgUserEventType2 = await eventTypesRepositoryFixture.create(
+        { title: "orgUserEventType2", slug: "org-event-type-2", length: 60, locations: [] },
+        orgUser.id
+      );
+
+      orgUserEventType3 = await eventTypesRepositoryFixture.create(
+        { title: "orgUserEventType3", slug: "org-event-type-3", length: 60, locations: [] },
+        orgUser.id
+      );
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: orgUser.id } },
+        team: { connect: { id: organization.id } },
+        accepted: true,
+      });
+
       falseTestUser = await userRepositoryFixture.create({
         email: falseTestEmail,
         name: "false-test",
@@ -342,7 +395,7 @@ describe("Event types Endpoints", () => {
         });
     });
 
-    it(`/GET/even-types by username`, async () => {
+    it(`/GET/event-types by username`, async () => {
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types?username=${username}`)
         .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
@@ -386,6 +439,61 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType.color).toEqual(eventType.color);
     });
 
+    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)
+        // note: bearer token value mocked using "withAccessTokenAuth" for user which id is used when creating event type above
+        .set("Authorization", `Bearer whatever`)
+        .expect(200);
+
+      const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14[]> = response.body;
+
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+      expect(responseBody.data?.length).toEqual(3);
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType1.id)?.id).toBeDefined();
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType2.id)?.id).toBeDefined();
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType3.id)?.id).toBeDefined();
+    });
+
+    it(`/GET/event-types by username and orgSlug and eventSlug`, async () => {
+      const response = await request(app.getHttpServer())
+        .get(
+          `/api/v2/event-types?username=${orgUser.username}&orgSlug=${organization.slug}&eventSlug=${orgUserEventType1.slug}`
+        )
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        // note: bearer token value mocked using "withAccessTokenAuth" for user which id is used when creating event type above
+        .set("Authorization", `Bearer whatever`)
+        .expect(200);
+
+      const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14[]> = response.body;
+
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+      expect(responseBody.data?.length).toEqual(1);
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType1.id)?.id).toBeDefined();
+    });
+
+    it(`/GET/event-types by username and orgId`, async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/api/v2/event-types?username=${orgUser.username}&orgId=${organization.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        // note: bearer token value mocked using "withAccessTokenAuth" for user which id is used when creating event type above
+        .set("Authorization", `Bearer whatever`)
+        .expect(200);
+
+      const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14[]> = response.body;
+
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+      expect(responseBody.data?.length).toEqual(3);
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType1.id)?.id).toBeDefined();
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType2.id)?.id).toBeDefined();
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType3.id)?.id).toBeDefined();
+    });
+
     it("should return an error when creating an event type with seats enabled and multiple locations", async () => {
       const body: CreateEventTypeInput_2024_06_14 = {
         title: "Coding class 2",
@@ -919,6 +1027,12 @@ describe("Event types Endpoints", () => {
       } catch (e) {
         // User might have been deleted by the test
       }
+
+      try {
+        await userRepositoryFixture.delete(orgUser.id);
+      } catch (e) {
+        // User might have been deleted by the test
+      }
       await app.close();
     });
   });

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

@@ -74,8 +74,13 @@ export class EventTypesService_2024_06_14 {
     await this.checkUserOwnsSchedule(userId, body.scheduleId);
   }
 
-  async getEventTypeByUsernameAndSlug(username: string, eventTypeSlug: string) {
-    const user = await this.usersRepository.findByUsername(username);
+  async getEventTypeByUsernameAndSlug(
+    username: string,
+    eventTypeSlug: string,
+    orgSlug?: string,
+    orgId?: number
+  ) {
+    const user = await this.usersRepository.findByUsername(username, orgSlug, orgId);
     if (!user) {
       return null;
     }
@@ -92,8 +97,8 @@ export class EventTypesService_2024_06_14 {
     };
   }
 
-  async getEventTypesByUsername(username: string) {
-    const user = await this.usersRepository.findByUsername(username);
+  async getEventTypesByUsername(username: string, orgSlug?: string, orgId?: number) {
+    const user = await this.usersRepository.findByUsername(username, orgSlug, orgId);
     if (!user) {
       return [];
     }
@@ -152,27 +157,26 @@ export class EventTypesService_2024_06_14 {
   }
 
   async getEventTypes(queryParams: GetEventTypesQuery_2024_06_14) {
-    const { username, eventSlug, usernames } = queryParams;
-
+    const { username, eventSlug, usernames, orgSlug, orgId } = queryParams;
     if (username && eventSlug) {
-      const eventType = await this.getEventTypeByUsernameAndSlug(username, eventSlug);
+      const eventType = await this.getEventTypeByUsernameAndSlug(username, eventSlug, orgSlug, orgId);
       return eventType ? [eventType] : [];
     }
 
     if (username) {
-      return await this.getEventTypesByUsername(username);
+      return await this.getEventTypesByUsername(username, orgSlug, orgId);
     }
 
     if (usernames) {
-      const dynamicEventType = await this.getDynamicEventType(usernames);
+      const dynamicEventType = await this.getDynamicEventType(usernames, orgSlug, orgId);
       return [dynamicEventType];
     }
 
     return [];
   }
 
-  async getDynamicEventType(usernames: string[]) {
-    const users = await this.usersService.getByUsernames(usernames);
+  async getDynamicEventType(usernames: string[], orgSlug?: string, orgId?: number) {
+    const users = await this.usersService.getByUsernames(usernames, orgSlug, orgId);
     const usersFiltered: UserWithProfile[] = [];
     for (const user of users) {
       if (user) {

apps/api/v2/src/ee/gcal/gcal.controller.ts

@@ -27,10 +27,7 @@ import {
 } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
-import { Prisma } from "@prisma/client";
 import { Request } from "express";
-import { google } from "googleapis";
-import { z } from "zod";
 
 import { APPS_READ, GOOGLE_CALENDAR_TYPE, SUCCESS_STATUS } from "@calcom/platform-constants";
 

apps/api/v2/src/lib/logger.ts

@@ -1,6 +1,6 @@
 import { WinstonTransport as AxiomTransport } from "@axiomhq/winston";
 import type { LoggerOptions } from "winston";
-import { format, transports as Transports } from "winston";
+import { format, transports as Transports, config } from "winston";
 import type Transport from "winston-transport";
 
 const formattedTimestamp = format.timestamp({
@@ -8,14 +8,7 @@ const formattedTimestamp = format.timestamp({
 });
 
 const colorizer = format.colorize({
-  colors: {
-    fatal: "red",
-    error: "red",
-    warn: "yellow",
-    info: "blue",
-    debug: "white",
-    trace: "grey",
-  },
+  colors: config.npm.colors,
 });
 
 const WINSTON_DEV_FORMAT = format.combine(
@@ -26,14 +19,7 @@ const WINSTON_DEV_FORMAT = format.combine(
 );
 const WINSTON_PROD_FORMAT = format.combine(format.errors({ stack: true }), formattedTimestamp, format.json());
 
-export const logLevels = {
-  fatal: 0,
-  error: 1,
-  warn: 2,
-  info: 3,
-  debug: 4,
-  trace: 5,
-} as const;
+export const logLevels = config.npm.levels;
 
 export const loggerConfig = (): LoggerOptions => {
   const isProduction = process.env.NODE_ENV === "production";

apps/api/v2/src/lib/throttler-guard.ts

@@ -56,7 +56,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
     const request = context.switchToHttp().getRequest<Request>();
     const response = context.switchToHttp().getResponse<Response>();
     const tracker = await this.getTracker(request);
-    this.logger.log(
+    this.logger.verbose(
       `Tracker "${tracker}" generated based on: Bearer token "${request.get(
         "Authorization"
       )}", OAuth client ID "${request.get(X_CAL_CLIENT_ID)}" and IP "${request.ip}"`
@@ -89,7 +89,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
 
   private async handleNonApiKeyRequest(tracker: string, response: Response): Promise<boolean> {
     const rateLimit = this.getDefaultRateLimit(tracker);
-    this.logger.log(`Tracker "${tracker}" uses default rate limits because it is not tracking api key:
+    this.logger.verbose(`Tracker "${tracker}" uses default rate limits because it is not tracking api key:
       ${JSON.stringify(rateLimit, null, 2)}
     `);
 
@@ -135,7 +135,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
 
     const cachedRateLimits = await this.storageService.redis.get(cacheKey);
     if (cachedRateLimits) {
-      this.logger.log(`Tracker "${tracker}" rate limits retrieved from redis cache:
+      this.logger.verbose(`Tracker "${tracker}" rate limits retrieved from redis cache:
         ${cachedRateLimits}
       `);
       return rateLimitsSchema.parse(JSON.parse(cachedRateLimits));
@@ -158,13 +158,13 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
     });
 
     if (rateLimits) {
-      this.logger.log(`Tracker "${tracker}" rate limits retrieved from database:
+      this.logger.verbose(`Tracker "${tracker}" rate limits retrieved from database:
         ${JSON.stringify(rateLimits, null, 2)}`);
     }
 
     if (!rateLimits || rateLimits.length === 0) {
       rateLimits = [this.getDefaultRateLimit(tracker)];
-      this.logger.log(`Tracker "${tracker}" rate limits not found in database. Using default rate limits:
+      this.logger.verbose(`Tracker "${tracker}" rate limits not found in database. Using default rate limits:
         ${JSON.stringify(rateLimits, null, 2)}`);
     }
 
@@ -194,10 +194,10 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
     );
     response.setHeader(`X-RateLimit-Reset-${nameFirstUpper}`, timeToBlockExpire || timeToExpire);
 
-    this.logger.log(
+    this.logger.verbose(
       `Tracker "${tracker}" rate limit "${name}" incremented. isBlocked ${isBlocked}, totalHits ${totalHits}, timeToExpire ${timeToExpire}, timeToBlockExpire ${timeToBlockExpire}`
     );
-    this.logger.log(
+    this.logger.verbose(
       `Tracker "${tracker}" rate limit "${name}" response headers:
         X-RateLimit-Limit-${nameFirstUpper}: ${limit},
         X-RateLimit-Remaining-${nameFirstUpper}: ${timeToBlockExpire ? 0 : Math.max(0, limit - totalHits)},
@@ -227,7 +227,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
       return `ip_${request.ip}`;
     }
 
-    this.logger.log(`no tracker found: ${request.url}`);
+    this.logger.verbose(`no tracker found: ${request.url}`);
     return "unknown";
   }
 }

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

@@ -1,6 +1,6 @@
 import { AppsRepository } from "@/modules/apps/apps.repository";
 import { Injectable, Logger, NotFoundException } from "@nestjs/common";
-import { google } from "googleapis";
+import { OAuth2Client } from "googleapis-common";
 import { z } from "zod";
 
 @Injectable()
@@ -21,7 +21,7 @@ export class GCalService {
 
     const { client_id, client_secret } = this.gcalResponseSchema.parse(app.keys);
 
-    const oAuth2Client = new google.auth.OAuth2(client_id, client_secret, redirectUri);
+    const oAuth2Client = new OAuth2Client(client_id, client_secret, redirectUri);
     return oAuth2Client;
   }
 }

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

@@ -49,7 +49,7 @@ export class PlatformPlanGuard implements CanActivate {
         canAccess = hasMinimumPlan({
           currentPlan: team.platformBilling?.plan as PlatformPlanType,
           minimumPlan: minimumPlan,
-          plans: ["STARTER", "ESSENTIALS", "SCALE", "ENTERPRISE"],
+          plans: ["FREE", "STARTER", "ESSENTIALS", "SCALE", "ENTERPRISE"],
         });
       }
     }

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

@@ -16,6 +16,7 @@ import { Test } from "@nestjs/testing";
 import { PlatformOAuthClient, Team, User, EventType } 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 { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
@@ -79,6 +80,7 @@ describe("OAuth Client Users Endpoints", () => {
     let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
     let schedulesRepositoryFixture: SchedulesRepositoryFixture;
     let profilesRepositoryFixture: ProfileRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
 
     let postResponseData: CreateManagedUserOutput["data"];
 
@@ -103,26 +105,33 @@ describe("OAuth Client Users Endpoints", () => {
       eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
       schedulesRepositoryFixture = new SchedulesRepositoryFixture(moduleRef);
       profilesRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
 
       platformAdmin = await userRepositoryFixture.create({ email: platformAdminEmail });
 
-      organization = await teamRepositoryFixture.create({ name: "organization" });
+      organization = await teamRepositoryFixture.create({
+        name: "organization",
+        isPlatform: true,
+        isOrganization: true,
+      });
       oAuthClient = await createOAuthClient(organization.id);
 
       await profilesRepositoryFixture.create({
-        uid: "asd-asd",
+        uid: "asd1qwwqeqw-asddsadasd",
         username: platformAdminEmail,
         organization: { connect: { id: organization.id } },
-        movedFromUser: {
-          connect: {
-            id: platformAdmin.id,
-          },
-        },
         user: {
           connect: { id: platformAdmin.id },
         },
       });
 
+      await membershipsRepositoryFixture.create({
+        role: "OWNER",
+        user: { connect: { id: platformAdmin.id } },
+        team: { connect: { id: organization.id } },
+        accepted: true,
+      });
+
       await app.init();
     });
 
@@ -370,7 +379,7 @@ describe("OAuth Client Users Endpoints", () => {
     let teamRepositoryFixture: TeamRepositoryFixture;
     let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
     let profileRepositoryFixture: ProfileRepositoryFixture;
-
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
     let postResponseData: CreateManagedUserOutput["data"];
 
     const userEmail = "oauth-client-users-user@gmail.com";
@@ -390,10 +399,11 @@ describe("OAuth Client Users Endpoints", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
       profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
-
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
       organization = await teamRepositoryFixture.create({
         name: "Testy Organization",
         isOrganization: true,
+        isPlatform: true,
       });
 
       owner = await userRepositoryFixture.create({
@@ -417,6 +427,13 @@ describe("OAuth Client Users Endpoints", () => {
         },
       });
 
+      await membershipsRepositoryFixture.create({
+        role: "OWNER",
+        user: { connect: { id: owner.id } },
+        team: { connect: { id: organization.id } },
+        accepted: true,
+      });
+
       oAuthClient1 = await createOAuthClient(organization.id);
       oAuthClient2 = await createOAuthClient(organization.id);
 

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

@@ -1,6 +1,8 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
 import { Locales } from "@/lib/enums/locales";
+import { MembershipRoles } from "@/modules/auth/decorators/roles/membership-roles.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { OrganizationRolesGuard } from "@/modules/auth/guards/organization-roles/organization-roles.guard";
 import { CreateManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/create-managed-user.output";
 import { GetManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-user.output";
 import { GetManagedUsersOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-users.output";
@@ -29,7 +31,7 @@ import {
   NotFoundException,
 } from "@nestjs/common";
 import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
-import { User } from "@prisma/client";
+import { User, MembershipRole } from "@prisma/client";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import { Pagination } from "@calcom/platform-types";
@@ -38,7 +40,7 @@ import { Pagination } from "@calcom/platform-types";
   path: "/v2/oauth-clients/:clientId/users",
   version: API_VERSIONS_VALUES,
 })
-@UseGuards(ApiAuthGuard, OAuthClientGuard)
+@UseGuards(ApiAuthGuard, OAuthClientGuard, OrganizationRolesGuard)
 @DocsTags("Platform / Managed Users")
 export class OAuthClientUsersController {
   private readonly logger = new Logger("UserController");
@@ -52,6 +54,7 @@ export class OAuthClientUsersController {
 
   @Get("/")
   @ApiOperation({ summary: "Get all managed users" })
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   async getManagedUsers(
     @Param("clientId") oAuthClientId: string,
     @Query() queryParams: Pagination
@@ -73,6 +76,7 @@ export class OAuthClientUsersController {
 
   @Post("/")
   @ApiOperation({ summary: "Create a managed user" })
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   async createUser(
     @Param("clientId") oAuthClientId: string,
     @Body() body: CreateManagedUserInput
@@ -104,6 +108,7 @@ export class OAuthClientUsersController {
   @Get("/:userId")
   @HttpCode(HttpStatus.OK)
   @ApiOperation({ summary: "Get a managed user" })
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   async getUserById(
     @Param("clientId") clientId: string,
     @Param("userId") userId: number
@@ -119,6 +124,7 @@ export class OAuthClientUsersController {
   @Patch("/:userId")
   @HttpCode(HttpStatus.OK)
   @ApiOperation({ summary: "Update a managed user" })
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   async updateUser(
     @Param("clientId") clientId: string,
     @Param("userId") userId: number,
@@ -138,6 +144,7 @@ export class OAuthClientUsersController {
   @Delete("/:userId")
   @HttpCode(HttpStatus.OK)
   @ApiOperation({ summary: "Delete a managed user" })
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   async deleteUser(
     @Param("clientId") clientId: string,
     @Param("userId") userId: number
@@ -155,7 +162,12 @@ export class OAuthClientUsersController {
 
   @Post("/:userId/force-refresh")
   @HttpCode(HttpStatus.OK)
-  @ApiOperation({ summary: "Force refresh tokens" })
+  @ApiOperation({
+    summary: "Force refresh tokens",
+    description: `If you have lost managed user access or refresh token, then you can get new ones by using OAuth credentials.
+    Each access token is valid for 60 minutes and each refresh token for 1 year. Make sure to store them later in your database, for example, by updating the User model to have \`calAccessToken\` and \`calRefreshToken\` columns.`,
+  })
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   async forceRefresh(
     @Param("userId") userId: number,
     @Param("clientId") oAuthClientId: string

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

@@ -24,10 +24,10 @@ import { withNextAuth } from "test/utils/withNextAuth";
 
 import { PlatformOAuthClient, Team, Webhook } from "@calcom/prisma/client";
 
-describe("EventTypes WebhooksController (e2e)", () => {
+describe("OAuth client WebhooksController (e2e)", () => {
   let app: INestApplication;
-  const userEmail = "event-types-webhook-controller-e2e@api.com";
-  const otherUserEmail = "other-event-types-webhook-controller-e2e@api.com";
+  const userEmail = "oauth-client-webhook-controller-e2e@api.com";
+  const otherUserEmail = "other-oauth-client-webhook-controller-e2e@api.com";
   let user: UserWithProfile;
   let otherUser: UserWithProfile;
   let oAuthClient: PlatformOAuthClient;

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

@@ -30,6 +30,7 @@ import {
   ApiExcludeEndpoint as DocsExcludeEndpoint,
   ApiBadRequestResponse as DocsBadRequestResponse,
   ApiHeader as DocsHeader,
+  ApiOperation,
 } from "@nestjs/swagger";
 import { Response as ExpressResponse } from "express";
 
@@ -39,7 +40,6 @@ import { SUCCESS_STATUS, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
   path: "/v2/oauth/:clientId",
   version: API_VERSIONS_VALUES,
 })
-@DocsTags("OAuth")
 export class OAuthFlowController {
   constructor(
     private readonly oauthClientRepository: OAuthClientRepository,
@@ -115,13 +115,18 @@ export class OAuthFlowController {
   @Post("/refresh")
   @HttpCode(HttpStatus.OK)
   @UseGuards(ApiAuthGuard)
-  @DocsTags("Managed users")
+  @DocsTags("Platform / Managed Users")
   @DocsHeader({
     name: X_CAL_SECRET_KEY,
     description: "OAuth client secret key.",
     required: true,
   })
-  async refreshAccessToken(
+  @ApiOperation({
+    summary: "Refresh managed user tokens",
+    description: `If managed user access token is expired then get a new one using this endpoint. Each access token is valid for 60 minutes and 
+    each refresh token for 1 year. Make sure to store them later in your database, for example, by updating the User model to have \`calAccessToken\` and \`calRefreshToken\` columns.`,
+  })
+  async refreshTokens(
     @Param("clientId") clientId: string,
     @Headers(X_CAL_SECRET_KEY) secretKey: string,
     @Body() body: RefreshTokenInput

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

@@ -99,4 +99,28 @@ export class OAuthClientRepository {
       where: { id: clientId },
     });
   }
+
+  async getByUserId(userId: number) {
+    return this.dbRead.prisma.platformOAuthClient.findFirst({
+      where: {
+        users: {
+          some: {
+            id: userId,
+          },
+        },
+      },
+    });
+  }
+
+  async getByTeamId(teamId: number) {
+    return this.dbRead.prisma.platformOAuthClient.findFirst({
+      where: {
+        teams: {
+          some: {
+            id: teamId,
+          },
+        },
+      },
+    });
+  }
 }

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

@@ -5,6 +5,7 @@ import { ApiTags as DocsTags, ApiCreatedResponse, ApiOkResponse, ApiOperation }
 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";
@@ -89,9 +90,31 @@ export class SlotsController {
                 type: "array",
                 items: {
                   type: "object",
-                  properties: {
-                    time: { type: "string", format: "date-time", example: "2024-09-25T08:00:00.000Z" },
-                  },
+                  oneOf: [
+                    {
+                      properties: {
+                        time: {
+                          type: "string",
+                          format: "date-time",
+                          example: "2024-09-25T08:00:00.000Z",
+                        },
+                      },
+                    },
+                    {
+                      properties: {
+                        startTime: {
+                          type: "string",
+                          format: "date-time",
+                          example: "2024-09-25T08:00:00.000Z",
+                        },
+                        endTime: {
+                          type: "string",
+                          format: "date-time",
+                          example: "2024-09-25T08:30:00.000Z",
+                        },
+                      },
+                    },
+                  ],
                 },
               },
             },
@@ -102,11 +125,18 @@ export class SlotsController {
         status: "success",
         data: {
           slots: {
+            // Default format (when slotFormat is 'time' or not provided)
             "2024-09-25": [{ time: "2024-09-25T08:00:00.000Z" }, { time: "2024-09-25T08:15:00.000Z" }],
+            // Alternative format (when slotFormat is 'range')
             "2024-09-26": [
-              { time: "2024-09-26T08:00:00.000Z" },
-              { time: "2024-09-26T08:15:00.000Z" },
-              { time: "2024-09-26T08:30:00.000Z" },
+              {
+                startTime: "2024-09-26T08:00:00.000Z",
+                endTime: "2024-09-26T08:30:00.000Z",
+              },
+              {
+                startTime: "2024-09-26T08:15:00.000Z",
+                endTime: "2024-09-26T08:45:00.000Z",
+              },
             ],
           },
         },
@@ -129,8 +159,20 @@ export class SlotsController {
       },
     });
 
+    const transformedSlots =
+      query.slotFormat === SlotFormat.Range
+        ? await this.slotsService.formatSlots(
+            availableSlots,
+            query.duration,
+            query.eventTypeId,
+            query.slotFormat
+          )
+        : availableSlots.slots;
+
     return {
-      data: availableSlots,
+      data: {
+        slots: transformedSlots,
+      },
       status: SUCCESS_STATUS,
     };
   }

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

@@ -1,8 +1,9 @@
 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 } from "@nestjs/common";
+import { Injectable, NotFoundException, BadRequestException } from "@nestjs/common";
 import { v4 as uuid } from "uuid";
 
+import { SlotFormat } from "@calcom/platform-enums";
 import { ReserveSlotInput } from "@calcom/platform-types";
 
 @Injectable()
@@ -54,4 +55,51 @@ 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/users/inputs/update-managed-user.input.ts

@@ -14,7 +14,7 @@ export class UpdateManagedUserInput {
   name?: string;
 
   @IsOptional()
-  @IsIn(["12", "24"])
+  @IsIn([12, 24])
   @ApiProperty({ example: 12, enum: [12, 24], description: "Must be 12 or 24" })
   timeFormat?: TimeFormat;
 

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

@@ -7,9 +7,9 @@ import { User } from "@calcom/prisma/client";
 export class UsersService {
   constructor(private readonly usersRepository: UsersRepository) {}
 
-  async getByUsernames(usernames: string[]) {
+  async getByUsernames(usernames: string[], orgSlug?: string, orgId?: number) {
     const users = await Promise.all(
-      usernames.map((username) => this.usersRepository.findByUsername(username))
+      usernames.map((username) => this.usersRepository.findByUsername(username, orgSlug, orgId))
     );
     const usersFiltered: User[] = [];
 

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

@@ -142,11 +142,21 @@ export class UsersRepository {
     });
   }
 
-  async findByUsername(username: string) {
+  async findByUsername(username: string, orgSlug?: string, orgId?: number) {
     return this.dbRead.prisma.user.findFirst({
-      where: {
-        username,
-      },
+      where:
+        orgId || orgSlug
+          ? {
+              profiles: {
+                some: {
+                  organization: orgSlug ? { slug: orgSlug } : { id: orgId },
+                  username: username,
+                },
+              },
+            }
+          : {
+              username,
+            },
     });
   }
 

apps/api/v2/swagger/documentation.json

@@ -362,6 +362,7 @@
       "post": {
         "operationId": "OAuthClientUsersController_forceRefresh",
         "summary": "Force refresh tokens",
+        "description": "If you have lost managed user access or refresh token, then you can get new ones by using OAuth credentials.\n    Each access token is valid for 60 minutes and each refresh token for 1 year. Make sure to store them later in your database, for example, by updating the User model to have `calAccessToken` and `calRefreshToken` columns.",
         "parameters": [
           {
             "name": "userId",
@@ -397,6 +398,57 @@
         ]
       }
     },
+    "/v2/oauth/{clientId}/refresh": {
+      "post": {
+        "operationId": "OAuthFlowController_refreshTokens",
+        "summary": "Refresh managed user tokens",
+        "description": "If managed user access token is expired then get a new one using this endpoint. Each access token is valid for 60 minutes and \n    each refresh token for 1 year. Make sure to store them later in your database, for example, by updating the User model to have `calAccessToken` and `calRefreshToken` columns.",
+        "parameters": [
+          {
+            "name": "clientId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-secret-key",
+            "required": true,
+            "in": "header",
+            "description": "OAuth client secret key.",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RefreshTokenInput"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/KeysResponseDto"
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "Platform / Managed Users"
+        ]
+      }
+    },
     "/v2/oauth-clients/{clientId}/webhooks": {
       "post": {
         "operationId": "OAuthClientWebhooksController_createOAuthClientWebhook",
@@ -3162,6 +3214,7 @@
       "post": {
         "operationId": "BookingsController_2024_08_13_cancelBooking",
         "summary": "Cancel a booking",
+        "description": ":bookingUid can be :bookingUid of an usual booking, individual recurrence or recurring booking to cancel all recurrences.\n    For seated bookings to cancel one individual booking provide :bookingUid and :seatUid in the request body. For recurring seated bookings it is not possible to cancel all of them with 1 call\n    like with non-seated recurring bookings by providing recurring bookind uid - you have to cancel each recurrence booking by its bookingUid + seatUid.",
         "parameters": [
           {
             "name": "cal-api-version",
@@ -4006,6 +4059,15 @@
               "type": "string"
             }
           },
+          {
+            "name": "eventTypeId",
+            "required": false,
+            "in": "query",
+            "description": "Id of the event-type, if this is provided no other parameter is required",
+            "schema": {
+              "type": "number"
+            }
+          },
           {
             "name": "usernames",
             "required": false,
@@ -4014,6 +4076,33 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "userId",
+            "required": false,
+            "in": "query",
+            "description": "ID of the user you want the get the event-types of, username is not needed when using this parameter",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "orgSlug",
+            "required": false,
+            "in": "query",
+            "description": "slug of the user's organization if he is in one, orgId is not required if using this parameter",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "orgId",
+            "required": false,
+            "in": "query",
+            "description": "ID of the organization of the user you want the get the event-types of, orgSlug is not needed when using this parameter",
+            "schema": {
+              "type": "number"
+            }
           }
         ],
         "responses": {
@@ -4438,56 +4527,6 @@
         ]
       }
     },
-    "/v2/oauth/{clientId}/refresh": {
-      "post": {
-        "operationId": "OAuthFlowController_refreshAccessToken",
-        "parameters": [
-          {
-            "name": "clientId",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "x-cal-secret-key",
-            "required": true,
-            "in": "header",
-            "description": "OAuth client secret key.",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/RefreshTokenInput"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/KeysResponseDto"
-                }
-              }
-            }
-          }
-        },
-        "tags": [
-          "OAuth",
-          "Managed users"
-        ]
-      }
-    },
     "/v2/schedules": {
       "post": {
         "operationId": "SchedulesController_2024_06_11_createSchedule",
@@ -5002,6 +5041,20 @@
             "schema": {
               "type": "number"
             }
+          },
+          {
+            "name": "slotFormat",
+            "required": false,
+            "in": "query",
+            "description": "Format of slot times in response. Use 'range' to get start and end times.",
+            "example": "range",
+            "schema": {
+              "enum": [
+                "range",
+                "time"
+              ],
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -5025,13 +5078,31 @@
                             "type": "array",
                             "items": {
                               "type": "object",
-                              "properties": {
-                                "time": {
-                                  "type": "string",
-                                  "format": "date-time",
-                                  "example": "2024-09-25T08:00:00.000Z"
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "time": {
+                                      "type": "string",
+                                      "format": "date-time",
+                                      "example": "2024-09-25T08:00:00.000Z"
+                                    }
+                                  }
+                                },
+                                {
+                                  "properties": {
+                                    "startTime": {
+                                      "type": "string",
+                                      "format": "date-time",
+                                      "example": "2024-09-25T08:00:00.000Z"
+                                    },
+                                    "endTime": {
+                                      "type": "string",
+                                      "format": "date-time",
+                                      "example": "2024-09-25T08:30:00.000Z"
+                                    }
+                                  }
                                 }
-                              }
+                              ]
                             }
                           }
                         }
@@ -5052,13 +5123,12 @@
                         ],
                         "2024-09-26": [
                           {
-                            "time": "2024-09-26T08:00:00.000Z"
+                            "startTime": "2024-09-26T08:00:00.000Z",
+                            "endTime": "2024-09-26T08:30:00.000Z"
                           },
                           {
-                            "time": "2024-09-26T08:15:00.000Z"
-                          },
-                          {
-                            "time": "2024-09-26T08:30:00.000Z"
+                            "startTime": "2024-09-26T08:15:00.000Z",
+                            "endTime": "2024-09-26T08:45:00.000Z"
                           }
                         ]
                       }
@@ -6531,7 +6601,7 @@
           "rolling": {
             "type": "boolean",
             "example": true,
-            "description": "If true, the window will be rolling aka from the moment that someone is trying to book this event. Otherwise it will be specified amount of days from the current date."
+            "description": "\n      Determines the behavior of the booking window:\n      - If **true**, the window is rolling. This means the number of available days will always be equal the specified 'value' \n        and adjust dynamically as bookings are made. For example, if 'value' is 3 and availability is only on Mondays, \n        a booker attempting to schedule on November 10 will see slots on November 11, 18, and 25. As one of these days \n        becomes fully booked, a new day (e.g., December 2) will open up to ensure 3 available days are always visible.\n      - If **false**, the window is fixed. This means the booking window only considers the next 'value' days from the\n        moment someone is trying to book. For example, if 'value' is 3, availability is only on Mondays, and the current \n        date is November 10, the booker will only see slots on November 11 because the window is restricted to the next \n        3 calendar days (November 10–12).\n    "
           }
         },
         "required": [
@@ -6559,7 +6629,7 @@
           "rolling": {
             "type": "boolean",
             "example": true,
-            "description": "If true, the window will be rolling aka from the moment that someone is trying to book this event. Otherwise it will be specified amount of days from the current date."
+            "description": "\n      Determines the behavior of the booking window:\n      - If **true**, the window is rolling. This means the number of available days will always be equal the specified 'value' \n        and adjust dynamically as bookings are made. For example, if 'value' is 3 and availability is only on Mondays, \n        a booker attempting to schedule on November 10 will see slots on November 11, 18, and 25. As one of these days \n        becomes fully booked, a new day (e.g., December 2) will open up to ensure 3 available days are always visible.\n      - If **false**, the window is fixed. This means the booking window only considers the next 'value' days from the\n        moment someone is trying to book. For example, if 'value' is 3, availability is only on Mondays, and the current \n        date is November 10, the booker will only see slots on November 11 because the window is restricted to the next \n        3 calendar days (November 10–12).\n    "
           }
         },
         "required": [
@@ -12849,6 +12919,13 @@
             "description": "Location for this booking. Displayed in email and calendar event.",
             "example": "https://example.com/meeting"
           },
+          "metadata": {
+            "type": "object",
+            "description": "You can store any additional data you want here. Metadata must have at most 50 keys, each key up to 40 characters, and string values up to 500 characters.",
+            "example": {
+              "key": "value"
+            }
+          },
           "bookingFieldsResponses": {
             "type": "object",
             "description": "Booking field responses consisting of an object with booking field slug as keys and user response as values.",
@@ -12912,6 +12989,13 @@
             "description": "Location for this booking. Displayed in email and calendar event.",
             "example": "https://example.com/meeting"
           },
+          "metadata": {
+            "type": "object",
+            "description": "You can store any additional data you want here. Metadata must have at most 50 keys, each key up to 40 characters, and string values up to 500 characters.",
+            "example": {
+              "key": "value"
+            }
+          },
           "bookingFieldsResponses": {
             "type": "object",
             "description": "Booking field responses consisting of an object with booking field slug as keys and user response as values.",
@@ -12981,6 +13065,13 @@
             "description": "Location for this booking. Displayed in email and calendar event.",
             "example": "https://example.com/meeting"
           },
+          "metadata": {
+            "type": "object",
+            "description": "You can store any additional data you want here. Metadata must have at most 50 keys, each key up to 40 characters, and string values up to 500 characters.",
+            "example": {
+              "key": "value"
+            }
+          },
           "bookingFieldsResponses": {
             "type": "object",
             "description": "Booking field responses consisting of an object with booking field slug as keys and user response as values.",
@@ -13001,6 +13092,33 @@
           "attendee"
         ]
       },
+      "BookingHost": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "example": 1
+          },
+          "name": {
+            "type": "string",
+            "example": "Jane Doe"
+          },
+          "username": {
+            "type": "string",
+            "example": "jane100"
+          },
+          "timeZone": {
+            "type": "string",
+            "example": "America/Los_Angeles"
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "username",
+          "timeZone"
+        ]
+      },
       "EventType": {
         "type": "object",
         "properties": {
@@ -13040,7 +13158,7 @@
           "hosts": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/Host"
+              "$ref": "#/components/schemas/BookingHost"
             }
           },
           "status": {
@@ -13100,6 +13218,16 @@
             "type": "boolean",
             "example": true
           },
+          "createdAt": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "metadata": {
+            "type": "object",
+            "example": {
+              "key": "value"
+            }
+          },
           "attendees": {
             "type": "array",
             "items": {
@@ -13137,6 +13265,7 @@
           "eventTypeId",
           "eventType",
           "absentHost",
+          "createdAt",
           "attendees"
         ]
       },
@@ -13162,7 +13291,7 @@
           "hosts": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/Host"
+              "$ref": "#/components/schemas/BookingHost"
             }
           },
           "status": {
@@ -13222,6 +13351,16 @@
             "type": "boolean",
             "example": true
           },
+          "createdAt": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "metadata": {
+            "type": "object",
+            "example": {
+              "key": "value"
+            }
+          },
           "attendees": {
             "type": "array",
             "items": {
@@ -13263,6 +13402,342 @@
           "eventTypeId",
           "eventType",
           "absentHost",
+          "createdAt",
+          "attendees",
+          "recurringBookingUid"
+        ]
+      },
+      "SeatedAttendee": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "example": "John Doe"
+          },
+          "timeZone": {
+            "type": "string",
+            "example": "America/New_York"
+          },
+          "language": {
+            "type": "string",
+            "enum": [
+              "ar",
+              "ca",
+              "de",
+              "es",
+              "eu",
+              "he",
+              "id",
+              "ja",
+              "lv",
+              "pl",
+              "ro",
+              "sr",
+              "th",
+              "vi",
+              "az",
+              "cs",
+              "el",
+              "es-419",
+              "fi",
+              "hr",
+              "it",
+              "km",
+              "nl",
+              "pt",
+              "ru",
+              "sv",
+              "tr",
+              "zh-CN",
+              "bg",
+              "da",
+              "en",
+              "et",
+              "fr",
+              "hu",
+              "iw",
+              "ko",
+              "no",
+              "pt-BR",
+              "sk",
+              "ta",
+              "uk",
+              "zh-TW"
+            ],
+            "example": "en"
+          },
+          "absent": {
+            "type": "boolean",
+            "example": false
+          },
+          "seatUid": {
+            "type": "string",
+            "example": "3be561a9-31f1-4b8e-aefc-9d9a085f0dd1"
+          },
+          "bookingFieldsResponses": {
+            "type": "object",
+            "description": "Booking field responses consisting of an object with booking field slug as keys and user response as values.",
+            "example": {
+              "customField": "customValue"
+            }
+          },
+          "metadata": {
+            "type": "object",
+            "example": {
+              "key": "value"
+            }
+          }
+        },
+        "required": [
+          "name",
+          "timeZone",
+          "absent",
+          "seatUid"
+        ]
+      },
+      "CreateSeatedBookingOutput_2024_08_13": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "example": 123
+          },
+          "uid": {
+            "type": "string",
+            "example": "booking_uid_123"
+          },
+          "title": {
+            "type": "string",
+            "example": "Consultation"
+          },
+          "description": {
+            "type": "string",
+            "example": "Learn how to integrate scheduling into marketplace."
+          },
+          "hosts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BookingHost"
+            }
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "cancelled",
+              "accepted",
+              "rejected",
+              "pending"
+            ],
+            "example": "accepted"
+          },
+          "cancellationReason": {
+            "type": "string",
+            "example": "User requested cancellation"
+          },
+          "reschedulingReason": {
+            "type": "string",
+            "example": "User rescheduled the event"
+          },
+          "rescheduledFromUid": {
+            "type": "string",
+            "example": "previous_uid_123"
+          },
+          "start": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "end": {
+            "type": "string",
+            "example": "2024-08-13T16:30:00Z"
+          },
+          "duration": {
+            "type": "number",
+            "example": 60
+          },
+          "eventTypeId": {
+            "type": "number",
+            "example": 50,
+            "deprecated": true,
+            "description": "Deprecated - rely on 'eventType' object containing the id instead."
+          },
+          "eventType": {
+            "$ref": "#/components/schemas/EventType"
+          },
+          "meetingUrl": {
+            "type": "string",
+            "description": "Deprecated - rely on 'location' field instead.",
+            "example": "https://example.com/recurring-meeting",
+            "deprecated": true
+          },
+          "location": {
+            "type": "string",
+            "example": "https://example.com/meeting"
+          },
+          "absentHost": {
+            "type": "boolean",
+            "example": true
+          },
+          "createdAt": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "metadata": {
+            "type": "object",
+            "example": {
+              "key": "value"
+            }
+          },
+          "seatUid": {
+            "type": "string",
+            "example": "3be561a9-31f1-4b8e-aefc-9d9a085f0dd1"
+          },
+          "attendees": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeatedAttendee"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "uid",
+          "title",
+          "description",
+          "hosts",
+          "status",
+          "start",
+          "end",
+          "duration",
+          "eventTypeId",
+          "eventType",
+          "absentHost",
+          "createdAt",
+          "seatUid",
+          "attendees"
+        ]
+      },
+      "CreateRecurringSeatedBookingOutput_2024_08_13": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "example": 123
+          },
+          "uid": {
+            "type": "string",
+            "example": "booking_uid_123"
+          },
+          "title": {
+            "type": "string",
+            "example": "Consultation"
+          },
+          "description": {
+            "type": "string",
+            "example": "Learn how to integrate scheduling into marketplace."
+          },
+          "hosts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BookingHost"
+            }
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "cancelled",
+              "accepted",
+              "rejected",
+              "pending"
+            ],
+            "example": "accepted"
+          },
+          "cancellationReason": {
+            "type": "string",
+            "example": "User requested cancellation"
+          },
+          "reschedulingReason": {
+            "type": "string",
+            "example": "User rescheduled the event"
+          },
+          "rescheduledFromUid": {
+            "type": "string",
+            "example": "previous_uid_123"
+          },
+          "start": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "end": {
+            "type": "string",
+            "example": "2024-08-13T16:30:00Z"
+          },
+          "duration": {
+            "type": "number",
+            "example": 60
+          },
+          "eventTypeId": {
+            "type": "number",
+            "example": 50,
+            "deprecated": true,
+            "description": "Deprecated - rely on 'eventType' object containing the id instead."
+          },
+          "eventType": {
+            "$ref": "#/components/schemas/EventType"
+          },
+          "meetingUrl": {
+            "type": "string",
+            "description": "Deprecated - rely on 'location' field instead.",
+            "example": "https://example.com/recurring-meeting",
+            "deprecated": true
+          },
+          "location": {
+            "type": "string",
+            "example": "https://example.com/meeting"
+          },
+          "absentHost": {
+            "type": "boolean",
+            "example": true
+          },
+          "createdAt": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "metadata": {
+            "type": "object",
+            "example": {
+              "key": "value"
+            }
+          },
+          "seatUid": {
+            "type": "string",
+            "example": "3be561a9-31f1-4b8e-aefc-9d9a085f0dd1"
+          },
+          "attendees": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeatedAttendee"
+            }
+          },
+          "recurringBookingUid": {
+            "type": "string",
+            "example": "recurring_uid_987"
+          }
+        },
+        "required": [
+          "id",
+          "uid",
+          "title",
+          "description",
+          "hosts",
+          "status",
+          "start",
+          "end",
+          "duration",
+          "eventTypeId",
+          "eventType",
+          "absentHost",
+          "createdAt",
+          "seatUid",
           "attendees",
           "recurringBookingUid"
         ]
@@ -13288,6 +13763,15 @@
                 "items": {
                   "$ref": "#/components/schemas/RecurringBookingOutput_2024_08_13"
                 }
+              },
+              {
+                "$ref": "#/components/schemas/CreateSeatedBookingOutput_2024_08_13"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/CreateRecurringSeatedBookingOutput_2024_08_13"
+                }
               }
             ],
             "description": "Booking data, which can be either a BookingOutput object or an array of RecurringBookingOutput objects"
@@ -13298,6 +13782,243 @@
           "data"
         ]
       },
+      "GetSeatedBookingOutput_2024_08_13": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "example": 123
+          },
+          "uid": {
+            "type": "string",
+            "example": "booking_uid_123"
+          },
+          "title": {
+            "type": "string",
+            "example": "Consultation"
+          },
+          "description": {
+            "type": "string",
+            "example": "Learn how to integrate scheduling into marketplace."
+          },
+          "hosts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BookingHost"
+            }
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "cancelled",
+              "accepted",
+              "rejected",
+              "pending"
+            ],
+            "example": "accepted"
+          },
+          "cancellationReason": {
+            "type": "string",
+            "example": "User requested cancellation"
+          },
+          "reschedulingReason": {
+            "type": "string",
+            "example": "User rescheduled the event"
+          },
+          "rescheduledFromUid": {
+            "type": "string",
+            "example": "previous_uid_123"
+          },
+          "start": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "end": {
+            "type": "string",
+            "example": "2024-08-13T16:30:00Z"
+          },
+          "duration": {
+            "type": "number",
+            "example": 60
+          },
+          "eventTypeId": {
+            "type": "number",
+            "example": 50,
+            "deprecated": true,
+            "description": "Deprecated - rely on 'eventType' object containing the id instead."
+          },
+          "eventType": {
+            "$ref": "#/components/schemas/EventType"
+          },
+          "meetingUrl": {
+            "type": "string",
+            "description": "Deprecated - rely on 'location' field instead.",
+            "example": "https://example.com/recurring-meeting",
+            "deprecated": true
+          },
+          "location": {
+            "type": "string",
+            "example": "https://example.com/meeting"
+          },
+          "absentHost": {
+            "type": "boolean",
+            "example": true
+          },
+          "createdAt": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "metadata": {
+            "type": "object",
+            "example": {
+              "key": "value"
+            }
+          },
+          "attendees": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeatedAttendee"
+            }
+          }
+        },
+        "required": [
+          "id",
+          "uid",
+          "title",
+          "description",
+          "hosts",
+          "status",
+          "start",
+          "end",
+          "duration",
+          "eventTypeId",
+          "eventType",
+          "absentHost",
+          "createdAt",
+          "attendees"
+        ]
+      },
+      "GetRecurringSeatedBookingOutput_2024_08_13": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "number",
+            "example": 123
+          },
+          "uid": {
+            "type": "string",
+            "example": "booking_uid_123"
+          },
+          "title": {
+            "type": "string",
+            "example": "Consultation"
+          },
+          "description": {
+            "type": "string",
+            "example": "Learn how to integrate scheduling into marketplace."
+          },
+          "hosts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BookingHost"
+            }
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "cancelled",
+              "accepted",
+              "rejected",
+              "pending"
+            ],
+            "example": "accepted"
+          },
+          "cancellationReason": {
+            "type": "string",
+            "example": "User requested cancellation"
+          },
+          "reschedulingReason": {
+            "type": "string",
+            "example": "User rescheduled the event"
+          },
+          "rescheduledFromUid": {
+            "type": "string",
+            "example": "previous_uid_123"
+          },
+          "start": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "end": {
+            "type": "string",
+            "example": "2024-08-13T16:30:00Z"
+          },
+          "duration": {
+            "type": "number",
+            "example": 60
+          },
+          "eventTypeId": {
+            "type": "number",
+            "example": 50,
+            "deprecated": true,
+            "description": "Deprecated - rely on 'eventType' object containing the id instead."
+          },
+          "eventType": {
+            "$ref": "#/components/schemas/EventType"
+          },
+          "meetingUrl": {
+            "type": "string",
+            "description": "Deprecated - rely on 'location' field instead.",
+            "example": "https://example.com/recurring-meeting",
+            "deprecated": true
+          },
+          "location": {
+            "type": "string",
+            "example": "https://example.com/meeting"
+          },
+          "absentHost": {
+            "type": "boolean",
+            "example": true
+          },
+          "createdAt": {
+            "type": "string",
+            "example": "2024-08-13T15:30:00Z"
+          },
+          "metadata": {
+            "type": "object",
+            "example": {
+              "key": "value"
+            }
+          },
+          "attendees": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeatedAttendee"
+            }
+          },
+          "recurringBookingUid": {
+            "type": "string",
+            "example": "recurring_uid_987"
+          }
+        },
+        "required": [
+          "id",
+          "uid",
+          "title",
+          "description",
+          "hosts",
+          "status",
+          "start",
+          "end",
+          "duration",
+          "eventTypeId",
+          "eventType",
+          "absentHost",
+          "createdAt",
+          "attendees",
+          "recurringBookingUid"
+        ]
+      },
       "GetBookingOutput_2024_08_13": {
         "type": "object",
         "properties": {

apps/api/v2/test/fixtures/repository/bookings.repository.fixture.ts

@@ -22,6 +22,14 @@ export class BookingsRepositoryFixture {
     return this.prismaReadClient.booking.findUnique({ where: { uid: bookingUid } });
   }
 
+  async getByRecurringBookingUid(recurringBookingUid: string) {
+    return this.prismaReadClient.booking.findMany({
+      where: {
+        recurringEventId: recurringBookingUid,
+      },
+    });
+  }
+
   async create(booking: Prisma.BookingCreateInput) {
     return this.prismaWriteClient.booking.create({ data: booking });
   }

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

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

apps/web/abTest/middlewareFactory.ts

@@ -7,8 +7,6 @@ import { FUTURE_ROUTES_ENABLED_COOKIE_NAME, FUTURE_ROUTES_OVERRIDE_COOKIE_NAME }
 
 const ROUTES: [URLPattern, boolean][] = [
   ["/event-types", process.env.APP_ROUTER_EVENT_TYPES_ENABLED === "1"] as const,
-  ["/settings/developer/:path*", process.env.APP_ROUTER_SETTINGS_DEVELOPER_ENABLED === "1"] as const,
-  ["/settings/organizations/:path*", process.env.APP_ROUTER_SETTINGS_ORG_ENABLED === "1"] as const,
   ["/apps/installed/:category", process.env.APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED === "1"] as const,
   ["/apps/:slug", process.env.APP_ROUTER_APPS_SLUG_ENABLED === "1"] as const,
   ["/apps/:slug/setup", process.env.APP_ROUTER_APPS_SLUG_SETUP_ENABLED === "1"] as const,
@@ -23,7 +21,6 @@ const ROUTES: [URLPattern, boolean][] = [
   ["/auth/platform/:path*", process.env.APP_ROUTER_AUTH_PLATFORM_ENABLED === "1"] as const,
   ["/auth/oauth2/:path*", process.env.APP_ROUTER_AUTH_OAUTH2_ENABLED === "1"] as const,
   ["/workflows/:path*", process.env.APP_ROUTER_WORKFLOWS_ENABLED === "1"] as const,
-  ["/settings/teams/:path*", process.env.APP_ROUTER_SETTINGS_TEAMS_ENABLED === "1"] as const,
   ["/getting-started/:step", process.env.APP_ROUTER_GETTING_STARTED_STEP_ENABLED === "1"] as const,
   ["/apps", process.env.APP_ROUTER_APPS_ENABLED === "1"] as const,
   ["/bookings/:status", process.env.APP_ROUTER_BOOKINGS_STATUS_ENABLED === "1"] as const,

apps/web/app/future/settings/(settings)/layout.tsx

@@ -1,5 +0,0 @@
-import { WithLayout } from "app/layoutHOC";
-
-import { getLayout } from "@calcom/features/settings/appDir/SettingsLayoutAppDir";
-
-export default WithLayout({ getServerLayout: getLayout })<"L">;

apps/web/app/future/settings/(settings)/organizations/attributes/[id]/edit/page.tsx

@@ -1,11 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-
-import Page from "@calcom/ee/organizations/pages/settings/attributes/attributes-edit-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "Attribute",
-    (t) => t("edit_attribute_description")
-  );
-
-export default Page;

apps/web/app/future/settings/(settings)/organizations/attributes/create/page.tsx

@@ -1,11 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-
-import Page from "@calcom/ee/organizations/pages/settings/attributes/attributes-create-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "Attribute",
-    () => "Create an attribute for your team members"
-  );
-
-export default Page;

apps/web/app/future/settings/(settings)/organizations/attributes/page.tsx

@@ -1,11 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-
-import Page from "@calcom/ee/organizations/pages/settings/attributes/attributes-list-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("attributes"),
-    (t) => t("attribute_meta_description")
-  );
-
-export default Page;

apps/web/app/future/settings/(settings)/organizations/billing/page.tsx

@@ -1,5 +0,0 @@
-import BillingPage, { generateMetadata } from "../../billing/page";
-
-export { generateMetadata };
-
-export default BillingPage;

apps/web/app/future/settings/(settings)/teams/[id]/billing/page.tsx

@@ -1,4 +0,0 @@
-import BillingPage, { generateMetadata } from "../../../billing/page";
-
-export { generateMetadata };
-export default BillingPage;

apps/web/app/future/settings/platform/new/page.tsx

@@ -1,21 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import { getServerSideProps } from "@lib/settings/organizations/new/getServerSideProps";
-import { type inferSSRProps } from "@lib/types/inferSSRProps";
-
-import LegacyPage, { LayoutWrapper } from "~/settings/platform/new/create-new-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("set_up_your_platform_organization"),
-    (t) => t("platform_organization_description")
-  );
-
-export default WithLayout({
-  getLayout: LayoutWrapper,
-  Page: LegacyPage,
-  getData: withAppDirSsr<inferSSRProps<typeof getServerSideProps>>(getServerSideProps),
-  requiresLicense: true,
-});

apps/web/app/future/settings/platform/oauth-clients/create/page.tsx

@@ -1,19 +0,0 @@
-import type { PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import CreateNewView from "~/settings/platform/oauth-clients/create-new-view";
-
-export const generateMetadata = async ({ params, searchParams }: PageProps) => {
-  const p = { ...params, ...searchParams };
-  const clientId = p?.clientId ?? "";
-  return await _generateMetadata(
-    () => `OAuth client ${!!clientId ? "updation" : "creation"} form`,
-    () => ""
-  );
-};
-
-export default WithLayout({
-  getLayout: null,
-  Page: CreateNewView,
-});

apps/web/app/future/settings/platform/page.tsx

@@ -1,16 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import PlatformView from "~/settings/platform/platform-view";
-
-export const generateMetadata = async () => {
-  return await _generateMetadata(
-    (t) => t("platform"),
-    (t) => t("platform_description")
-  );
-};
-
-export default WithLayout({
-  getLayout: null,
-  Page: PlatformView,
-});

apps/web/app/layout.tsx

@@ -74,6 +74,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
           <script
             nonce={nonce}
             id="injected-head-scripts"
+            // eslint-disable-next-line react/no-danger
             dangerouslySetInnerHTML={{
               __html: process.env.NEXT_PUBLIC_HEAD_SCRIPTS,
             }}
@@ -105,6 +106,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
           <script
             nonce={nonce}
             id="injected-head-scripts"
+            // eslint-disable-next-line react/no-danger
             dangerouslySetInnerHTML={{
               __html: process.env.NEXT_PUBLIC_BODY_SCRIPTS,
             }}

apps/web/app/settings/(settings-layout)/billing/page.tsx

@@ -13,9 +13,7 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  // FIXME: Refactor me once next-auth endpoint is migrated to App Router
   const session = await getServerSessionForAppDir();
-
   const t = await getFixedT(session?.user.locale || "en");
 
   return (

apps/web/app/settings/(settings-layout)/developer/api-keys/page.tsx

@@ -4,8 +4,7 @@ import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-s
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { APP_NAME } from "@calcom/lib/constants";
 
-import ApiKeysView from "~/settings/developer/api-keys-view";
-import NewApiKeyButton from "~/settings/developer/components/CreateApiKeyButton";
+import ApiKeysView, { NewApiKeyButton } from "~/settings/developer/api-keys-view";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -25,7 +24,7 @@ const Page = async () => {
       description={t("create_first_api_key_description", { appName: APP_NAME })}
       CTA={<NewApiKeyButton />}
       borderInShellHeader={true}>
-      <ApiKeysView isAppDir={true} />
+      <ApiKeysView />
     </SettingsHeader>
   );
 };

apps/web/app/settings/(settings-layout)/developer/webhooks/[id]/page.tsx

@@ -20,7 +20,7 @@ const Page = async ({ params }: PageProps) => {
   const id = typeof params?.id === "string" ? params.id : undefined;
 
   const webhook = await WebhookRepository.findByWebhookId(id);
-  console.log("This is the webhook", webhook);
+
   return (
     <SettingsHeader
       title={t("edit_webhook")}

apps/web/app/settings/(settings-layout)/developer/webhooks/page.tsx

@@ -1,6 +1,6 @@
 import { _generateMetadata } from "app/_utils";
 
-import { WebhooksViewAppDir } from "@calcom/features/webhooks/pages/webhooks-view";
+import WebhooksView from "@calcom/features/webhooks/pages/webhooks-view";
 import { APP_NAME } from "@calcom/lib/constants";
 
 export const generateMetadata = async () =>
@@ -9,8 +9,4 @@ export const generateMetadata = async () =>
     (t) => t("add_webhook_description", { appName: APP_NAME })
   );
 
-const Page = () => {
-  return <WebhooksViewAppDir />;
-};
-
-export default Page;
+export default WebhooksView;

apps/web/app/settings/(settings-layout)/my-account/conferencing/page.tsx

@@ -1,11 +1,8 @@
 import { _generateMetadata } from "app/_utils";
 import { getFixedT } from "app/_utils";
 
+import { ConferencingAppsViewWebWrapper } from "@calcom/atoms/monorepo";
 import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { Button } from "@calcom/ui";
-
-import ConferencingView from "~/settings/my-account/conferencing-view";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -17,22 +14,12 @@ const Page = async () => {
   const session = await getServerSessionForAppDir();
   const t = await getFixedT(session?.user.locale || "en");
 
-  const AddConferencingButton = () => {
-    return (
-      <Button color="secondary" StartIcon="plus" href="/apps/categories/conferencing">
-        {t("add")}
-      </Button>
-    );
-  };
-
   return (
-    <SettingsHeader
+    <ConferencingAppsViewWebWrapper
       title={t("conferencing")}
       description={t("conferencing_description")}
-      CTA={<AddConferencingButton />}
-      borderInShellHeader={true}>
-      <ConferencingView />
-    </SettingsHeader>
+      add={t("add")}
+    />
   );
 };
 

apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx

@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import OrgAttributesEditPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-edit-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("attribute"),
+    (t) => t("edit_attribute_description")
+  );
+
+export default OrgAttributesEditPage;

apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx

@@ -0,0 +1,11 @@
+import { _generateMetadata } from "app/_utils";
+
+import OrgAttributesCreatePage from "@calcom/ee/organizations/pages/settings/attributes/attributes-create-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("attribute"),
+    (t) => t("create_attribute_description")
+  );
+
+export default OrgAttributesCreatePage;

apps/web/app/settings/(settings-layout)/organizations/attributes/page.tsx

@@ -0,0 +1,24 @@
+import { _generateMetadata, getFixedT } from "app/_utils";
+
+import OrgSettingsAttributesPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-list-view";
+import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
+import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("attributes"),
+    (t) => t("attribute_meta_description")
+  );
+
+const Page = async () => {
+  const session = await getServerSessionForAppDir();
+  const t = await getFixedT(session?.user.locale || "en");
+
+  return (
+    <SettingsHeader title={t("attributes")} description={t("attribute_meta_description")}>
+      <OrgSettingsAttributesPage />
+    </SettingsHeader>
+  );
+};
+
+export default Page;

apps/web/app/settings/(settings-layout)/organizations/billing/page.tsx

@@ -0,0 +1,5 @@
+import BillingPage, { generateMetadata } from "app/settings/(settings-layout)/billing/page";
+
+export { generateMetadata };
+
+export default BillingPage;

apps/web/app/settings/(settings-layout)/organizations/general/page.tsx

@@ -16,7 +16,7 @@ const Page = async () => {
 
   return (
     <SettingsHeader title={t("general")} description={t("general_description")} borderInShellHeader={true}>
-      <LegacyPage isAppDir={true} />
+      <LegacyPage />
     </SettingsHeader>
   );
 };