chore: v4.2.4 (#15703)

* refactor: handleNewBooking #3

* fix: type error

* fix: type err

* fix: type err

* refactor: create booking factor

* chore: refactor availusers

* chore: type err

---------

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Keith Williams <keithwillcode@gmail.com>

.env.example

@@ -180,6 +180,7 @@ API_KEY_PREFIX=cal_
 # allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/
 # Configures the global From: header whilst sending emails.
 EMAIL_FROM='notifications@yourselfhostedcal.com'
+EMAIL_FROM_NAME='Cal.com'
 
 # Configure SMTP settings (@see https://nodemailer.com/smtp/).
 # Configuration to receive emails locally (mailhog)

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,9 +11,9 @@
 
 ## Mandatory Tasks (DO NOT REMOVE)
 
-- [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected)
-- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com)
-- [ ] I have added or modified automated tests that prove my fix is effective or that my feature works (PRs might be rejected if logical changes are not properly tested)
+- [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
+- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com). If N/A, write N/A here and check the checkbox.
+- [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
 
 ## How should this be tested?
 

.github/actions/cache-build/action.yml

@@ -20,13 +20,14 @@ runs:
         key-2: ${{ hashFiles('apps/**/**.[jt]s', 'apps/**/**.[jt]sx', 'packages/**/**.[jt]s', 'packages/**/**.[jt]sx', '!**/node_modules') }}
         key-3: ${{ github.event.pull_request.number || github.ref }}
         key-4: ${{ github.sha }}
+        key-5: ${{ github.event.pull_request.head.sha }}
       with:
         path: |
           ${{ github.workspace }}/apps/web/.next
           ${{ github.workspace }}/apps/web/public/embed
           **/.turbo/**
           **/dist/**
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}-${{ env.key-5 }}
     - run: |
         export NODE_OPTIONS="--max_old_space_size=8192"
         yarn build

.github/actions/cache-db/action.yml

@@ -17,6 +17,7 @@ runs:
         cache-name: cache-db
         key-1: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}
         key-2: ${{ github.event.pull_request.number || github.ref }}
+        key-3: ${{ github.event.pull_request.head.sha }}
         DATABASE_URL: ${{ inputs.DATABASE_URL }}
         DATABASE_DIRECT_URL: ${{ inputs.DATABASE_URL }}
         E2E_TEST_CALCOM_QA_EMAIL: ${{ inputs.E2E_TEST_CALCOM_QA_EMAIL }}
@@ -24,7 +25,7 @@ runs:
         E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ inputs.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}
       with:
         path: ${{ inputs.path }}
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}
     - run: echo ${{ env.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }} && yarn db-seed
       if: steps.cache-db.outputs.cache-hit != 'true'
       shell: bash

.github/workflows/api-v1-production-build.yml

@@ -65,7 +65,7 @@ jobs:
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/cache-db
       - name: Cache API v1 production build
-        uses: buildjet/cache@v3
+        uses: buildjet/cache@v4
         id: cache-api-v1-build
         env:
           cache-name: api-v1-build

.github/workflows/api-v2-production-build.yml

@@ -34,7 +34,7 @@ jobs:
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
       - name: Cache API v2 production build
-        uses: buildjet/cache@v3
+        uses: buildjet/cache@v4
         id: cache-api-v2-build
         env:
           cache-name: api-v2-build

.github/workflows/nextjs-bundle-analysis.yml

@@ -45,13 +45,7 @@ env:
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
 
 jobs:
-  build:
-    name: Production builds
-    if: ${{ github.event_name == 'push' }}
-    uses: ./.github/workflows/production-build-without-database.yml
-    secrets: inherit
   analyze:
-    needs: build
     if: always()
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:

.github/workflows/pr-review.yml

@@ -0,0 +1,17 @@
+name: PR Reviewed
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  label-pr:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Label PR as ready for E2E
+        if: github.event.review.state == 'approved'
+        uses: actions-ecosystem/action-add-labels@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          labels: 'ready-for-e2e'

.github/workflows/pr.yml

@@ -2,8 +2,10 @@ name: PR Update
 
 on:
   pull_request_target:
+    types: [opened, synchronize, reopened, labeled]
     branches:
       - main
+      - gh-actions-test-branch
   workflow_dispatch:
 
 concurrency:
@@ -18,6 +20,7 @@ jobs:
       pull-requests: read
     outputs:
       has-files-requiring-all-checks: ${{ steps.filter.outputs.has-files-requiring-all-checks }}
+      commit-sha: ${{ steps.get_sha.outputs.commit-sha }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
@@ -27,36 +30,146 @@ jobs:
           filters: |
             has-files-requiring-all-checks:
               - "!(**.md|.github/CODEOWNERS)"
+      - name: Get Latest Commit SHA
+        id: get_sha
+        run: |
+          echo "commit-sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+  check-label:
+    needs: [changes]
+    runs-on: buildjet-2vcpu-ubuntu-2204
+    name: Check for E2E label
+    outputs:
+      run-e2e: ${{ steps.check-if-pr-has-label.outputs.run-e2e == 'true' && (github.event.action != 'labeled' || (github.event.action == 'labeled' && github.event.label.name == 'ready-for-e2e')) }}
+    steps:
+      - name: Check if PR exists with ready-for-e2e label for this SHA
+        id: check-if-pr-has-label
+        uses: actions/github-script@v7
+        with:
+          script: |
+            let labels = [];
+
+            if (context.payload.pull_request) {
+              labels = context.payload.pull_request.labels;
+            } else {
+              try {
+                const sha = '${{ needs.changes.outputs.commit-sha }}';
+                console.log('sha', sha);
+                const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  commit_sha: sha
+                });
+
+                if (prs.length === 0) {
+                  core.setOutput('run-e2e', false);
+                  console.log(`No pull requests found for commit SHA ${sha}`);
+                  return;
+                }
+
+                const pr = prs[0];
+                console.log(`PR number: ${pr.number}`);
+                console.log(`PR title: ${pr.title}`);
+                console.log(`PR state: ${pr.state}`);
+                console.log(`PR URL: ${pr.html_url}`);
+
+                labels = pr.labels;
+              }
+              catch (e) {
+                core.setOutput('run-e2e', false);
+                console.log(e);
+              }
+            }
+
+            const labelFound = labels.map(l => l.name).includes('ready-for-e2e');
+            console.log('Found the label?', labelFound);
+            core.setOutput('run-e2e', labelFound);
+
   type-check:
     name: Type check
-    needs: [changes]
+    needs: [changes, check-label]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/check-types.yml
     secrets: inherit
 
   lint:
     name: Linters
-    needs: [changes]
+    needs: [changes, check-label]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/lint.yml
     secrets: inherit
 
   unit-test:
     name: Tests
-    needs: [changes]
+    needs: [changes, check-label]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/unit-tests.yml
     secrets: inherit
 
+  build-api-v1:
+    name: Production builds
+    needs: [changes, check-label]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/api-v1-production-build.yml
+    secrets: inherit
+
+  build-api-v2:
+    name: Production builds
+    needs: [changes, check-label]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/api-v2-production-build.yml
+    secrets: inherit
+
+  build:
+    name: Production builds
+    needs: [changes, check-label]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/production-build-without-database.yml
+    secrets: inherit
+
   integration-test:
     name: Tests
-    needs: [changes]
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/integration-tests.yml
     secrets: inherit
 
+  e2e:
+    name: Tests
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/e2e.yml
+    secrets: inherit
+
+  e2e-app-store:
+    name: Tests
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/e2e-app-store.yml
+    secrets: inherit
+
+  e2e-embed:
+    name: Tests
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/e2e-embed.yml
+    secrets: inherit
+
+  e2e-embed-react:
+    name: Tests
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/e2e-embed-react.yml
+    secrets: inherit
+
+  analyze:
+    name: Analyze Build
+    needs: [build]
+    uses: ./.github/workflows/nextjs-bundle-analysis.yml
+    secrets: inherit
+
   required:
-    needs: [changes, lint, type-check, unit-test, integration-test]
+    needs: [changes, lint, type-check, unit-test, integration-test, check-label, build, build-api-v1, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
     if: always()
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:

apps/api/v1/instrumentation.ts

@@ -4,8 +4,6 @@ export function register() {
   if (process.env.NEXT_RUNTIME === "nodejs") {
     Sentry.init({
       dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
-      // reduce sample rate to 10% on production
-      tracesSampleRate: process.env.NODE_ENV !== "production" ? 1.0 : 0.1,
     });
   }
 

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

@@ -21,6 +21,8 @@ export const schemaBookingCreateBodyParams = extendedBookingCreateBody.merge(sch
 export const schemaBookingGetParams = z.object({
   dateFrom: iso8601.optional(),
   dateTo: iso8601.optional(),
+  order: z.enum(["asc", "desc"]).default("asc"),
+  sortBy: z.enum(["createdAt", "updatedAt"]).optional(),
 });
 
 const schemaBookingEditParams = z

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

@@ -51,6 +51,18 @@ import { schemaQuerySingleOrMultipleUserIds } from "~/lib/validations/shared/que
  *                type: string
  *                format: email
  *              example: [john.doe@example.com, jane.doe@example.com]
+ *        - in: query
+ *          name: order
+ *          required: false
+ *          schema:
+ *          type: string
+ *          enum: [asc, desc]
+ *       - in: query
+ *         name: sortBy
+ *         required: false
+ *         schema:
+ *          type: string
+ *          enum: [createdAt, updatedAt]
  *     operationId: listBookings
  *     tags:
  *     - bookings
@@ -177,7 +189,7 @@ export async function handler(req: NextApiRequest) {
     isOrganizationOwnerOrAdmin,
     pagination: { take, skip },
   } = req;
-  const { dateFrom, dateTo } = schemaBookingGetParams.parse(req.query);
+  const { dateFrom, dateTo, order, sortBy } = schemaBookingGetParams.parse(req.query);
 
   const args: Prisma.BookingFindManyArgs = {};
   if (req.query.take && req.query.page) {
@@ -251,6 +263,18 @@ export async function handler(req: NextApiRequest) {
     };
   }
 
+  if (sortBy === "updatedAt") {
+    args.orderBy = {
+      updatedAt: order,
+    };
+  }
+
+  if (sortBy === "createdAt") {
+    args.orderBy = {
+      createdAt: order,
+    };
+  }
+
   const data = await prisma.booking.findMany(args);
   return { bookings: data.map((booking) => schemaBookingReadPublic.parse(booking)) };
 }

apps/api/v2/package.json

@@ -25,8 +25,11 @@
   },
   "dependencies": {
     "@calcom/platform-constants": "*",
+    "@calcom/platform-libraries-0.0.13": "npm:@calcom/platform-libraries@0.0.13",
+    "@calcom/platform-libraries-0.0.15": "npm:@calcom/platform-libraries@0.0.15",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
     "@calcom/platform-libraries-0.0.4": "npm:@calcom/platform-libraries@0.0.4",
+    "@calcom/platform-libraries-0.0.14": "npm:@calcom/platform-libraries@0.0.14",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
     "@calcom/prisma": "*",

apps/api/v2/src/config/app.ts

@@ -17,7 +17,7 @@ const loadConfig = (): AppConfig => {
       }/v2`,
       keyPrefix: getEnv("API_KEY_PREFIX", "cal_"),
       licenseKey: getEnv("CALCOM_LICENSE_KEY", ""),
-      licenceKeyUrl: getEnv("GET_LICENSE_KEY_URL", "https://console.cal.com/api/license"),
+      licenseKeyUrl: getEnv("GET_LICENSE_KEY_URL", "https://console.cal.com/api/license"),
     },
     db: {
       readUrl: getEnv("DATABASE_READ_URL"),

apps/api/v2/src/config/type.ts

@@ -8,7 +8,7 @@ export type AppConfig = {
     url: string;
     keyPrefix: string;
     licenseKey: string;
-    licenceKeyUrl: string;
+    licenseKeyUrl: string;
   };
   db: {
     readUrl: string;

apps/api/v2/src/ee/calendars/calendars.interface.ts

@@ -7,6 +7,11 @@ export interface CalendarApp {
   check(userId: number): Promise<ApiResponse>;
 }
 
+export interface CredentialSyncCalendarApp {
+  save(userId: number, userEmail: string, username: string, password: string): Promise<{ status: string }>;
+  check(userId: number): Promise<ApiResponse>;
+}
+
 export interface OAuthCalendarApp extends CalendarApp {
   connect(authorization: string, req: Request): Promise<ApiResponse<{ authUrl: string }>>;
 }

apps/api/v2/src/ee/calendars/calendars.module.ts

@@ -1,4 +1,5 @@
 import { CalendarsController } from "@/ee/calendars/controllers/calendars.controller";
+import { AppleCalendarService } from "@/ee/calendars/services/apple-calendar.service";
 import { CalendarsService } from "@/ee/calendars/services/calendars.service";
 import { GoogleCalendarService } from "@/ee/calendars/services/gcal.service";
 import { OutlookService } from "@/ee/calendars/services/outlook.service";
@@ -17,6 +18,7 @@ import { Module } from "@nestjs/common";
     CalendarsService,
     OutlookService,
     GoogleCalendarService,
+    AppleCalendarService,
     SelectedCalendarsRepository,
     AppsRepository,
   ],

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

@@ -1,5 +1,6 @@
 import { GetBusyTimesOutput } from "@/ee/calendars/outputs/busy-times.output";
 import { ConnectedCalendarsOutput } from "@/ee/calendars/outputs/connected-calendars.output";
+import { AppleCalendarService } from "@/ee/calendars/services/apple-calendar.service";
 import { CalendarsService } from "@/ee/calendars/services/calendars.service";
 import { GoogleCalendarService } from "@/ee/calendars/services/gcal.service";
 import { OutlookService } from "@/ee/calendars/services/outlook.service";
@@ -21,13 +22,22 @@ import {
   Headers,
   Redirect,
   BadRequestException,
+  Post,
+  Body,
 } from "@nestjs/common";
 import { ApiTags as DocsTags } from "@nestjs/swagger";
+import { User } from "@prisma/client";
 import { Request } from "express";
 import { z } from "zod";
 
 import { APPS_READ } from "@calcom/platform-constants";
-import { SUCCESS_STATUS, CALENDARS, GOOGLE_CALENDAR, OFFICE_365_CALENDAR } from "@calcom/platform-constants";
+import {
+  SUCCESS_STATUS,
+  CALENDARS,
+  GOOGLE_CALENDAR,
+  OFFICE_365_CALENDAR,
+  APPLE_CALENDAR,
+} from "@calcom/platform-constants";
 import { ApiResponse, CalendarBusyTimesInput } from "@calcom/platform-types";
 
 @Controller({
@@ -39,7 +49,8 @@ export class CalendarsController {
   constructor(
     private readonly calendarsService: CalendarsService,
     private readonly outlookService: OutlookService,
-    private readonly googleCalendarService: GoogleCalendarService
+    private readonly googleCalendarService: GoogleCalendarService,
+    private readonly appleCalendarService: AppleCalendarService
   ) {}
 
   @UseGuards(ApiAuthGuard)
@@ -133,6 +144,26 @@ export class CalendarsController {
     }
   }
 
+  @UseGuards(ApiAuthGuard)
+  @Post("/:calendar/credentials")
+  async syncCredentials(
+    @GetUser() user: User,
+    @Param("calendar") calendar: string,
+    @Body() body: { username: string; password: string }
+  ): Promise<{ status: string }> {
+    const { username, password } = body;
+
+    switch (calendar) {
+      case APPLE_CALENDAR:
+        return await this.appleCalendarService.save(user.id, user.email, username, password);
+      default:
+        throw new BadRequestException(
+          "Invalid calendar type, available calendars are: ",
+          CALENDARS.join(", ")
+        );
+    }
+  }
+
   @Get("/:calendar/check")
   @HttpCode(HttpStatus.OK)
   @UseGuards(ApiAuthGuard, PermissionsGuard)
@@ -143,6 +174,8 @@ export class CalendarsController {
         return await this.outlookService.check(userId);
       case GOOGLE_CALENDAR:
         return await this.googleCalendarService.check(userId);
+      case APPLE_CALENDAR:
+        return await this.appleCalendarService.check(userId);
       default:
         throw new BadRequestException(
           "Invalid calendar type, available calendars are: ",

apps/api/v2/src/ee/calendars/services/apple-calendar.service.ts

@@ -0,0 +1,92 @@
+import { CredentialSyncCalendarApp } from "@/ee/calendars/calendars.interface";
+import { CalendarsService } from "@/ee/calendars/services/calendars.service";
+import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
+import { BadRequestException, UnauthorizedException } from "@nestjs/common";
+import { Injectable } from "@nestjs/common";
+
+import { SUCCESS_STATUS, APPLE_CALENDAR_TYPE, APPLE_CALENDAR_ID } from "@calcom/platform-constants";
+import { symmetricEncrypt, CalendarService } from "@calcom/platform-libraries-0.0.14";
+
+@Injectable()
+export class AppleCalendarService implements CredentialSyncCalendarApp {
+  constructor(
+    private readonly calendarsService: CalendarsService,
+    private readonly credentialRepository: CredentialsRepository
+  ) {}
+
+  async save(
+    userId: number,
+    userEmail: string,
+    username: string,
+    password: string
+  ): Promise<{ status: string }> {
+    return await this.saveCalendarCredentials(userId, userEmail, username, password);
+  }
+
+  async check(userId: number): Promise<{ status: typeof SUCCESS_STATUS }> {
+    return await this.checkIfCalendarConnected(userId);
+  }
+
+  async checkIfCalendarConnected(userId: number): Promise<{ status: typeof SUCCESS_STATUS }> {
+    const appleCalendarCredentials = await this.credentialRepository.getByTypeAndUserId(
+      APPLE_CALENDAR_TYPE,
+      userId
+    );
+
+    if (!appleCalendarCredentials) {
+      throw new BadRequestException("Credentials for apple calendar not found.");
+    }
+
+    if (appleCalendarCredentials.invalid) {
+      throw new BadRequestException("Invalid apple calendar credentials.");
+    }
+
+    const { connectedCalendars } = await this.calendarsService.getCalendars(userId);
+    const appleCalendar = connectedCalendars.find(
+      (cal: { integration: { type: string } }) => cal.integration.type === APPLE_CALENDAR_TYPE
+    );
+    if (!appleCalendar) {
+      throw new UnauthorizedException("Apple calendar not connected.");
+    }
+    if (appleCalendar.error?.message) {
+      throw new UnauthorizedException(appleCalendar.error?.message);
+    }
+
+    return {
+      status: SUCCESS_STATUS,
+    };
+  }
+
+  async saveCalendarCredentials(userId: number, userEmail: string, username: string, password: string) {
+    if (username.length <= 1 || password.length <= 1)
+      throw new BadRequestException(`Username or password cannot be empty`);
+
+    const data = {
+      type: APPLE_CALENDAR_TYPE,
+      key: symmetricEncrypt(
+        JSON.stringify({ username, password }),
+        process.env.CALENDSO_ENCRYPTION_KEY || ""
+      ),
+      userId: userId,
+      teamId: null,
+      appId: APPLE_CALENDAR_ID,
+      invalid: false,
+    };
+
+    try {
+      const dav = new CalendarService({
+        id: 0,
+        ...data,
+        user: { email: userEmail },
+      });
+      await dav?.listCalendars();
+      await this.credentialRepository.createAppCredential(APPLE_CALENDAR_TYPE, data.key, userId);
+    } catch (reason) {
+      throw new BadRequestException(`Could not add this apple calendar account: ${reason}`);
+    }
+
+    return {
+      status: SUCCESS_STATUS,
+    };
+  }
+}

apps/api/v2/src/ee/event-types/event-types.module.ts

@@ -1,17 +0,0 @@
-import { EventTypesController } from "@/ee/event-types/controllers/event-types.controller";
-import { EventTypesRepository } from "@/ee/event-types/event-types.repository";
-import { EventTypesService } from "@/ee/event-types/services/event-types.service";
-import { MembershipsModule } from "@/modules/memberships/memberships.module";
-import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { SelectedCalendarsModule } from "@/modules/selected-calendars/selected-calendars.module";
-import { TokensModule } from "@/modules/tokens/tokens.module";
-import { UsersModule } from "@/modules/users/users.module";
-import { Module } from "@nestjs/common";
-
-@Module({
-  imports: [PrismaModule, MembershipsModule, TokensModule, UsersModule, SelectedCalendarsModule],
-  providers: [EventTypesRepository, EventTypesService],
-  controllers: [EventTypesController],
-  exports: [EventTypesService, EventTypesRepository],
-})
-export class EventTypesModule {}

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

@@ -1,13 +1,13 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { EventTypesModule } from "@/ee/event-types/event-types.module";
-import { CreateEventTypeInput } from "@/ee/event-types/inputs/create-event-type.input";
-import { Editable } from "@/ee/event-types/inputs/enums/editable";
-import { BaseField } from "@/ee/event-types/inputs/enums/field-type";
-import { UpdateEventTypeInput } from "@/ee/event-types/inputs/update-event-type.input";
-import { GetEventTypePublicOutput } from "@/ee/event-types/outputs/get-event-type-public.output";
-import { GetEventTypeOutput } from "@/ee/event-types/outputs/get-event-type.output";
-import { GetEventTypesPublicOutput } from "@/ee/event-types/outputs/get-event-types-public.output";
+import { Editable } from "@/ee/event-types/event-types_2024_04_15//inputs/enums/editable";
+import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module";
+import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
+import { BaseField } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/field-type";
+import { UpdateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input";
+import { GetEventTypePublicOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-type-public.output";
+import { GetEventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-type.output";
+import { GetEventTypesPublicOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-types-public.output";
 import { HttpExceptionFilter } from "@/filters/http-exception.filter";
 import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
@@ -24,7 +24,12 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { withApiAuth } from "test/utils/withApiAuth";
 
-import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import {
+  SUCCESS_STATUS,
+  VERSION_2024_06_11,
+  VERSION_2024_04_15,
+  CAL_API_VERSION_HEADER,
+} from "@calcom/platform-constants";
 import {
   EventTypesByViewer,
   EventTypesPublic,
@@ -40,7 +45,7 @@ describe("Event types Endpoints", () => {
     beforeAll(async () => {
       const moduleRef = await Test.createTestingModule({
         providers: [PrismaExceptionFilter, HttpExceptionFilter],
-        imports: [AppModule, UsersModule, EventTypesModule, TokensModule],
+        imports: [AppModule, UsersModule, EventTypesModule_2024_04_15, TokensModule],
       })
         .overrideGuard(PermissionsGuard)
         .useValue({
@@ -83,7 +88,7 @@ describe("Event types Endpoints", () => {
         userEmail,
         Test.createTestingModule({
           providers: [PrismaExceptionFilter, HttpExceptionFilter],
-          imports: [AppModule, UsersModule, EventTypesModule, TokensModule],
+          imports: [AppModule, UsersModule, EventTypesModule_2024_04_15, TokensModule],
         })
       )
         .overrideGuard(PermissionsGuard)
@@ -132,7 +137,7 @@ describe("Event types Endpoints", () => {
     });
 
     it("should create an event type", async () => {
-      const body: CreateEventTypeInput = {
+      const body: CreateEventTypeInput_2024_04_15 = {
         title: "Test Event Type",
         slug: "test-event-type",
         description: "A description of the test event type.",
@@ -154,6 +159,7 @@ describe("Event types Endpoints", () => {
 
       return request(app.getHttpServer())
         .post("/api/v2/event-types")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
         .send(body)
         .expect(201)
         .then(async (response) => {
@@ -173,7 +179,7 @@ describe("Event types Endpoints", () => {
     it("should update event type", async () => {
       const newTitle = "Updated title";
 
-      const body: UpdateEventTypeInput = {
+      const body: UpdateEventTypeInput_2024_04_15 = {
         title: newTitle,
         disableGuests: false,
         slotInterval: 30,
@@ -184,6 +190,7 @@ describe("Event types Endpoints", () => {
 
       return request(app.getHttpServer())
         .patch(`/api/v2/event-types/${eventType.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
         .send(body)
         .expect(200)
         .then(async (response) => {
@@ -207,7 +214,7 @@ describe("Event types Endpoints", () => {
     it("should return 400 if param event type id is null", async () => {
       const locations = [{ type: "inPerson", address: "123 Main St" }];
 
-      const body: UpdateEventTypeInput = {
+      const body: UpdateEventTypeInput_2024_04_15 = {
         locations,
       };
 
@@ -217,7 +224,7 @@ describe("Event types Endpoints", () => {
     it("should update event type locations", async () => {
       const locations = [{ type: "inPerson", address: "123 Main St" }];
 
-      const body: UpdateEventTypeInput = {
+      const body: UpdateEventTypeInput_2024_04_15 = {
         locations,
       };
 
@@ -266,7 +273,7 @@ describe("Event types Endpoints", () => {
         },
       ];
 
-      const body: UpdateEventTypeInput = {
+      const body: UpdateEventTypeInput_2024_04_15 = {
         bookingFields,
       };
 
@@ -288,6 +295,25 @@ describe("Event types Endpoints", () => {
     it(`/GET/:id`, async () => {
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types/${eventType.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
+        // note: bearer token value mocked using "withApiAuth" for user which id is used when creating event type above
+        .set("Authorization", `Bearer whatever`)
+        .expect(200);
+
+      const responseBody: GetEventTypeOutput = response.body;
+
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+      expect(responseBody.data.eventType.id).toEqual(eventType.id);
+      expect(responseBody.data.eventType.title).toEqual(eventType.title);
+      expect(responseBody.data.eventType.slug).toEqual(eventType.slug);
+      expect(responseBody.data.eventType.userId).toEqual(user.id);
+    });
+
+    it(`/GET/:id with version VERSION_2024_06_11`, async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/api/v2/event-types/${eventType.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_11)
         // note: bearer token value mocked using "withApiAuth" for user which id is used when creating event type above
         .set("Authorization", `Bearer whatever`)
         .expect(200);
@@ -305,6 +331,7 @@ describe("Event types Endpoints", () => {
     it(`/GET/:username/public`, async () => {
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types/${username}/public`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
         // note: bearer token value mocked using "withApiAuth" for user which id is used when creating event type above
         .set("Authorization", `Bearer whatever`)
         .expect(200);
@@ -323,6 +350,7 @@ describe("Event types Endpoints", () => {
     it(`/GET/:username/:eventSlug/public`, async () => {
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types/${username}/${eventType.slug}/public`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
         // note: bearer token value mocked using "withApiAuth" for user which id is used when creating event type above
         .set("Authorization", `Bearer whatever`)
         .expect(200);
@@ -340,6 +368,7 @@ describe("Event types Endpoints", () => {
     it(`/GET/`, async () => {
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
         // note: bearer token value mocked using "withApiAuth" for user which id is used when creating event type above
         .set("Authorization", `Bearer whatever`)
         .expect(200);
@@ -359,6 +388,7 @@ describe("Event types Endpoints", () => {
     it(`/GET/public/:username/`, async () => {
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types/${username}/public`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
         // note: bearer token value mocked using "withApiAuth" for user which id is used when creating event type above
         .set("Authorization", `Bearer whatever`)
         .expect(200);
@@ -375,13 +405,17 @@ describe("Event types Endpoints", () => {
     it(`/GET/:id not existing`, async () => {
       await request(app.getHttpServer())
         .get(`/api/v2/event-types/1000`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
         // note: bearer token value mocked using "withApiAuth" for user which id is used when creating event type above
         .set("Authorization", `Bearer whatever`)
         .expect(404);
     });
 
     it("should delete schedule", async () => {
-      return request(app.getHttpServer()).delete(`/api/v2/event-types/${eventType.id}`).expect(200);
+      return request(app.getHttpServer())
+        .delete(`/api/v2/event-types/${eventType.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_04_15)
+        .expect(200);
     });
 
     afterAll(async () => {

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

@@ -1,16 +1,19 @@
-import { CreateEventTypeInput } from "@/ee/event-types/inputs/create-event-type.input";
-import { EventTypeIdParams } from "@/ee/event-types/inputs/event-type-id.input";
-import { GetPublicEventTypeQueryParams } from "@/ee/event-types/inputs/get-public-event-type-query-params.input";
-import { UpdateEventTypeInput } from "@/ee/event-types/inputs/update-event-type.input";
-import { CreateEventTypeOutput } from "@/ee/event-types/outputs/create-event-type.output";
-import { DeleteEventTypeOutput } from "@/ee/event-types/outputs/delete-event-type.output";
-import { GetEventTypePublicOutput } from "@/ee/event-types/outputs/get-event-type-public.output";
-import { GetEventTypeOutput } from "@/ee/event-types/outputs/get-event-type.output";
-import { GetEventTypesPublicOutput } from "@/ee/event-types/outputs/get-event-types-public.output";
-import { GetEventTypesData, GetEventTypesOutput } from "@/ee/event-types/outputs/get-event-types.output";
-import { UpdateEventTypeOutput } from "@/ee/event-types/outputs/update-event-type.output";
-import { EventTypesService } from "@/ee/event-types/services/event-types.service";
-import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
+import { EventTypeIdParams_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/event-type-id.input";
+import { GetPublicEventTypeQueryParams_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/get-public-event-type-query-params.input";
+import { UpdateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input";
+import { CreateEventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/create-event-type.output";
+import { DeleteEventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/delete-event-type.output";
+import { GetEventTypePublicOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-type-public.output";
+import { GetEventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-type.output";
+import { GetEventTypesPublicOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-types-public.output";
+import {
+  GetEventTypesData,
+  GetEventTypesOutput,
+} from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-types.output";
+import { UpdateEventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/update-event-type.output";
+import { EventTypesService_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/services/event-types.service";
+import { VERSION_2024_04_15, VERSION_2024_06_11 } from "@/lib/api-versions";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
@@ -42,13 +45,13 @@ import { PrismaClient } from "@calcom/prisma";
 
 @Controller({
   path: "/v2/event-types",
-  version: API_VERSIONS_VALUES,
+  version: [VERSION_2024_04_15, VERSION_2024_06_11],
 })
 @UseGuards(PermissionsGuard)
 @DocsTags("Event types")
-export class EventTypesController {
+export class EventTypesController_2024_04_15 {
   constructor(
-    private readonly eventTypesService: EventTypesService,
+    private readonly eventTypesService: EventTypesService_2024_04_15,
     private readonly prismaReadService: PrismaReadService
   ) {}
 
@@ -56,7 +59,7 @@ export class EventTypesController {
   @Permissions([EVENT_TYPE_WRITE])
   @UseGuards(ApiAuthGuard)
   async createEventType(
-    @Body() body: CreateEventTypeInput,
+    @Body() body: CreateEventTypeInput_2024_04_15,
     @GetUser() user: UserWithProfile
   ): Promise<CreateEventTypeOutput> {
     const eventType = await this.eventTypesService.createUserEventType(user, body);
@@ -71,9 +74,7 @@ export class EventTypesController {
   @Permissions([EVENT_TYPE_READ])
   @UseGuards(ApiAuthGuard)
   async getEventType(
-    @Param() params: EventTypeIdParams,
     @Param("eventTypeId", ParseIntPipe) eventTypeId: number,
-
     @GetUser() user: UserWithProfile
   ): Promise<GetEventTypeOutput> {
     const eventType = await this.eventTypesService.getUserEventTypeForAtom(user, Number(eventTypeId));
@@ -109,7 +110,7 @@ export class EventTypesController {
   async getPublicEventType(
     @Param("username") username: string,
     @Param("eventSlug") eventSlug: string,
-    @Query() queryParams: GetPublicEventTypeQueryParams
+    @Query() queryParams: GetPublicEventTypeQueryParams_2024_04_15
   ): Promise<GetEventTypePublicOutput> {
     try {
       const event = await getPublicEvent(
@@ -149,9 +150,9 @@ export class EventTypesController {
   @UseGuards(ApiAuthGuard)
   @HttpCode(HttpStatus.OK)
   async updateEventType(
-    @Param() params: EventTypeIdParams,
+    @Param() params: EventTypeIdParams_2024_04_15,
     @Param("eventTypeId", ParseIntPipe) eventTypeId: number,
-    @Body() body: UpdateEventTypeInput,
+    @Body() body: UpdateEventTypeInput_2024_04_15,
     @GetUser() user: UserWithProfile
   ): Promise<UpdateEventTypeOutput> {
     const eventType = await this.eventTypesService.updateEventType(eventTypeId, body, user);
@@ -166,7 +167,7 @@ export class EventTypesController {
   @Permissions([EVENT_TYPE_WRITE])
   @UseGuards(ApiAuthGuard)
   async deleteEventType(
-    @Param() params: EventTypeIdParams,
+    @Param() params: EventTypeIdParams_2024_04_15,
     @Param("eventTypeId", ParseIntPipe) eventTypeId: number,
     @GetUser("id") userId: number
   ): Promise<DeleteEventTypeOutput> {

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

@@ -0,0 +1,17 @@
+import { EventTypesController_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/controllers/event-types.controller";
+import { EventTypesRepository_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.repository";
+import { EventTypesService_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/services/event-types.service";
+import { MembershipsModule } from "@/modules/memberships/memberships.module";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { SelectedCalendarsModule } from "@/modules/selected-calendars/selected-calendars.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule, MembershipsModule, TokensModule, UsersModule, SelectedCalendarsModule],
+  providers: [EventTypesRepository_2024_04_15, EventTypesService_2024_04_15],
+  controllers: [EventTypesController_2024_04_15],
+  exports: [EventTypesService_2024_04_15, EventTypesRepository_2024_04_15],
+})
+export class EventTypesModule_2024_04_15 {}

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

@@ -1,4 +1,4 @@
-import { CreateEventTypeInput } from "@/ee/event-types/inputs/create-event-type.input";
+import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
@@ -8,12 +8,12 @@ import { getEventTypeById } from "@calcom/platform-libraries-0.0.2";
 import type { PrismaClient } from "@calcom/prisma";
 
 @Injectable()
-export class EventTypesRepository {
+export class EventTypesRepository_2024_04_15 {
   constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
 
   async createUserEventType(
     userId: number,
-    body: Pick<CreateEventTypeInput, "title" | "slug" | "length" | "hidden">
+    body: Pick<CreateEventTypeInput_2024_04_15, "title" | "slug" | "length" | "hidden">
   ) {
     return this.dbWrite.prisma.eventType.create({
       data: {

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input.ts

@@ -1,4 +1,4 @@
-import { EventTypeLocation } from "@/ee/event-types/inputs/event-type-location.input";
+import { EventTypeLocation_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/event-type-location.input";
 import { ApiProperty as DocsProperty, ApiHideProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
@@ -20,7 +20,7 @@ export const CREATE_EVENT_DESCRIPTION_EXAMPLE =
 
 // note(Lauris): We will gradually expose more properties if any customer needs them.
 // Just uncomment any below when requested.
-export class CreateEventTypeInput {
+export class CreateEventTypeInput_2024_04_15 {
   @IsNumber()
   @Min(1)
   @DocsProperty({ example: CREATE_EVENT_LENGTH_EXAMPLE })
@@ -46,9 +46,9 @@ export class CreateEventTypeInput {
 
   @IsOptional()
   @ValidateNested({ each: true })
-  @Type(() => EventTypeLocation)
+  @Type(() => EventTypeLocation_2024_04_15)
   @IsArray()
-  locations?: EventTypeLocation[];
+  locations?: EventTypeLocation_2024_04_15[];
 
   @IsBoolean()
   @IsOptional()

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/event-type-id.input.ts

@@ -1,6 +1,6 @@
 import { IsNumberString } from "class-validator";
 
-export class EventTypeIdParams {
+export class EventTypeIdParams_2024_04_15 {
   @IsNumberString()
   eventTypeId!: number;
 }

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/event-type-location.input.ts

@@ -4,7 +4,7 @@ import { IsString, IsNumber, IsBoolean, IsOptional, IsUrl } from "class-validato
 // note(Lauris): We will gradually expose more properties if any customer needs them.
 // Just uncomment any below when requested.
 
-export class EventTypeLocation {
+export class EventTypeLocation_2024_04_15 {
   @IsString()
   @DocsProperty({ example: "link" })
   type!: string;

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/get-public-event-type-query-params.input.ts

@@ -2,7 +2,7 @@ import { ApiProperty } from "@nestjs/swagger";
 import { Transform } from "class-transformer";
 import { IsBoolean, IsOptional, IsString } from "class-validator";
 
-export class GetPublicEventTypeQueryParams {
+export class GetPublicEventTypeQueryParams_2024_04_15 {
   @Transform(({ value }: { value: string }) => value === "true")
   @IsBoolean()
   @IsOptional()

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input.ts

@@ -1,7 +1,7 @@
-import { Editable } from "@/ee/event-types/inputs/enums/editable";
-import { BaseField } from "@/ee/event-types/inputs/enums/field-type";
-import { Frequency } from "@/ee/event-types/inputs/enums/frequency";
-import { EventTypeLocation } from "@/ee/event-types/inputs/event-type-location.input";
+import { Editable } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/editable";
+import { BaseField } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/field-type";
+import { Frequency } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/frequency";
+import { EventTypeLocation_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/event-type-location.input";
 import { Type } from "class-transformer";
 import {
   IsString,
@@ -105,7 +105,7 @@ class VariantsConfig {
   variants!: Record<string, Variant>;
 }
 
-export class BookingField {
+export class BookingField_2024_04_15 {
   @IsEnum(BaseField)
   type!: BaseField;
 
@@ -179,7 +179,7 @@ export class BookingField {
   sources?: Source[];
 }
 
-export class RecurringEvent {
+export class RecurringEvent_2024_04_15 {
   @IsDate()
   @IsOptional()
   dtstart?: Date;
@@ -202,7 +202,7 @@ export class RecurringEvent {
   tzid?: string;
 }
 
-export class IntervalLimits {
+export class IntervalLimits_2024_04_15 {
   @IsNumber()
   @IsOptional()
   PER_DAY?: number;
@@ -220,7 +220,7 @@ export class IntervalLimits {
   PER_YEAR?: number;
 }
 
-export class UpdateEventTypeInput {
+export class UpdateEventTypeInput_2024_04_15 {
   @IsInt()
   @Min(1)
   @IsOptional()
@@ -243,9 +243,9 @@ export class UpdateEventTypeInput {
   hidden?: boolean;
 
   @ValidateNested({ each: true })
-  @Type(() => EventTypeLocation)
+  @Type(() => EventTypeLocation_2024_04_15)
   @IsOptional()
-  locations?: EventTypeLocation[];
+  locations?: EventTypeLocation_2024_04_15[];
 
   // @IsInt()
   // @IsOptional()
@@ -278,8 +278,8 @@ export class UpdateEventTypeInput {
   @IsOptional()
   @IsArray()
   @ValidateNested({ each: true })
-  @Type(() => BookingField)
-  bookingFields?: BookingField[];
+  @Type(() => BookingField_2024_04_15)
+  bookingFields?: BookingField_2024_04_15[];
 
   // @IsString()
   // @IsOptional()

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

@@ -1,4 +1,4 @@
-import { EventTypeOutput } from "@/ee/event-types/outputs/event-type.output";
+import { EventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/event-type.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";

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

@@ -2,7 +2,7 @@ import {
   CREATE_EVENT_LENGTH_EXAMPLE,
   CREATE_EVENT_SLUG_EXAMPLE,
   CREATE_EVENT_TITLE_EXAMPLE,
-} from "@/ee/event-types/inputs/create-event-type.input";
+} from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
 import { ApiProperty } from "@nestjs/swagger";
 import { ApiProperty as DocsProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";

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

@@ -3,15 +3,15 @@ import {
   CREATE_EVENT_LENGTH_EXAMPLE,
   CREATE_EVENT_SLUG_EXAMPLE,
   CREATE_EVENT_TITLE_EXAMPLE,
-} from "@/ee/event-types/inputs/create-event-type.input";
-import { PeriodType } from "@/ee/event-types/inputs/enums/period-type";
-import { SchedulingType } from "@/ee/event-types/inputs/enums/scheduling-type";
-import { EventTypeLocation } from "@/ee/event-types/inputs/event-type-location.input";
+} from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
+import { PeriodType } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/period-type";
+import { SchedulingType } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/scheduling-type";
+import { EventTypeLocation_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/event-type-location.input";
 import {
-  BookingField,
-  IntervalLimits,
-  RecurringEvent,
-} from "@/ee/event-types/inputs/update-event-type.input";
+  BookingField_2024_04_15,
+  IntervalLimits_2024_04_15,
+  RecurringEvent_2024_04_15,
+} from "@/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input";
 import { ApiProperty as DocsProperty, ApiHideProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
@@ -53,9 +53,9 @@ export class EventTypeOutput {
   hidden!: boolean;
 
   @ValidateNested({ each: true })
-  @Type(() => EventTypeLocation)
+  @Type(() => EventTypeLocation_2024_04_15)
   @IsArray()
-  locations!: EventTypeLocation[] | null;
+  locations!: EventTypeLocation_2024_04_15[] | null;
 
   @IsInt()
   @ApiHideProperty()
@@ -91,9 +91,9 @@ export class EventTypeOutput {
   @IsOptional()
   @IsArray()
   @ValidateNested({ each: true })
-  @Type(() => BookingField)
+  @Type(() => BookingField_2024_04_15)
   @ApiHideProperty()
-  bookingFields!: BookingField[] | null;
+  bookingFields!: BookingField_2024_04_15[] | null;
 
   @IsString()
   @ApiHideProperty()
@@ -132,10 +132,10 @@ export class EventTypeOutput {
   requiresBookerEmailVerification!: boolean;
 
   @ValidateNested()
-  @Type(() => RecurringEvent)
+  @Type(() => RecurringEvent_2024_04_15)
   @IsOptional()
   @ApiHideProperty()
-  recurringEvent!: RecurringEvent | null;
+  recurringEvent!: RecurringEvent_2024_04_15 | null;
 
   @IsBoolean()
   @ApiHideProperty()
@@ -203,15 +203,15 @@ export class EventTypeOutput {
   successRedirectUrl!: string | null;
 
   @ValidateNested()
-  @Type(() => IntervalLimits)
+  @Type(() => IntervalLimits_2024_04_15)
   @IsOptional()
   @ApiHideProperty()
-  bookingLimits!: IntervalLimits;
+  bookingLimits!: IntervalLimits_2024_04_15;
 
   @ValidateNested()
-  @Type(() => IntervalLimits)
+  @Type(() => IntervalLimits_2024_04_15)
   @ApiHideProperty()
-  durationLimits!: IntervalLimits;
+  durationLimits!: IntervalLimits_2024_04_15;
 
   @IsBoolean()
   @ApiHideProperty()

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

@@ -1,4 +1,4 @@
-import { EventTypeOutput } from "@/ee/event-types/outputs/event-type.output";
+import { EventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/event-type.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, ValidateNested } from "class-validator";

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

@@ -2,7 +2,7 @@ import {
   CREATE_EVENT_LENGTH_EXAMPLE,
   CREATE_EVENT_SLUG_EXAMPLE,
   CREATE_EVENT_TITLE_EXAMPLE,
-} from "@/ee/event-types/inputs/create-event-type.input";
+} from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
 import { ApiProperty } from "@nestjs/swagger";
 import { ApiProperty as DocsProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";

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

@@ -1,4 +1,4 @@
-import { EventTypeOutput } from "@/ee/event-types/outputs/event-type.output";
+import { EventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/event-type.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsArray, IsEnum, ValidateNested } from "class-validator";

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

@@ -1,4 +1,4 @@
-import { EventTypeOutput } from "@/ee/event-types/outputs/event-type.output";
+import { EventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/event-type.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";

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

@@ -1,8 +1,8 @@
-import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/constants/constants";
-import { EventTypesRepository } from "@/ee/event-types/event-types.repository";
-import { CreateEventTypeInput } from "@/ee/event-types/inputs/create-event-type.input";
-import { UpdateEventTypeInput } from "@/ee/event-types/inputs/update-event-type.input";
-import { EventTypeOutput } from "@/ee/event-types/outputs/event-type.output";
+import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/event-types_2024_04_15/constants/constants";
+import { EventTypesRepository_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.repository";
+import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
+import { UpdateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input";
+import { EventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/event-type.output";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
@@ -14,16 +14,19 @@ import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-librarie
 import { EventType } from "@calcom/prisma/client";
 
 @Injectable()
-export class EventTypesService {
+export class EventTypesService_2024_04_15 {
   constructor(
-    private readonly eventTypesRepository: EventTypesRepository,
+    private readonly eventTypesRepository: EventTypesRepository_2024_04_15,
     private readonly membershipsRepository: MembershipsRepository,
     private readonly usersRepository: UsersRepository,
     private readonly selectedCalendarsRepository: SelectedCalendarsRepository,
     private readonly dbWrite: PrismaWriteService
   ) {}
 
-  async createUserEventType(user: UserWithProfile, body: CreateEventTypeInput): Promise<EventTypeOutput> {
+  async createUserEventType(
+    user: UserWithProfile,
+    body: CreateEventTypeInput_2024_04_15
+  ): Promise<EventTypeOutput> {
     await this.checkCanCreateEventType(user.id, body);
     const eventTypeUser = await this.getUserToCreateEvent(user);
     const { eventType } = await createEventType({
@@ -38,7 +41,7 @@ export class EventTypesService {
     return eventType as EventTypeOutput;
   }
 
-  async checkCanCreateEventType(userId: number, body: CreateEventTypeInput) {
+  async checkCanCreateEventType(userId: number, body: CreateEventTypeInput_2024_04_15) {
     const existsWithSlug = await this.eventTypesRepository.getUserEventTypeBySlug(userId, body.slug);
     if (existsWithSlug) {
       throw new BadRequestException("User already has an event type with this slug.");
@@ -114,7 +117,7 @@ export class EventTypesService {
     return defaultEventTypes;
   }
 
-  async updateEventType(eventTypeId: number, body: UpdateEventTypeInput, user: UserWithProfile) {
+  async updateEventType(eventTypeId: number, body: UpdateEventTypeInput_2024_04_15, user: UserWithProfile) {
     this.checkCanUpdateEventType(user.id, eventTypeId);
     const eventTypeUser = await this.getUserToUpdateEvent(user);
     await updateEventType({

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

@@ -0,0 +1,16 @@
+export const DEFAULT_EVENT_TYPES = {
+  thirtyMinutes: { length: 30, slug: "thirty-minutes", title: "30 Minutes" },
+  thirtyMinutesVideo: {
+    length: 30,
+    slug: "thirty-minutes-video",
+    title: "30 Minutes",
+    locations: [{ type: "integrations:daily" }],
+  },
+  sixtyMinutes: { length: 60, slug: "sixty-minutes", title: "60 Minutes" },
+  sixtyMinutesVideo: {
+    length: 60,
+    slug: "sixty-minutes-video",
+    title: "60 Minutes",
+    locations: [{ type: "integrations:daily" }],
+  },
+};

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

@@ -0,0 +1,295 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
+import { HttpExceptionFilter } from "@/filters/http-exception.filter";
+import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { PlatformOAuthClient, Team, User } from "@prisma/client";
+import * as request from "supertest";
+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_06_14 } from "@calcom/platform-constants";
+import {
+  ApiSuccessResponse,
+  CreateEventTypeInput_2024_06_14,
+  EventTypeOutput_2024_06_14,
+  UpdateEventTypeInput_2024_06_14,
+} from "@calcom/platform-types";
+
+describe("Event types Endpoints", () => {
+  describe("Not authenticated", () => {
+    let app: INestApplication;
+
+    beforeAll(async () => {
+      const moduleRef = await Test.createTestingModule({
+        providers: [PrismaExceptionFilter, HttpExceptionFilter],
+        imports: [AppModule, UsersModule, EventTypesModule_2024_06_14, TokensModule],
+      })
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+      await app.init();
+    });
+
+    it(`/GET/:id`, () => {
+      return request(app.getHttpServer()).get("/api/v2/event-types/100").expect(401);
+    });
+
+    afterAll(async () => {
+      await app.close();
+    });
+  });
+
+  describe("User Authenticated", () => {
+    let app: INestApplication;
+
+    let oAuthClient: PlatformOAuthClient;
+    let organization: Team;
+    let userRepositoryFixture: UserRepositoryFixture;
+    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+
+    const userEmail = "event-types-test-e2e@api.com";
+    const name = "bob-the-builder";
+    const username = name;
+    let eventType: EventTypeOutput_2024_06_14;
+    let user: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          providers: [PrismaExceptionFilter, HttpExceptionFilter],
+          imports: [AppModule, UsersModule, EventTypesModule_2024_06_14, TokensModule],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+
+      organization = await teamRepositoryFixture.create({ name: "organization" });
+      oAuthClient = await createOAuthClient(organization.id);
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        name,
+        username,
+      });
+
+      await app.init();
+    });
+
+    async function createOAuthClient(organizationId: number) {
+      const data = {
+        logo: "logo-url",
+        name: "name",
+        redirectUris: ["redirect-uri"],
+        permissions: 32,
+      };
+      const secret = "secret";
+
+      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+      return client;
+    }
+
+    it("should be defined", () => {
+      expect(oauthClientRepositoryFixture).toBeDefined();
+      expect(userRepositoryFixture).toBeDefined();
+      expect(oAuthClient).toBeDefined();
+      expect(user).toBeDefined();
+    });
+
+    it("should create an event type", async () => {
+      const body: CreateEventTypeInput_2024_06_14 = {
+        title: "Coding class",
+        slug: "coding-class",
+        description: "Let's learn how to code like a pro.",
+        lengthInMinutes: 60,
+        locations: [
+          {
+            type: "integration",
+            integration: "cal-video",
+          },
+        ],
+        bookingFields: [
+          {
+            type: "select",
+            label: "select which language you want to learn",
+            slug: "select-language",
+            required: true,
+            placeholder: "select language",
+            options: ["javascript", "python", "cobol"],
+          },
+        ],
+      };
+
+      return request(app.getHttpServer())
+        .post("/api/v2/event-types")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        .send(body)
+        .expect(201)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+          const createdEventType = responseBody.data;
+          expect(createdEventType).toHaveProperty("id");
+          expect(createdEventType.title).toEqual(body.title);
+          expect(createdEventType.description).toEqual(body.description);
+          expect(createdEventType.lengthInMinutes).toEqual(body.lengthInMinutes);
+          expect(createdEventType.locations).toEqual(body.locations);
+          expect(createdEventType.bookingFields).toEqual(body.bookingFields);
+          expect(createdEventType.ownerId).toEqual(user.id);
+
+          eventType = responseBody.data;
+        });
+    });
+
+    it("should update event type", async () => {
+      const newTitle = "Coding class in Italian!";
+
+      const body: UpdateEventTypeInput_2024_06_14 = {
+        title: newTitle,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/api/v2/event-types/${eventType.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        .send(body)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+          const updatedEventType = responseBody.data;
+          expect(updatedEventType.title).toEqual(body.title);
+
+          expect(updatedEventType.id).toEqual(eventType.id);
+          expect(updatedEventType.title).toEqual(newTitle);
+          expect(updatedEventType.description).toEqual(eventType.description);
+          expect(updatedEventType.lengthInMinutes).toEqual(eventType.lengthInMinutes);
+          expect(updatedEventType.locations).toEqual(eventType.locations);
+          expect(updatedEventType.bookingFields).toEqual(eventType.bookingFields);
+          expect(updatedEventType.ownerId).toEqual(user.id);
+
+          eventType.title = newTitle;
+        });
+    });
+
+    it(`/GET/:id`, async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/api/v2/event-types/${eventType.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;
+      const fetchedEventType = responseBody.data;
+
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+      expect(fetchedEventType.id).toEqual(eventType.id);
+      expect(fetchedEventType.title).toEqual(eventType.title);
+      expect(fetchedEventType.description).toEqual(eventType.description);
+      expect(fetchedEventType.lengthInMinutes).toEqual(eventType.lengthInMinutes);
+      expect(fetchedEventType.locations).toEqual(eventType.locations);
+      expect(fetchedEventType.bookingFields).toEqual(eventType.bookingFields);
+      expect(fetchedEventType.ownerId).toEqual(user.id);
+    });
+
+    it(`/GET/even-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)
+        // 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);
+
+      const fetchedEventType = responseBody.data?.[0];
+
+      expect(fetchedEventType?.id).toEqual(eventType.id);
+      expect(fetchedEventType?.title).toEqual(eventType.title);
+      expect(fetchedEventType?.description).toEqual(eventType.description);
+      expect(fetchedEventType?.lengthInMinutes).toEqual(eventType.lengthInMinutes);
+      expect(fetchedEventType?.locations).toEqual(eventType.locations);
+      expect(fetchedEventType?.bookingFields).toEqual(eventType.bookingFields);
+      expect(fetchedEventType?.ownerId).toEqual(user.id);
+    });
+
+    it(`/GET/event-types by username and eventSlug`, async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/api/v2/event-types?username=${username}&eventSlug=${eventType.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;
+      const fetchedEventType = responseBody.data[0];
+
+      expect(fetchedEventType?.id).toEqual(eventType.id);
+      expect(fetchedEventType?.title).toEqual(eventType.title);
+      expect(fetchedEventType?.description).toEqual(eventType.description);
+      expect(fetchedEventType?.lengthInMinutes).toEqual(eventType.lengthInMinutes);
+      expect(fetchedEventType?.locations).toEqual(eventType.locations);
+      expect(fetchedEventType?.bookingFields).toEqual(eventType.bookingFields);
+      expect(fetchedEventType?.ownerId).toEqual(user.id);
+    });
+
+    it(`/GET/:id not existing`, async () => {
+      await request(app.getHttpServer())
+        .get(`/api/v2/event-types/1000`)
+        .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(404);
+    });
+
+    it("should delete schedule", async () => {
+      return request(app.getHttpServer()).delete(`/api/v2/event-types/${eventType.id}`).expect(200);
+    });
+
+    afterAll(async () => {
+      await oauthClientRepositoryFixture.delete(oAuthClient.id);
+      await teamRepositoryFixture.delete(organization.id);
+      try {
+        await eventTypesRepositoryFixture.delete(eventType.id);
+      } catch (e) {
+        // Event type might have been deleted by the test
+      }
+      try {
+        await userRepositoryFixture.delete(user.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/controllers/event-types.controller.ts

@@ -0,0 +1,128 @@
+import { CreateEventTypeOutput_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/outputs/create-event-type.output";
+import { DeleteEventTypeOutput_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/outputs/delete-event-type.output";
+import { GetEventTypeOutput_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/outputs/get-event-type.output";
+import { GetEventTypesOutput_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/outputs/get-event-types.output";
+import { UpdateEventTypeOutput_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/outputs/update-event-type.output";
+import { EventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/event-types.service";
+import { VERSION_2024_06_14_VALUE } from "@/lib/api-versions";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { UserWithProfile } from "@/modules/users/users.repository";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Param,
+  Post,
+  Body,
+  NotFoundException,
+  Patch,
+  HttpCode,
+  HttpStatus,
+  Delete,
+  Query,
+} from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+
+import { EVENT_TYPE_READ, EVENT_TYPE_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";
+import {
+  CreateEventTypeInput_2024_06_14,
+  UpdateEventTypeInput_2024_06_14,
+  GetEventTypesQuery_2024_06_14,
+} from "@calcom/platform-types";
+
+@Controller({
+  path: "/v2/event-types",
+  version: VERSION_2024_06_14_VALUE,
+})
+@UseGuards(PermissionsGuard)
+@DocsTags("Event types")
+export class EventTypesController_2024_06_14 {
+  constructor(private readonly eventTypesService: EventTypesService_2024_06_14) {}
+
+  @Post("/")
+  @Permissions([EVENT_TYPE_WRITE])
+  @UseGuards(ApiAuthGuard)
+  async createEventType(
+    @Body() body: CreateEventTypeInput_2024_06_14,
+    @GetUser() user: UserWithProfile
+  ): Promise<CreateEventTypeOutput_2024_06_14> {
+    const eventType = await this.eventTypesService.createUserEventType(user, body);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventType,
+    };
+  }
+
+  @Get("/:eventTypeId")
+  @Permissions([EVENT_TYPE_READ])
+  @UseGuards(ApiAuthGuard)
+  async getEventTypeById(
+    @Param("eventTypeId") eventTypeId: string,
+    @GetUser() user: UserWithProfile
+  ): Promise<GetEventTypeOutput_2024_06_14> {
+    const eventType = await this.eventTypesService.getUserEventType(user.id, Number(eventTypeId));
+
+    if (!eventType) {
+      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
+    }
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventType,
+    };
+  }
+
+  @Get("/")
+  @Permissions([EVENT_TYPE_READ])
+  async getEventTypes(
+    @Query() queryParams: GetEventTypesQuery_2024_06_14
+  ): Promise<GetEventTypesOutput_2024_06_14> {
+    const eventTypes = await this.eventTypesService.getEventTypes(queryParams);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventTypes,
+    };
+  }
+
+  @Patch("/:eventTypeId")
+  @Permissions([EVENT_TYPE_WRITE])
+  @UseGuards(ApiAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async updateEventType(
+    @Param("eventTypeId") eventTypeId: number,
+    @Body() body: UpdateEventTypeInput_2024_06_14,
+    @GetUser() user: UserWithProfile
+  ): Promise<UpdateEventTypeOutput_2024_06_14> {
+    const eventType = await this.eventTypesService.updateEventType(eventTypeId, body, user);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventType,
+    };
+  }
+
+  @Delete("/:eventTypeId")
+  @Permissions([EVENT_TYPE_WRITE])
+  @UseGuards(ApiAuthGuard)
+  async deleteEventType(
+    @Param("eventTypeId") eventTypeId: number,
+    @GetUser("id") userId: number
+  ): Promise<DeleteEventTypeOutput_2024_06_14> {
+    const eventType = await this.eventTypesService.deleteEventType(eventTypeId, userId);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: {
+        id: eventType.id,
+        lengthInMinutes: eventType.length,
+        slug: eventType.slug,
+        title: eventType.title,
+      },
+    };
+  }
+}

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

@@ -0,0 +1,27 @@
+import { EventTypesController_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/controllers/event-types.controller";
+import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
+import { EventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/event-types.service";
+import { InputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/input-event-types.service";
+import { OutputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/output-event-types.service";
+import { MembershipsModule } from "@/modules/memberships/memberships.module";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { SelectedCalendarsModule } from "@/modules/selected-calendars/selected-calendars.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersService } from "@/modules/users/services/users.service";
+import { UsersRepository } from "@/modules/users/users.repository";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule, MembershipsModule, TokensModule, SelectedCalendarsModule],
+  providers: [
+    EventTypesRepository_2024_06_14,
+    EventTypesService_2024_06_14,
+    InputEventTypesService_2024_06_14,
+    OutputEventTypesService_2024_06_14,
+    UsersRepository,
+    UsersService,
+  ],
+  controllers: [EventTypesController_2024_06_14],
+  exports: [EventTypesService_2024_06_14, EventTypesRepository_2024_06_14],
+})
+export class EventTypesModule_2024_06_14 {}

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

@@ -0,0 +1,103 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { UserWithProfile } from "@/modules/users/users.repository";
+import { Injectable } from "@nestjs/common";
+
+import {
+  getEventTypeById,
+  transformApiEventTypeBookingFields,
+  transformApiEventTypeLocations,
+} from "@calcom/platform-libraries-0.0.13";
+import { CreateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
+import type { PrismaClient } from "@calcom/prisma";
+
+type InputEventTransformed = Omit<
+  CreateEventTypeInput_2024_06_14,
+  "lengthInMinutes" | "locations" | "bookingFields"
+> & {
+  length: number;
+  slug: string;
+  locations?: ReturnType<typeof transformApiEventTypeLocations>;
+  bookingFields?: ReturnType<typeof transformApiEventTypeBookingFields>;
+};
+
+@Injectable()
+export class EventTypesRepository_2024_06_14 {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async createUserEventType(userId: number, body: InputEventTransformed) {
+    return this.dbWrite.prisma.eventType.create({
+      data: {
+        ...body,
+        userId,
+        locations: body.locations,
+        bookingFields: body.bookingFields,
+        users: { connect: { id: userId } },
+      },
+    });
+  }
+
+  async getEventTypeWithSeats(eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: { id: eventTypeId },
+      select: { users: { select: { id: true } }, seatsPerTimeSlot: true },
+    });
+  }
+
+  async getUserEventType(userId: number, eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findFirst({
+      where: {
+        id: eventTypeId,
+        userId,
+      },
+      include: { users: true, schedule: true },
+    });
+  }
+
+  async getUserEventTypes(userId: number) {
+    return this.dbRead.prisma.eventType.findMany({
+      where: {
+        userId,
+      },
+      include: { users: true, schedule: true },
+    });
+  }
+
+  async getUserEventTypeForAtom(
+    user: UserWithProfile,
+    isUserOrganizationAdmin: boolean,
+    eventTypeId: number
+  ) {
+    return await getEventTypeById({
+      currentOrganizationId: user.movedToProfile?.organizationId || user.organizationId,
+      eventTypeId,
+      userId: user.id,
+      prisma: this.dbRead.prisma as unknown as PrismaClient,
+      isUserOrganizationAdmin,
+      isTrpcCall: true,
+    });
+  }
+
+  async getEventTypeById(eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: { id: eventTypeId },
+      include: { users: true, schedule: true },
+    });
+  }
+
+  async getUserEventTypeBySlug(userId: number, slug: string) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: {
+        userId_slug: {
+          userId: userId,
+          slug: slug,
+        },
+      },
+      include: { users: true, schedule: true },
+    });
+  }
+
+  async deleteEventType(eventTypeId: number) {
+    return this.dbWrite.prisma.eventType.delete({ where: { id: eventTypeId } });
+  }
+}

apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/create-event-type.output.ts

@@ -0,0 +1,20 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsIn, IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+import { EventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class CreateEventTypeOutput_2024_06_14 {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsIn([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: EventTypeOutput_2024_06_14,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @Type(() => EventTypeOutput_2024_06_14)
+  data!: EventTypeOutput_2024_06_14;
+}

apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/delete-event-type.output.ts

@@ -0,0 +1,33 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty as DocsProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsIn, IsInt, IsString } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+import { CREATE_EVENT_LENGTH_EXAMPLE, CREATE_EVENT_TITLE_EXAMPLE } from "@calcom/platform-types";
+
+class DeleteData_2024_06_14 {
+  @IsInt()
+  @DocsProperty({ example: 1 })
+  id!: number;
+
+  @IsInt()
+  @DocsProperty({ example: CREATE_EVENT_LENGTH_EXAMPLE })
+  lengthInMinutes!: number;
+
+  @IsString()
+  slug!: string;
+
+  @IsString()
+  @DocsProperty({ example: CREATE_EVENT_TITLE_EXAMPLE })
+  title!: string;
+}
+
+export class DeleteEventTypeOutput_2024_06_14 {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsIn([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @Type(() => DeleteData_2024_06_14)
+  data!: DeleteData_2024_06_14;
+}

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

@@ -0,0 +1,19 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsIn, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+import { EventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class GetEventTypeOutput_2024_06_14 {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsIn([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: EventTypeOutput_2024_06_14,
+  })
+  @ValidateNested()
+  @Type(() => EventTypeOutput_2024_06_14)
+  data!: EventTypeOutput_2024_06_14 | null;
+}

apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/get-event-types.output.ts

@@ -0,0 +1,17 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsArray, IsIn, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+import { EventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class GetEventTypesOutput_2024_06_14 {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsIn([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ValidateNested({ each: true })
+  @Type(() => EventTypeOutput_2024_06_14)
+  @IsArray()
+  data!: EventTypeOutput_2024_06_14[];
+}

apps/api/v2/src/ee/event-types/event-types_2024_06_14/outputs/update-event-type.output.ts

@@ -0,0 +1,20 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsIn, IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+import { EventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class UpdateEventTypeOutput_2024_06_14 {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsIn([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: EventTypeOutput_2024_06_14,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @Type(() => EventTypeOutput_2024_06_14)
+  data!: EventTypeOutput_2024_06_14;
+}

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

@@ -0,0 +1,257 @@
+import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/event-types_2024_06_14/constants/constants";
+import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
+import { InputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/input-event-types.service";
+import { OutputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/output-event-types.service";
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
+import { UsersService } from "@/modules/users/services/users.service";
+import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
+import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
+
+import { createEventType, updateEventType } from "@calcom/platform-libraries";
+import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries";
+import { dynamicEvent } from "@calcom/platform-libraries-0.0.13";
+import {
+  CreateEventTypeInput_2024_06_14,
+  UpdateEventTypeInput_2024_06_14,
+  GetEventTypesQuery_2024_06_14,
+  EventTypeOutput_2024_06_14,
+} from "@calcom/platform-types";
+import { EventType } from "@calcom/prisma/client";
+
+@Injectable()
+export class EventTypesService_2024_06_14 {
+  constructor(
+    private readonly eventTypesRepository: EventTypesRepository_2024_06_14,
+    private readonly inputEventTypesService: InputEventTypesService_2024_06_14,
+    private readonly outputEventTypesService: OutputEventTypesService_2024_06_14,
+    private readonly membershipsRepository: MembershipsRepository,
+    private readonly usersRepository: UsersRepository,
+    private readonly usersService: UsersService,
+    private readonly selectedCalendarsRepository: SelectedCalendarsRepository,
+    private readonly dbWrite: PrismaWriteService
+  ) {}
+
+  async createUserEventType(user: UserWithProfile, body: CreateEventTypeInput_2024_06_14) {
+    await this.checkCanCreateEventType(user.id, body);
+    const eventTypeUser = await this.getUserToCreateEvent(user);
+    const bodyTransformed = this.inputEventTypesService.transformInputCreateEventType(body);
+    const { eventType: eventTypeCreated } = await createEventType({
+      input: bodyTransformed,
+      ctx: {
+        user: eventTypeUser,
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        prisma: this.dbWrite.prisma,
+      },
+    });
+
+    const eventType = await this.eventTypesRepository.getEventTypeById(eventTypeCreated.id);
+
+    if (!eventType) {
+      throw new NotFoundException(`Event type with id ${eventTypeCreated.id} not found`);
+    }
+
+    return this.outputEventTypesService.getResponseEventType(user.id, eventType);
+  }
+
+  async checkCanCreateEventType(userId: number, body: CreateEventTypeInput_2024_06_14) {
+    const existsWithSlug = await this.eventTypesRepository.getUserEventTypeBySlug(userId, body.slug);
+    if (existsWithSlug) {
+      throw new BadRequestException("User already has an event type with this slug.");
+    }
+  }
+
+  async getEventTypeByUsernameAndSlug(username: string, eventTypeSlug: string) {
+    const user = await this.usersRepository.findByUsername(username);
+    if (!user) {
+      return null;
+    }
+
+    const eventType = await this.eventTypesRepository.getUserEventTypeBySlug(user.id, eventTypeSlug);
+
+    if (!eventType) {
+      return null;
+    }
+
+    return this.outputEventTypesService.getResponseEventType(user.id, eventType);
+  }
+
+  async getEventTypesByUsername(username: string) {
+    const user = await this.usersRepository.findByUsername(username);
+    if (!user) {
+      return [];
+    }
+    return this.getUserEventTypes(user.id);
+  }
+
+  async getUserToCreateEvent(user: UserWithProfile) {
+    const organizationId = user.movedToProfile?.organizationId || user.organizationId;
+    const isOrgAdmin = organizationId
+      ? await this.membershipsRepository.isUserOrganizationAdmin(user.id, organizationId)
+      : false;
+    const profileId = user.movedToProfile?.id || null;
+    return {
+      id: user.id,
+      organizationId: user.organizationId,
+      organization: { isOrgAdmin },
+      profile: { id: profileId },
+      metadata: user.metadata,
+    };
+  }
+
+  async getUserEventType(userId: number, eventTypeId: number) {
+    const eventType = await this.eventTypesRepository.getUserEventType(userId, eventTypeId);
+
+    if (!eventType) {
+      return null;
+    }
+
+    this.checkUserOwnsEventType(userId, eventType);
+    return this.outputEventTypesService.getResponseEventType(userId, eventType);
+  }
+
+  async getUserEventTypes(userId: number) {
+    const eventTypes = await this.eventTypesRepository.getUserEventTypes(userId);
+
+    const eventTypePromises = eventTypes.map(async (eventType) => {
+      return await this.outputEventTypesService.getResponseEventType(userId, eventType);
+    });
+
+    return await Promise.all(eventTypePromises);
+  }
+
+  async getUserEventTypeForAtom(user: UserWithProfile, eventTypeId: number) {
+    const organizationId = user.movedToProfile?.organizationId || user.organizationId;
+
+    const isUserOrganizationAdmin = organizationId
+      ? await this.membershipsRepository.isUserOrganizationAdmin(user.id, organizationId)
+      : false;
+
+    const eventType = await this.eventTypesRepository.getUserEventTypeForAtom(
+      user,
+      isUserOrganizationAdmin,
+      eventTypeId
+    );
+
+    if (!eventType) {
+      return null;
+    }
+
+    this.checkUserOwnsEventType(user.id, eventType.eventType);
+    return eventType;
+  }
+
+  async getEventTypesPublicByUsername(username: string): Promise<EventTypesPublic> {
+    const user = await this.usersRepository.findByUsername(username);
+    if (!user) {
+      throw new NotFoundException(`User with username "${username}" not found`);
+    }
+
+    return await getEventTypesPublic(user.id);
+  }
+
+  async getEventTypes(queryParams: GetEventTypesQuery_2024_06_14): Promise<EventTypeOutput_2024_06_14[]> {
+    const { username, eventSlug, usernames } = queryParams;
+
+    if (username && eventSlug) {
+      const eventType = await this.getEventTypeByUsernameAndSlug(username, eventSlug);
+      return eventType ? [eventType] : [];
+    }
+
+    if (username) {
+      return await this.getEventTypesByUsername(username);
+    }
+
+    if (usernames) {
+      const dynamicEventType = await this.getDynamicEventType(usernames);
+      return [dynamicEventType];
+    }
+
+    return [];
+  }
+
+  async getDynamicEventType(usernames: string[]) {
+    const users = await this.usersService.getByUsernames(usernames);
+    const usersFiltered: UserWithProfile[] = [];
+    for (const user of users) {
+      if (user) {
+        usersFiltered.push(user);
+      }
+    }
+
+    return this.outputEventTypesService.getResponseEventType(0, {
+      ...dynamicEvent,
+      users: usersFiltered,
+      isInstantEvent: false,
+    });
+  }
+
+  async createUserDefaultEventTypes(userId: number) {
+    const { sixtyMinutes, sixtyMinutesVideo, thirtyMinutes, thirtyMinutesVideo } = DEFAULT_EVENT_TYPES;
+
+    const defaultEventTypes = await Promise.all([
+      this.eventTypesRepository.createUserEventType(userId, thirtyMinutes),
+      this.eventTypesRepository.createUserEventType(userId, sixtyMinutes),
+      this.eventTypesRepository.createUserEventType(userId, thirtyMinutesVideo),
+      this.eventTypesRepository.createUserEventType(userId, sixtyMinutesVideo),
+    ]);
+
+    return defaultEventTypes;
+  }
+
+  async updateEventType(eventTypeId: number, body: UpdateEventTypeInput_2024_06_14, user: UserWithProfile) {
+    this.checkCanUpdateEventType(user.id, eventTypeId);
+    const eventTypeUser = await this.getUserToUpdateEvent(user);
+    const bodyTransformed = this.inputEventTypesService.transformInputUpdateEventType(body);
+    await updateEventType({
+      input: { id: eventTypeId, ...bodyTransformed },
+      ctx: {
+        user: eventTypeUser,
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        prisma: this.dbWrite.prisma,
+      },
+    });
+
+    const eventType = await this.eventTypesRepository.getEventTypeById(eventTypeId);
+
+    if (!eventType) {
+      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
+    }
+
+    return this.outputEventTypesService.getResponseEventType(user.id, eventType);
+  }
+
+  async checkCanUpdateEventType(userId: number, eventTypeId: number) {
+    const existingEventType = await this.getUserEventType(userId, eventTypeId);
+    if (!existingEventType) {
+      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
+    }
+    this.checkUserOwnsEventType(userId, { id: eventTypeId, userId: existingEventType.ownerId });
+  }
+
+  async getUserToUpdateEvent(user: UserWithProfile) {
+    const profileId = user.movedToProfile?.id || null;
+    const selectedCalendars = await this.selectedCalendarsRepository.getUserSelectedCalendars(user.id);
+    return { ...user, profile: { id: profileId }, selectedCalendars };
+  }
+
+  async deleteEventType(eventTypeId: number, userId: number) {
+    const existingEventType = await this.eventTypesRepository.getEventTypeById(eventTypeId);
+    if (!existingEventType) {
+      throw new NotFoundException(`Event type with ID=${eventTypeId} does not exist.`);
+    }
+
+    this.checkUserOwnsEventType(userId, existingEventType);
+
+    return this.eventTypesRepository.deleteEventType(eventTypeId);
+  }
+
+  checkUserOwnsEventType(userId: number, eventType: Pick<EventType, "id" | "userId">) {
+    if (userId !== eventType.userId) {
+      throw new ForbiddenException(`User with ID=${userId} does not own event type with ID=${eventType.id}`);
+    }
+  }
+}

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

@@ -0,0 +1,50 @@
+import { Injectable } from "@nestjs/common";
+
+import {
+  transformApiEventTypeBookingFields,
+  transformApiEventTypeLocations,
+} from "@calcom/platform-libraries-0.0.13";
+import { CreateEventTypeInput_2024_06_14, UpdateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
+
+@Injectable()
+export class InputEventTypesService_2024_06_14 {
+  transformInputCreateEventType(inputEventType: CreateEventTypeInput_2024_06_14) {
+    const defaultLocations: CreateEventTypeInput_2024_06_14["locations"] = [
+      {
+        type: "integration",
+        integration: "cal-video",
+      },
+    ];
+
+    const { lengthInMinutes, locations, bookingFields, ...rest } = inputEventType;
+
+    const eventType = {
+      ...rest,
+      length: lengthInMinutes,
+      locations: this.transformInputLocations(locations || defaultLocations),
+      bookingFields: this.transformInputBookingFields(bookingFields),
+    };
+
+    return eventType;
+  }
+
+  transformInputUpdateEventType(inputEventType: UpdateEventTypeInput_2024_06_14) {
+    const { locations, bookingFields, ...rest } = inputEventType;
+
+    const eventType = {
+      ...rest,
+      locations: locations ? this.transformInputLocations(locations) : undefined,
+      bookingFields: bookingFields ? this.transformInputBookingFields(bookingFields) : undefined,
+    };
+
+    return eventType;
+  }
+
+  transformInputLocations(inputLocations: CreateEventTypeInput_2024_06_14["locations"]) {
+    return transformApiEventTypeLocations(inputLocations);
+  }
+
+  transformInputBookingFields(inputBookingFields: CreateEventTypeInput_2024_06_14["bookingFields"]) {
+    return transformApiEventTypeBookingFields(inputBookingFields);
+  }
+}

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

@@ -0,0 +1,150 @@
+import { Injectable } from "@nestjs/common";
+import type { EventType, User, Schedule } from "@prisma/client";
+
+import {
+  EventTypeMetaDataSchema,
+  userMetadata,
+  getResponseEventTypeLocations,
+  getResponseEventTypeBookingFields,
+  parseRecurringEvent,
+  TransformedLocationsSchema,
+  BookingFieldsSchema,
+} from "@calcom/platform-libraries-0.0.13";
+
+type EventTypeRelations = { users: User[]; schedule: Schedule | null };
+type DatabaseEventType = EventType & EventTypeRelations;
+
+type Input = Pick<
+  DatabaseEventType,
+  | "id"
+  | "length"
+  | "title"
+  | "description"
+  | "disableGuests"
+  | "slotInterval"
+  | "minimumBookingNotice"
+  | "beforeEventBuffer"
+  | "afterEventBuffer"
+  | "slug"
+  | "schedulingType"
+  | "requiresConfirmation"
+  | "price"
+  | "currency"
+  | "lockTimeZoneToggleOnBookingPage"
+  | "seatsPerTimeSlot"
+  | "forwardParamsSuccessRedirect"
+  | "successRedirectUrl"
+  | "seatsShowAvailabilityCount"
+  | "isInstantEvent"
+  | "locations"
+  | "bookingFields"
+  | "recurringEvent"
+  | "metadata"
+  | "users"
+  | "schedule"
+>;
+
+@Injectable()
+export class OutputEventTypesService_2024_06_14 {
+  async getResponseEventType(ownerId: number, databaseEventType: Input) {
+    const {
+      id,
+      length,
+      title,
+      description,
+      disableGuests,
+      slotInterval,
+      minimumBookingNotice,
+      beforeEventBuffer,
+      afterEventBuffer,
+      slug,
+      schedulingType,
+      requiresConfirmation,
+      price,
+      currency,
+      lockTimeZoneToggleOnBookingPage,
+      seatsPerTimeSlot,
+      forwardParamsSuccessRedirect,
+      successRedirectUrl,
+      seatsShowAvailabilityCount,
+      isInstantEvent,
+    } = databaseEventType;
+
+    const locations = this.transformLocations(databaseEventType.locations);
+    const bookingFields = this.transformBookingFields(databaseEventType.bookingFields);
+    const recurringEvent = this.transformRecurringEvent(databaseEventType.recurringEvent);
+    const metadata = this.transformMetadata(databaseEventType.metadata) || {};
+    const schedule = await this.getSchedule(databaseEventType);
+    const users = this.transformUsers(databaseEventType.users);
+
+    return {
+      id,
+      ownerId,
+      lengthInMinutes: length,
+      title,
+      slug,
+      description: description || "",
+      locations,
+      bookingFields,
+      recurringEvent,
+      disableGuests,
+      slotInterval,
+      minimumBookingNotice,
+      beforeEventBuffer,
+      afterEventBuffer,
+      schedulingType,
+      metadata,
+      requiresConfirmation,
+      price,
+      currency,
+      lockTimeZoneToggleOnBookingPage,
+      seatsPerTimeSlot,
+      forwardParamsSuccessRedirect,
+      successRedirectUrl,
+      seatsShowAvailabilityCount,
+      isInstantEvent,
+      users,
+      schedule,
+    };
+  }
+
+  transformLocations(locations: any) {
+    if (!locations) return [];
+    return getResponseEventTypeLocations(TransformedLocationsSchema.parse(locations));
+  }
+
+  transformBookingFields(inputBookingFields: any) {
+    if (!inputBookingFields) return [];
+    return getResponseEventTypeBookingFields(BookingFieldsSchema.parse(inputBookingFields));
+  }
+
+  transformRecurringEvent(recurringEvent: any) {
+    if (!recurringEvent) return null;
+    return parseRecurringEvent(recurringEvent);
+  }
+
+  transformMetadata(metadata: any) {
+    if (!metadata) return {};
+    return EventTypeMetaDataSchema.parse(metadata);
+  }
+
+  async getSchedule(databaseEventType: Input) {
+    return databaseEventType.schedule || null;
+  }
+
+  transformUsers(users: User[]) {
+    return users.map((user) => {
+      const metadata = user.metadata ? userMetadata.parse(user.metadata) : {};
+      return {
+        id: user.id,
+        name: user.name,
+        username: user.username,
+        avatarUrl: user.avatarUrl,
+        brandColor: user.brandColor,
+        darkBrandColor: user.darkBrandColor,
+        weekStart: user.weekStart,
+        metadata: metadata || {},
+      };
+    });
+  }
+}

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

@@ -1,6 +1,7 @@
 import { BookingsModule } from "@/ee/bookings/bookings.module";
 import { CalendarsModule } from "@/ee/calendars/calendars.module";
-import { EventTypesModule } from "@/ee/event-types/event-types.module";
+import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module";
+import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
 import { GcalModule } from "@/ee/gcal/gcal.module";
 import { MeModule } from "@/ee/me/me.module";
 import { ProviderModule } from "@/ee/provider/provider.module";
@@ -17,7 +18,8 @@ import { Module } from "@nestjs/common";
     SchedulesModule_2024_04_15,
     SchedulesModule_2024_06_11,
     MeModule,
-    EventTypesModule,
+    EventTypesModule_2024_04_15,
+    EventTypesModule_2024_06_14,
     CalendarsModule,
     BookingsModule,
     SlotsModule,

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

@@ -1,5 +1,5 @@
 import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service";
-import { VERSION_2024_06_11_VALUE } from "@/lib/api-versions";
+import { VERSION_2024_06_14, VERSION_2024_06_11 } from "@/lib/api-versions";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
@@ -34,7 +34,7 @@ import {
 
 @Controller({
   path: "/v2/schedules",
-  version: VERSION_2024_06_11_VALUE,
+  version: [VERSION_2024_06_14, VERSION_2024_06_11],
 })
 @UseGuards(ApiAuthGuard, PermissionsGuard)
 @DocsTags("Schedules")

apps/api/v2/src/ee/schedules/schedules_2024_06_11/schedules.module.ts

@@ -17,6 +17,6 @@ import { Module } from "@nestjs/common";
     OutputSchedulesService_2024_06_11,
   ],
   controllers: [SchedulesController_2024_06_11],
-  exports: [SchedulesService_2024_06_11, SchedulesRepository_2024_06_11],
+  exports: [SchedulesService_2024_06_11, SchedulesRepository_2024_06_11, OutputSchedulesService_2024_06_11],
 })
 export class SchedulesModule_2024_06_11 {}

apps/api/v2/src/lib/api-versions.ts

@@ -1,7 +1,17 @@
 import { VersionValue } from "@nestjs/common/interfaces";
 
-import { API_VERSIONS, VERSION_2024_04_15, VERSION_2024_06_11 } from "@calcom/platform-constants";
+import {
+  API_VERSIONS,
+  VERSION_2024_04_15,
+  VERSION_2024_06_11,
+  VERSION_2024_06_14,
+} from "@calcom/platform-constants";
 
 export const API_VERSIONS_VALUES: VersionValue = API_VERSIONS as unknown as VersionValue;
+export const VERSION_2024_06_14_VALUE: VersionValue = VERSION_2024_06_14 as unknown as VersionValue;
 export const VERSION_2024_06_11_VALUE: VersionValue = VERSION_2024_06_11 as unknown as VersionValue;
 export const VERSION_2024_04_15_VALUE: VersionValue = VERSION_2024_04_15 as unknown as VersionValue;
+
+export { VERSION_2024_04_15 };
+export { VERSION_2024_06_11 };
+export { VERSION_2024_06_14 };

apps/api/v2/src/lib/roles/constants.ts

@@ -0,0 +1,13 @@
+import { MembershipRole } from "@prisma/client";
+
+export const SYSTEM_ADMIN_ROLE = "SYSADMIN";
+export const ORG_ROLES = [
+  `ORG_${MembershipRole.OWNER}`,
+  `ORG_${MembershipRole.ADMIN}`,
+  `ORG_${MembershipRole.MEMBER}`,
+] as const;
+export const TEAM_ROLES = [
+  `TEAM_${MembershipRole.OWNER}`,
+  `TEAM_${MembershipRole.ADMIN}`,
+  `TEAM_${MembershipRole.MEMBER}`,
+] as const;

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

@@ -0,0 +1,33 @@
+import { ExecutionContext } from "@nestjs/common";
+import { createParamDecorator } from "@nestjs/common";
+
+import { Team } from "@calcom/prisma/client";
+
+export type GetOrgReturnType = Team;
+
+export const GetOrg = createParamDecorator<
+  keyof GetOrgReturnType | (keyof GetOrgReturnType)[],
+  ExecutionContext
+>((data, ctx) => {
+  const request = ctx.switchToHttp().getRequest();
+  const organization = request.organization as GetOrgReturnType;
+
+  if (!organization) {
+    throw new Error("GetOrg decorator : Org not found");
+  }
+
+  if (Array.isArray(data)) {
+    return data.reduce((prev, curr) => {
+      return {
+        ...prev,
+        [curr]: organization[curr],
+      };
+    }, {});
+  }
+
+  if (data) {
+    return organization[data];
+  }
+
+  return organization;
+});

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

@@ -0,0 +1,33 @@
+import { ExecutionContext } from "@nestjs/common";
+import { createParamDecorator } from "@nestjs/common";
+
+import { Team } from "@calcom/prisma/client";
+
+export type GetTeamReturnType = Team;
+
+export const GetTeam = createParamDecorator<
+  keyof GetTeamReturnType | (keyof GetTeamReturnType)[],
+  ExecutionContext
+>((data, ctx) => {
+  const request = ctx.switchToHttp().getRequest();
+  const team = request.team as GetTeamReturnType;
+
+  if (!team) {
+    throw new Error("GetTeam decorator : Team not found");
+  }
+
+  if (Array.isArray(data)) {
+    return data.reduce((prev, curr) => {
+      return {
+        ...prev,
+        [curr]: team[curr],
+      };
+    }, {});
+  }
+
+  if (data) {
+    return team[data];
+  }
+
+  return team;
+});

apps/api/v2/src/modules/auth/decorators/roles/membership-roles.decorator.ts

@@ -0,0 +1,4 @@
+import { Reflector } from "@nestjs/core";
+import { MembershipRole } from "@prisma/client";
+
+export const MembershipRoles = Reflector.createDecorator<MembershipRole[]>();

apps/api/v2/src/modules/auth/decorators/roles/roles.decorator.ts

@@ -1,4 +1,6 @@
+import { SYSTEM_ADMIN_ROLE, ORG_ROLES, TEAM_ROLES } from "@/lib/roles/constants";
 import { Reflector } from "@nestjs/core";
-import { MembershipRole } from "@prisma/client";
 
-export const Roles = Reflector.createDecorator<MembershipRole[]>();
+export const Roles = Reflector.createDecorator<
+  (typeof ORG_ROLES)[number] | (typeof TEAM_ROLES)[number] | typeof SYSTEM_ADMIN_ROLE
+>();

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

@@ -1,4 +1,4 @@
-import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { MembershipRoles } from "@/modules/auth/decorators/roles/membership-roles.decorator";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { OrganizationsService } from "@/modules/organizations/services/organizations.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
@@ -27,7 +27,7 @@ export class OrganizationRolesGuard implements CanActivate {
     await this.isPlatform(organizationId);
 
     const membership = await this.membershipRepository.findOrgUserMembership(organizationId, user.id);
-    const allowedRoles = this.reflector.get(Roles, context.getHandler());
+    const allowedRoles = this.reflector.get(MembershipRoles, context.getHandler());
 
     this.isMembershipAccepted(membership.accepted);
     this.isRoleAllowed(membership.role, allowedRoles);

apps/api/v2/src/modules/auth/guards/organizations/is-org.guard.ts

@@ -0,0 +1,28 @@
+import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { Injectable, CanActivate, ExecutionContext, ForbiddenException } from "@nestjs/common";
+import { Request } from "express";
+
+import { Team } from "@calcom/prisma/client";
+
+@Injectable()
+export class IsOrgGuard implements CanActivate {
+  constructor(private organizationsRepository: OrganizationsRepository) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request & { organization: Team }>();
+    const organizationId: string = request.params.orgId;
+
+    if (!organizationId) {
+      throw new ForbiddenException("No organization id found in request params.");
+    }
+
+    const org = await this.organizationsRepository.findById(Number(organizationId));
+
+    if (org && org.isOrganization) {
+      request.organization = org;
+      return true;
+    }
+
+    return false;
+  }
+}

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

@@ -0,0 +1,163 @@
+import { ORG_ROLES, TEAM_ROLES, SYSTEM_ADMIN_ROLE } from "@/lib/roles/constants";
+import { GetUserReturnType } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { RedisService } from "@/modules/redis/redis.service";
+import { Injectable, CanActivate, ExecutionContext, ForbiddenException, Logger } from "@nestjs/common";
+import { Reflector } from "@nestjs/core";
+import { Request } from "express";
+
+import { Team } from "@calcom/prisma/client";
+
+@Injectable()
+export class RolesGuard implements CanActivate {
+  private readonly logger = new Logger("RolesGuard Logger");
+  constructor(
+    private reflector: Reflector,
+    private membershipRepository: MembershipsRepository,
+    private readonly redisService: RedisService
+  ) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request & { team: Team }>();
+    const teamId = request.params.teamId as string;
+    const orgId = request.params.orgId as string;
+    const user = request.user as GetUserReturnType;
+    const allowedRole = this.reflector.get(Roles, context.getHandler());
+    const REDIS_CACHE_KEY = `apiv2:user:${user.id ?? "none"}:org:${orgId ?? "none"}:team:${
+      teamId ?? "none"
+    }:guard:roles:${allowedRole}`;
+    const cachedAccess = JSON.parse((await this.redisService.redis.get(REDIS_CACHE_KEY)) ?? "false");
+
+    if (cachedAccess) {
+      return cachedAccess;
+    }
+
+    let canAccess = false;
+
+    // User is not authenticated
+    if (!user) {
+      this.logger.log("User is not authenticated, denying access.");
+      canAccess = false;
+    }
+
+    // System admin can access everything
+    else if (user.isSystemAdmin) {
+      this.logger.log(`User (${user.id}) is system admin, allowing access.`);
+      canAccess = true;
+    }
+
+    // if the required role is SYSTEM_ADMIN_ROLE but user is not system admin, return false
+    else if (allowedRole === SYSTEM_ADMIN_ROLE && !user.isSystemAdmin) {
+      this.logger.log(`User (${user.id}) is not system admin, denying access.`);
+      canAccess = false;
+    }
+
+    // Checking the role of the user within the organization
+    else if (Boolean(orgId) && !Boolean(teamId)) {
+      const membership = await this.membershipRepository.findMembershipByOrgId(Number(orgId), user.id);
+      if (!membership) {
+        this.logger.log(`User (${user.id}) is not a member of the organization (${orgId}), denying access.`);
+        throw new ForbiddenException(`User is not a member of the organization.`);
+      }
+
+      if (ORG_ROLES.includes(allowedRole as unknown as (typeof ORG_ROLES)[number])) {
+        canAccess = hasMinimumRole({
+          checkRole: `ORG_${membership.role}`,
+          minimumRole: allowedRole,
+          roles: ORG_ROLES,
+        });
+      }
+    }
+
+    // Checking the role of the user within the team
+    else if (Boolean(teamId) && !Boolean(orgId)) {
+      const membership = await this.membershipRepository.findMembershipByTeamId(Number(teamId), user.id);
+      if (!membership) {
+        this.logger.log(`User (${user.id}) is not a member of the team (${teamId}), denying access.`);
+        throw new ForbiddenException(`User is not a member of the team.`);
+      }
+      if (TEAM_ROLES.includes(allowedRole as unknown as (typeof TEAM_ROLES)[number])) {
+        canAccess = hasMinimumRole({
+          checkRole: `TEAM_${membership.role}`,
+          minimumRole: allowedRole,
+          roles: TEAM_ROLES,
+        });
+      }
+    }
+
+    // Checking the role for team and org, org is above team in term of permissions
+    else if (Boolean(teamId) && Boolean(orgId)) {
+      const teamMembership = await this.membershipRepository.findMembershipByTeamId(Number(teamId), user.id);
+      const orgMembership = await this.membershipRepository.findMembershipByOrgId(Number(orgId), user.id);
+
+      if (!orgMembership) {
+        this.logger.log(`User (${user.id}) is not part of the organization (${orgId}), denying access.`);
+        throw new ForbiddenException(`User is not part of the organization.`);
+      }
+
+      // if the role checked is a TEAM role
+      if (TEAM_ROLES.includes(allowedRole as unknown as (typeof TEAM_ROLES)[number])) {
+        // if the user is admin or owner of org, allow request because org > team
+        if (`ORG_${orgMembership.role}` === "ORG_ADMIN" || `ORG_${orgMembership.role}` === "ORG_OWNER") {
+          canAccess = true;
+        }
+
+        if (!teamMembership) {
+          this.logger.log(
+            `User (${user.id}) is not part of the team (${teamId}) and/or, is not an admin nor an owner of the organization (${orgId}).`
+          );
+          throw new ForbiddenException(
+            "User is not part of the team and/or, is not an admin nor an owner of the organization."
+          );
+        }
+
+        // if user is not admin nor an owner of org, and is part of the team, then check user team membership role
+        canAccess = hasMinimumRole({
+          checkRole: `TEAM_${teamMembership.role}`,
+          minimumRole: allowedRole,
+          roles: TEAM_ROLES,
+        });
+      }
+
+      // if allowed role is a ORG ROLE, check org membersip role
+      else if (ORG_ROLES.includes(allowedRole as unknown as (typeof ORG_ROLES)[number])) {
+        canAccess = hasMinimumRole({
+          checkRole: `ORG_${orgMembership.role}`,
+          minimumRole: allowedRole,
+          roles: ORG_ROLES,
+        });
+      }
+    }
+    await this.redisService.redis.set(REDIS_CACHE_KEY, String(canAccess), "EX", 3600);
+    return canAccess;
+  }
+}
+
+type Roles = (typeof ORG_ROLES)[number] | (typeof TEAM_ROLES)[number];
+
+type HasMinimumTeamRoleProp = {
+  checkRole: (typeof TEAM_ROLES)[number];
+  minimumRole: string;
+  roles: typeof TEAM_ROLES;
+};
+
+type HasMinimumOrgRoleProp = {
+  checkRole: (typeof ORG_ROLES)[number];
+  minimumRole: string;
+  roles: typeof ORG_ROLES;
+};
+
+type HasMinimumRoleProp = HasMinimumTeamRoleProp | HasMinimumOrgRoleProp;
+
+export function hasMinimumRole(props: HasMinimumRoleProp): boolean {
+  const checkedRoleIndex = props.roles.indexOf(props.checkRole as never);
+  const requiredRoleIndex = props.roles.indexOf(props.minimumRole as never);
+
+  // minimum role given does not exist
+  if (checkedRoleIndex === -1 || requiredRoleIndex === -1) {
+    throw new Error("Invalid role");
+  }
+
+  return checkedRoleIndex <= requiredRoleIndex;
+}

apps/api/v2/src/modules/auth/guards/teams/is-team-in-org.guard.ts

@@ -0,0 +1,43 @@
+import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import {
+  Injectable,
+  CanActivate,
+  ExecutionContext,
+  ForbiddenException,
+  NotFoundException,
+} from "@nestjs/common";
+import { Request } from "express";
+
+import { Team } from "@calcom/prisma/client";
+
+@Injectable()
+export class IsTeamInOrg implements CanActivate {
+  constructor(private organizationsTeamsRepository: OrganizationsTeamsRepository) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request & { team: Team }>();
+    const teamId: string = request.params.teamId;
+    const orgId: string = request.params.orgId;
+
+    if (!orgId) {
+      throw new ForbiddenException("No org id found in request params.");
+    }
+
+    if (!teamId) {
+      throw new ForbiddenException("No team id found in request params.");
+    }
+
+    const team = await this.organizationsTeamsRepository.findOrgTeam(Number(orgId), Number(teamId));
+
+    if (team && !team.isOrganization && team.parentId === Number(orgId)) {
+      request.team = team;
+      return true;
+    }
+
+    if (!team) {
+      throw new NotFoundException(`Team (${teamId}) not found.`);
+    }
+
+    return false;
+  }
+}

apps/api/v2/src/modules/auth/guards/users/is-user-in-org.guard.ts

@@ -0,0 +1,33 @@
+import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { Injectable, CanActivate, ExecutionContext, ForbiddenException } from "@nestjs/common";
+import { Request } from "express";
+
+import { Team } from "@calcom/prisma/client";
+
+@Injectable()
+export class IsUserInOrg implements CanActivate {
+  constructor(private organizationsRepository: OrganizationsRepository) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request & { team: Team }>();
+    const orgId: string = request.params.orgId;
+    const userId: string = request.params.userId;
+
+    if (!userId) {
+      throw new ForbiddenException("No user id found in request params.");
+    }
+
+    if (!orgId) {
+      throw new ForbiddenException("No org id found in request params.");
+    }
+
+    const user = await this.organizationsRepository.findOrgUser(Number(orgId), Number(userId));
+
+    if (user) {
+      request.user = user;
+      return true;
+    }
+
+    return false;
+  }
+}

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

@@ -1,6 +1,6 @@
 import { AppConfig } from "@/config/type";
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
-import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { MembershipRoles } from "@/modules/auth/decorators/roles/membership-roles.decorator";
 import { NextAuthGuard } from "@/modules/auth/guards/next-auth/next-auth.guard";
 import { OrganizationRolesGuard } from "@/modules/auth/guards/organization-roles/organization-roles.guard";
 import { SubscribeToPlanInput } from "@/modules/billing/controllers/inputs/subscribe-to-plan.input";
@@ -47,7 +47,7 @@ export class BillingController {
 
   @Get("/:teamId/check")
   @UseGuards(NextAuthGuard, OrganizationRolesGuard)
-  @Roles(["OWNER", "ADMIN", "MEMBER"])
+  @MembershipRoles(["OWNER", "ADMIN", "MEMBER"])
   async checkTeamBilling(
     @Param("teamId") teamId: number
   ): Promise<ApiResponse<CheckPlatformBillingResponseDto>> {
@@ -64,7 +64,7 @@ export class BillingController {
 
   @Post("/:teamId/subscribe")
   @UseGuards(NextAuthGuard, OrganizationRolesGuard)
-  @Roles(["OWNER", "ADMIN"])
+  @MembershipRoles(["OWNER", "ADMIN"])
   async subscribeTeamToStripe(
     @Param("teamId") teamId: number,
     @Body() input: SubscribeToPlanInput

apps/api/v2/src/modules/deployments/deployments.service.ts

@@ -33,7 +33,7 @@ export class DeploymentsService {
     if (!licenseKey) {
       return false;
     }
-    const licenseKeyUrl = this.configService.get("api.licenseKeyUrl");
+    const licenseKeyUrl = this.configService.get("api.licenseKeyUrl") + `?key=${licenseKey}`;
     const cachedData = await this.redisService.redis.get(getLicenseCacheKey(licenseKey));
     if (cachedData) {
       return (JSON.parse(cachedData) as LicenseCheckResponse)?.valid;

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

@@ -5,8 +5,10 @@ import { TimezoneModule } from "@/modules/timezones/timezones.module";
 import type { MiddlewareConsumer, NestModule } from "@nestjs/common";
 import { Module } from "@nestjs/common";
 
+import { UsersModule } from "./users/users.module";
+
 @Module({
-  imports: [OAuthClientModule, BillingModule, PlatformEndpointsModule, TimezoneModule],
+  imports: [OAuthClientModule, BillingModule, PlatformEndpointsModule, TimezoneModule, UsersModule],
 })
 export class EndpointsModule implements NestModule {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars

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

@@ -18,6 +18,23 @@ export class MembershipsRepository {
     return membership;
   }
 
+  async findMembershipByTeamId(teamId: number, userId: number) {
+    const membership = await this.dbRead.prisma.membership.findUnique({
+      where: {
+        userId_teamId: {
+          userId: userId,
+          teamId: teamId,
+        },
+      },
+    });
+
+    return membership;
+  }
+
+  async findMembershipByOrgId(orgId: number, userId: number) {
+    return this.findMembershipByTeamId(orgId, userId);
+  }
+
   async isUserOrganizationAdmin(userId: number, organizationId: number) {
     const adminMembership = await this.dbRead.prisma.membership.findFirst({
       where: {

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

@@ -1,6 +1,6 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/constants/constants";
+import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/event-types_2024_04_15/constants/constants";
 import { HttpExceptionFilter } from "@/filters/http-exception.filter";
 import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
 import {

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

@@ -1,7 +1,7 @@
 import { getEnv } from "@/env";
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
-import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { MembershipRoles } from "@/modules/auth/decorators/roles/membership-roles.decorator";
 import { NextAuthGuard } from "@/modules/auth/guards/next-auth/next-auth.guard";
 import { OrganizationRolesGuard } from "@/modules/auth/guards/organization-roles/organization-roles.guard";
 import { GetManagedUsersOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-users.output";
@@ -64,7 +64,7 @@ export class OAuthClientsController {
 
   @Post("/")
   @HttpCode(HttpStatus.CREATED)
-  @Roles([MembershipRole.ADMIN, MembershipRole.OWNER])
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   @DocsOperation({ description: AUTH_DOCUMENTATION })
   @DocsCreatedResponse({
     description: "Create an OAuth client",
@@ -96,7 +96,7 @@ export class OAuthClientsController {
 
   @Get("/")
   @HttpCode(HttpStatus.OK)
-  @Roles([MembershipRole.ADMIN, MembershipRole.OWNER, MembershipRole.MEMBER])
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER, MembershipRole.MEMBER])
   @DocsOperation({ description: AUTH_DOCUMENTATION })
   async getOAuthClients(@GetUser() user: UserWithProfile): Promise<GetOAuthClientsResponseDto> {
     const organizationId = (user.movedToProfile?.organizationId ?? user.organizationId) as number;
@@ -107,7 +107,7 @@ export class OAuthClientsController {
 
   @Get("/:clientId")
   @HttpCode(HttpStatus.OK)
-  @Roles([MembershipRole.ADMIN, MembershipRole.OWNER, MembershipRole.MEMBER])
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER, MembershipRole.MEMBER])
   @DocsOperation({ description: AUTH_DOCUMENTATION })
   async getOAuthClientById(@Param("clientId") clientId: string): Promise<GetOAuthClientResponseDto> {
     const client = await this.oauthClientRepository.getOAuthClient(clientId);
@@ -119,7 +119,7 @@ export class OAuthClientsController {
 
   @Get("/:clientId/managed-users")
   @HttpCode(HttpStatus.OK)
-  @Roles([MembershipRole.ADMIN, MembershipRole.OWNER, MembershipRole.MEMBER])
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER, MembershipRole.MEMBER])
   @DocsOperation({ description: AUTH_DOCUMENTATION })
   async getOAuthClientManagedUsersById(
     @Param("clientId") clientId: string,
@@ -137,7 +137,7 @@ export class OAuthClientsController {
 
   @Patch("/:clientId")
   @HttpCode(HttpStatus.OK)
-  @Roles([MembershipRole.ADMIN, MembershipRole.OWNER])
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   @DocsOperation({ description: AUTH_DOCUMENTATION })
   async updateOAuthClient(
     @Param("clientId") clientId: string,
@@ -150,7 +150,7 @@ export class OAuthClientsController {
 
   @Delete("/:clientId")
   @HttpCode(HttpStatus.OK)
-  @Roles([MembershipRole.ADMIN, MembershipRole.OWNER])
+  @MembershipRoles([MembershipRole.ADMIN, MembershipRole.OWNER])
   @DocsOperation({ description: AUTH_DOCUMENTATION })
   async deleteOAuthClient(@Param("clientId") clientId: string): Promise<GetOAuthClientResponseDto> {
     this.logger.log(`Deleting OAuth Client with ID: ${clientId}`);

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

@@ -1,4 +1,4 @@
-import { EventTypesModule } from "@/ee/event-types/event-types.module";
+import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { AuthModule } from "@/modules/auth/auth.module";
 import { BillingModule } from "@/modules/billing/billing.module";
@@ -28,7 +28,7 @@ import { Global, Module } from "@nestjs/common";
     UsersModule,
     TokensModule,
     MembershipsModule,
-    EventTypesModule,
+    EventTypesModule_2024_04_15,
     OrganizationsModule,
     StripeModule,
     BillingModule,

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

@@ -1,4 +1,4 @@
-import { EventTypesService } from "@/ee/event-types/services/event-types.service";
+import { EventTypesService_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/services/event-types.service";
 import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
 import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input";
@@ -7,14 +7,14 @@ import { UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, Injectable } from "@nestjs/common";
 import { User } from "@prisma/client";
 
-import { createNewUsersConnectToOrgIfExists, slugify } from "@calcom/platform-libraries-0.0.2";
+import { createNewUsersConnectToOrgIfExists, slugify } from "@calcom/platform-libraries-0.0.15";
 
 @Injectable()
 export class OAuthClientUsersService {
   constructor(
     private readonly userRepository: UsersRepository,
     private readonly tokensRepository: TokensRepository,
-    private readonly eventTypesService: EventTypesService,
+    private readonly eventTypesService: EventTypesService_2024_04_15,
     private readonly schedulesService: SchedulesService_2024_04_15
   ) {}
 
@@ -36,17 +36,17 @@ export class OAuthClientUsersService {
       const email = this.getOAuthUserEmail(oAuthClientId, body.email);
       user = (
         await createNewUsersConnectToOrgIfExists({
-          usernamesOrEmails: [email],
-          input: {
-            teamId: organizationId,
-            role: "MEMBER",
-            usernameOrEmail: [email],
-            isOrg: true,
-            language: "en",
-          },
+          invitations: [
+            {
+              usernameOrEmail: email,
+              role: "MEMBER",
+            },
+          ],
+          teamId: organizationId,
+          isOrg: true,
           parentId: null,
           autoAcceptEmailDomain: "never-auto-accept-email-domain-for-managed-users",
-          connectionInfoMap: {
+          orgConnectInfoByUsernameOrEmail: {
             [email]: {
               orgId: organizationId,
               autoAccept: true,

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

@@ -0,0 +1,433 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { User } from "@prisma/client";
+import * as request from "supertest";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { ApiSuccessResponse } from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+describe("Organizations Team Endpoints", () => {
+  describe("User Authentication - User is Org Admin", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let team: Team;
+    let team2: Team;
+    let teamCreatedViaApi: Team;
+
+    const userEmail = "org-admin-teams-controller-e2e@api.com";
+    let user: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      team = await teamsRepositoryFixture.create({
+        name: "Test org team",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      team2 = await teamsRepositoryFixture.create({
+        name: "Test org team 2",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should get all the teams of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Team[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data[0].id).toEqual(team.id);
+          expect(responseBody.data[1].id).toEqual(team2.id);
+        });
+    });
+
+    it("should get all the teams of the org paginated", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams?skip=1&take=1`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Team[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data[0].id).toEqual(team2.id);
+        });
+    });
+
+    it("should fail if org does not exist", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/120494059/teams`).expect(403);
+    });
+
+    it("should get the team of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${team.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Team> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(team.id);
+          expect(responseBody.data.parentId).toEqual(team.parentId);
+        });
+    });
+
+    it("should create the team of the org", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams`)
+        .send({
+          name: "Team created via API",
+        } satisfies CreateOrgTeamDto)
+        .expect(201)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Team> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          teamCreatedViaApi = responseBody.data;
+          expect(teamCreatedViaApi.name).toEqual("Team created via API");
+          expect(teamCreatedViaApi.parentId).toEqual(org.id);
+        });
+    });
+
+    it("should update the team of the org", async () => {
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${teamCreatedViaApi.id}`)
+        .send({
+          name: "Team created via API Updated",
+        } satisfies CreateOrgTeamDto)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Team> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          teamCreatedViaApi = responseBody.data;
+          expect(teamCreatedViaApi.name).toEqual("Team created via API Updated");
+          expect(teamCreatedViaApi.parentId).toEqual(org.id);
+        });
+    });
+
+    it("should delete the team of the org we created via api", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/teams/${teamCreatedViaApi.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Team> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(teamCreatedViaApi.id);
+          expect(responseBody.data.parentId).toEqual(teamCreatedViaApi.parentId);
+        });
+    });
+
+    it("should fail to get the team of the org we just deleted", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${teamCreatedViaApi.id}`)
+        .expect(404);
+    });
+
+    it("should fail if the team does not exist", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/teams/123132145`).expect(404);
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await teamsRepositoryFixture.delete(team.id);
+      await teamsRepositoryFixture.delete(team2.id);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});
+
+describe("Organizations Team Endpoints", () => {
+  describe("User Authentication - User is Org Member", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let team: Team;
+    let team2: Team;
+
+    const userEmail = "org-member-teams-controller-e2e@api.com";
+    let user: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      team = await teamsRepositoryFixture.create({
+        name: "Test org team",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      team2 = await teamsRepositoryFixture.create({
+        name: "Test org team 2",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should deny get all the teams of the org", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/teams`).expect(403);
+    });
+
+    it("should deny get all the teams of the org paginated", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/teams?skip=1&take=1`).expect(403);
+    });
+
+    it("should deny get the team of the org", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/teams/${team.id}`).expect(403);
+    });
+
+    it("should deny create the team of the org", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams`)
+        .send({
+          name: "Team created via API",
+        } satisfies CreateOrgTeamDto)
+        .expect(403);
+    });
+
+    it("should deny update the team of the org", async () => {
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${team.id}`)
+        .send({
+          name: "Team created via API Updated",
+        } satisfies CreateOrgTeamDto)
+        .expect(403);
+    });
+
+    it("should deny delete the team of the org we created via api", async () => {
+      return request(app.getHttpServer()).delete(`/v2/organizations/${org.id}/teams/${team2.id}`).expect(403);
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await teamsRepositoryFixture.delete(team.id);
+      await teamsRepositoryFixture.delete(team2.id);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});
+
+describe("Organizations Team Endpoints", () => {
+  describe("User Authentication - User is Team Owner", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let team: Team;
+    let team2: Team;
+
+    const userEmail = "org-member-teams-owner-controller-e2e@api.com";
+    let user: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      team = await teamsRepositoryFixture.create({
+        name: "Test org team",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      team2 = await teamsRepositoryFixture.create({
+        name: "Test org team 2",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "OWNER",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: team.id } },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "OWNER",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: team2.id } },
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should deny get all the teams of the org", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/teams`).expect(403);
+    });
+
+    it("should deny get all the teams of the org paginated", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/teams?skip=1&take=1`).expect(403);
+    });
+
+    it("should get the team of the org for which the user is team owner", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/teams/${team.id}`).expect(200);
+    });
+
+    it("should deny create the team of the org", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams`)
+        .send({
+          name: "Team created via API",
+        } satisfies CreateOrgTeamDto)
+        .expect(403);
+    });
+
+    it("should deny update the team of the org", async () => {
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${team.id}`)
+        .send({
+          name: "Team created via API Updated",
+        } satisfies CreateOrgTeamDto)
+        .expect(403);
+    });
+
+    it("should deny delete the team of the org we created via api", async () => {
+      return request(app.getHttpServer()).delete(`/v2/organizations/${org.id}/teams/${team2.id}`).expect(403);
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await teamsRepositoryFixture.delete(team.id);
+      await teamsRepositoryFixture.delete(team2.id);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});

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

@@ -0,0 +1,106 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { GetTeam } from "@/modules/auth/decorators/get-team/get-team.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
+import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
+import { OrgTeamOutputDto } from "@/modules/organizations/outputs/organization-team.output";
+import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Param,
+  ParseIntPipe,
+  Query,
+  Delete,
+  Patch,
+  Post,
+  Body,
+} from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+import { plainToClass } from "class-transformer";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { ApiResponse, SkipTakePagination } from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+@Controller({
+  path: "/v2/organizations/:orgId/teams",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard)
+@DocsTags("Organizations Teams")
+export class OrganizationsTeamsController {
+  constructor(private organizationsTeamsService: OrganizationsTeamsService) {}
+
+  @Get()
+  @UseGuards()
+  @Roles("ORG_ADMIN")
+  async getAllTeams(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<ApiResponse<OrgTeamOutputDto[]>> {
+    const { skip, take } = queryParams;
+    const teams = await this.organizationsTeamsService.getPaginatedOrgTeams(orgId, skip ?? 0, take ?? 250);
+    return {
+      status: SUCCESS_STATUS,
+      data: teams.map((team) => plainToClass(OrgTeamOutputDto, team, { strategy: "excludeAll" })),
+    };
+  }
+
+  @UseGuards(IsTeamInOrg)
+  @Roles("TEAM_ADMIN")
+  @Get("/:teamId")
+  async getTeam(@GetTeam() team: Team): Promise<ApiResponse<OrgTeamOutputDto>> {
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgTeamOutputDto, team, { strategy: "excludeAll" }),
+    };
+  }
+
+  @UseGuards(IsTeamInOrg)
+  @Roles("ORG_ADMIN")
+  @Delete("/:teamId")
+  async deleteTeam(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number
+  ): Promise<ApiResponse<OrgTeamOutputDto>> {
+    const team = await this.organizationsTeamsService.deleteOrgTeam(orgId, teamId);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgTeamOutputDto, team, { strategy: "excludeAll" }),
+    };
+  }
+
+  @UseGuards(IsTeamInOrg)
+  @Roles("ORG_ADMIN")
+  @Patch("/:teamId")
+  async updateTeam(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Body() body: CreateOrgTeamDto
+  ): Promise<ApiResponse<OrgTeamOutputDto>> {
+    const team = await this.organizationsTeamsService.updateOrgTeam(orgId, teamId, body);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgTeamOutputDto, team, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Post()
+  @UseGuards()
+  @Roles("ORG_ADMIN")
+  async createTeam(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Body() body: CreateOrgTeamDto
+  ): Promise<ApiResponse<OrgTeamOutputDto>> {
+    const team = await this.organizationsTeamsService.createOrgTeam(orgId, body);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgTeamOutputDto, team, { strategy: "excludeAll" }),
+    };
+  }
+}

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

@@ -0,0 +1,155 @@
+import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service";
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { IsUserInOrg } from "@/modules/auth/guards/users/is-user-in-org.guard";
+import { OrganizationsSchedulesService } from "@/modules/organizations/services/organizations-schedules.service";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Post,
+  Param,
+  ParseIntPipe,
+  Body,
+  Patch,
+  Delete,
+  HttpCode,
+  HttpStatus,
+  Query,
+} from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+import { Transform } from "class-transformer";
+import { IsNumber, Min, Max, IsOptional } from "class-validator";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import {
+  CreateScheduleInput_2024_06_11,
+  CreateScheduleOutput_2024_06_11,
+  DeleteScheduleOutput_2024_06_11,
+  GetScheduleOutput_2024_06_11,
+  GetSchedulesOutput_2024_06_11,
+  UpdateScheduleInput_2024_06_11,
+  UpdateScheduleOutput_2024_06_11,
+} from "@calcom/platform-types";
+
+class SkipTakePagination {
+  @Transform(({ value }: { value: string }) => value && parseInt(value))
+  @IsNumber()
+  @Min(1)
+  @Max(250)
+  @IsOptional()
+  take?: number;
+
+  @Transform(({ value }: { value: string }) => value && parseInt(value))
+  @IsNumber()
+  @Min(0)
+  @IsOptional()
+  skip?: number;
+}
+
+@Controller({
+  path: "/v2/organizations/:orgId",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard)
+@DocsTags("Organizations Schedules")
+export class OrganizationsSchedulesController {
+  constructor(
+    private schedulesService: SchedulesService_2024_06_11,
+    private organizationScheduleService: OrganizationsSchedulesService
+  ) {}
+
+  @Roles("ORG_ADMIN")
+  @Get("/schedules")
+  async getOrganizationSchedules(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<GetSchedulesOutput_2024_06_11> {
+    const { skip, take } = queryParams;
+
+    const schedules = await this.organizationScheduleService.getOrganizationSchedules(orgId, skip, take);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: schedules,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  @Post("/users/:userId/schedules")
+  async createUserSchedule(
+    @Param("userId", ParseIntPipe) userId: number,
+    @Body() bodySchedule: CreateScheduleInput_2024_06_11
+  ): Promise<CreateScheduleOutput_2024_06_11> {
+    const schedule = await this.schedulesService.createUserSchedule(userId, bodySchedule);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: schedule,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  @Get("/users/:userId/schedules/:scheduleId")
+  async getUserSchedule(
+    @Param("userId", ParseIntPipe) userId: number,
+    @Param("scheduleId") scheduleId: number
+  ): Promise<GetScheduleOutput_2024_06_11> {
+    const schedule = await this.schedulesService.getUserSchedule(userId, scheduleId);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: schedule,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  @Get("/users/:userId/schedules")
+  async getUserSchedules(
+    @Param("userId", ParseIntPipe) userId: number
+  ): Promise<GetSchedulesOutput_2024_06_11> {
+    const schedules = await this.schedulesService.getUserSchedules(userId);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: schedules,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  @Patch("/users/:userId/schedules/:scheduleId")
+  async updateUserSchedule(
+    @Param("userId", ParseIntPipe) userId: number,
+    @Param("scheduleId", ParseIntPipe) scheduleId: number,
+    @Body() bodySchedule: UpdateScheduleInput_2024_06_11
+  ): Promise<UpdateScheduleOutput_2024_06_11> {
+    const updatedSchedule = await this.schedulesService.updateUserSchedule(userId, scheduleId, bodySchedule);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: updatedSchedule,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  @Delete("/users/:userId/schedules/:scheduleId")
+  @HttpCode(HttpStatus.OK)
+  async deleteUserSchedule(
+    @Param("userId", ParseIntPipe) userId: number,
+    @Param("scheduleId", ParseIntPipe) scheduleId: number
+  ): Promise<DeleteScheduleOutput_2024_06_11> {
+    await this.schedulesService.deleteUserSchedule(userId, scheduleId);
+
+    return {
+      status: SUCCESS_STATUS,
+    };
+  }
+}

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

@@ -0,0 +1,338 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import * as request from "supertest";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import {
+  CreateScheduleInput_2024_06_11,
+  CreateScheduleOutput_2024_06_11,
+  GetScheduleOutput_2024_06_11,
+  GetSchedulesOutput_2024_06_11,
+  ScheduleAvailabilityInput_2024_06_11,
+  ScheduleOutput_2024_06_11,
+  UpdateScheduleInput_2024_06_11,
+  UpdateScheduleOutput_2024_06_11,
+} from "@calcom/platform-types";
+import { User, Team, Membership, Profile } from "@calcom/prisma/client";
+
+describe("Organizations Schedules Endpoints", () => {
+  describe("User lacks required role", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipFixtures: MembershipRepositoryFixture;
+
+    const userEmail = "mr-robot@schedules-api.com";
+    let user: User;
+    let org: Team;
+    let membership: Membership;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipFixtures = new MembershipRepositoryFixture(moduleRef);
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Ecorp",
+        isOrganization: true,
+      });
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        organization: { connect: { id: org.id } },
+      });
+
+      membership = await membershipFixtures.addUserToOrg(user, org, "MEMBER", true);
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should not be able to create schedule for org user", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users/${user.id}/schedules`)
+        .send({
+          name: "work",
+          timeZone: "Europe/Rome",
+          isDefault: true,
+        })
+        .expect(403);
+    });
+
+    it("should not be able to get org schedules", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/schedules`).expect(403);
+    });
+
+    it("should mot be able to get user schedules", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users/${user.id}/schedules/`)
+        .expect(403);
+    });
+
+    afterAll(async () => {
+      await membershipFixtures.delete(membership.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+
+  describe("User has required role", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipFixtures: MembershipRepositoryFixture;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+
+    const userEmail = "mr-robot@schedules-api.com";
+    const username = "mr-robot";
+    let user: User;
+    let org: Team;
+    let profile: Profile;
+    let membership: Membership;
+
+    let createdSchedule: ScheduleOutput_2024_06_11;
+
+    const createScheduleInput: CreateScheduleInput_2024_06_11 = {
+      name: "work",
+      timeZone: "Europe/Rome",
+      isDefault: true,
+    };
+
+    const defaultAvailability: ScheduleAvailabilityInput_2024_06_11[] = [
+      {
+        days: ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"],
+        startTime: "09:00",
+        endTime: "17:00",
+      },
+    ];
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipFixtures = new MembershipRepositoryFixture(moduleRef);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Ecorp",
+        isOrganization: true,
+      });
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        organization: { connect: { id: org.id } },
+      });
+
+      profile = await profileRepositoryFixture.create({
+        uid: `usr-${user.id}`,
+        username: username,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+      });
+
+      membership = await membershipFixtures.addUserToOrg(user, org, "ADMIN", true);
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should create schedule for org user", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users/${user.id}/schedules`)
+        .send(createScheduleInput)
+        .expect(201)
+        .then(async (response) => {
+          const responseBody: CreateScheduleOutput_2024_06_11 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          createdSchedule = response.body.data;
+
+          const expectedSchedule = {
+            ...createScheduleInput,
+            availability: defaultAvailability,
+            overrides: [],
+          };
+          outputScheduleMatchesExpected(createdSchedule, expectedSchedule, 1);
+
+          const scheduleOwner = createdSchedule.ownerId
+            ? await userRepositoryFixture.get(createdSchedule.ownerId)
+            : null;
+          expect(scheduleOwner?.defaultScheduleId).toEqual(createdSchedule.id);
+        });
+    });
+
+    function outputScheduleMatchesExpected(
+      outputSchedule: ScheduleOutput_2024_06_11 | null,
+      expected: CreateScheduleInput_2024_06_11 & {
+        availability: CreateScheduleInput_2024_06_11["availability"];
+      } & {
+        overrides: CreateScheduleInput_2024_06_11["overrides"];
+      },
+      expectedAvailabilityLength: number
+    ) {
+      expect(outputSchedule).toBeTruthy();
+      expect(outputSchedule?.name).toEqual(expected.name);
+      expect(outputSchedule?.timeZone).toEqual(expected.timeZone);
+      expect(outputSchedule?.isDefault).toEqual(expected.isDefault);
+      expect(outputSchedule?.availability.length).toEqual(expectedAvailabilityLength);
+
+      const outputScheduleAvailability = outputSchedule?.availability[0];
+      expect(outputScheduleAvailability).toBeDefined();
+      expect(outputScheduleAvailability?.days).toEqual(expected.availability?.[0].days);
+      expect(outputScheduleAvailability?.startTime).toEqual(expected.availability?.[0].startTime);
+      expect(outputScheduleAvailability?.endTime).toEqual(expected.availability?.[0].endTime);
+
+      expect(JSON.stringify(outputSchedule?.overrides)).toEqual(JSON.stringify(expected.overrides));
+    }
+
+    it("should get org schedules", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/schedules`)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: GetSchedulesOutput_2024_06_11 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const schedules = response.body.data;
+          expect(schedules.length).toEqual(1);
+
+          const expectedSchedule = {
+            ...createScheduleInput,
+            availability: defaultAvailability,
+            overrides: [],
+          };
+
+          outputScheduleMatchesExpected(schedules[0], expectedSchedule, 1);
+        });
+    });
+
+    it("should get org user schedule", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users/${user.id}/schedules/${createdSchedule.id}`)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: GetScheduleOutput_2024_06_11 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const schedule = response.body.data;
+
+          const expectedSchedule = {
+            ...createScheduleInput,
+            availability: defaultAvailability,
+            overrides: [],
+          };
+
+          outputScheduleMatchesExpected(schedule, expectedSchedule, 1);
+        });
+    });
+
+    it("should get user schedules", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users/${user.id}/schedules/`)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: GetSchedulesOutput_2024_06_11 = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const schedules = response.body.data;
+          expect(schedules.length).toEqual(1);
+
+          const expectedSchedule = {
+            ...createScheduleInput,
+            availability: defaultAvailability,
+            overrides: [],
+          };
+
+          outputScheduleMatchesExpected(schedules[0], expectedSchedule, 1);
+        });
+    });
+
+    it("should update user schedule name", async () => {
+      const newScheduleName = "updated-schedule-name";
+
+      const body: UpdateScheduleInput_2024_06_11 = {
+        name: newScheduleName,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${user.id}/schedules/${createdSchedule.id}`)
+        .send(body)
+        .expect(200)
+        .then((response: any) => {
+          const responseData: UpdateScheduleOutput_2024_06_11 = response.body;
+          expect(responseData.status).toEqual(SUCCESS_STATUS);
+          const responseSchedule = responseData.data;
+
+          const expectedSchedule = { ...createdSchedule, name: newScheduleName };
+          outputScheduleMatchesExpected(responseSchedule, expectedSchedule, 1);
+
+          createdSchedule = responseSchedule;
+        });
+    });
+
+    it("should delete user schedule", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/users/${user.id}/schedules/${createdSchedule.id}`)
+        .expect(200);
+    });
+
+    afterAll(async () => {
+      await profileRepositoryFixture.delete(profile.id);
+      await membershipFixtures.delete(membership.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});

apps/api/v2/src/modules/organizations/inputs/create-organization-team.input.ts

@@ -0,0 +1,75 @@
+import { IsBoolean, IsOptional, IsString, IsUrl, Length } from "class-validator";
+
+export class CreateOrgTeamDto {
+  @IsString()
+  @Length(1)
+  readonly name!: string;
+
+  @IsOptional()
+  @IsString()
+  readonly slug?: string;
+
+  @IsOptional()
+  @IsUrl()
+  readonly logoUrl?: string;
+
+  @IsOptional()
+  @IsUrl()
+  readonly calVideoLogo?: string;
+
+  @IsOptional()
+  @IsUrl()
+  readonly appLogo?: string;
+
+  @IsOptional()
+  @IsUrl()
+  readonly appIconLogo?: string;
+
+  @IsOptional()
+  @IsString()
+  readonly bio?: string;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly hideBranding?: boolean = false;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly isPrivate?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly hideBookATeamMember?: boolean;
+
+  @IsOptional()
+  @IsString()
+  readonly metadata?: string; // Assuming metadata is a JSON string. Adjust accordingly if it's a nested object.
+
+  @IsOptional()
+  @IsString()
+  readonly theme?: string;
+
+  @IsOptional()
+  @IsString()
+  readonly brandColor?: string;
+
+  @IsOptional()
+  @IsString()
+  readonly darkBrandColor?: string;
+
+  @IsOptional()
+  @IsUrl()
+  readonly bannerUrl?: string;
+
+  @IsOptional()
+  @IsString()
+  readonly timeFormat?: number;
+
+  @IsOptional()
+  @IsString()
+  readonly timeZone?: string = "Europe/London";
+
+  @IsOptional()
+  @IsString()
+  readonly weekStart?: string = "Sunday";
+}

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

@@ -1,12 +1,31 @@
+import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module";
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { OrganizationsTeamsController } from "@/modules/organizations/controllers/organizations-teams.controller";
+import { OrganizationsSchedulesController } from "@/modules/organizations/controllers/schedules/organizations-schedules.controller";
 import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { OrganizationSchedulesRepository } from "@/modules/organizations/repositories/organizations-schedules.repository";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { OrganizationsSchedulesService } from "@/modules/organizations/services/organizations-schedules.service";
+import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
 import { OrganizationsService } from "@/modules/organizations/services/organizations.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { RedisModule } from "@/modules/redis/redis.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
+import { UsersModule } from "@/modules/users/users.module";
 import { Module } from "@nestjs/common";
 
 @Module({
-  imports: [PrismaModule, StripeModule],
-  providers: [OrganizationsRepository, OrganizationsService],
-  exports: [OrganizationsService, OrganizationsRepository],
+  imports: [PrismaModule, StripeModule, SchedulesModule_2024_06_11, UsersModule, RedisModule],
+  providers: [
+    OrganizationsRepository,
+    OrganizationsTeamsRepository,
+    OrganizationsService,
+    OrganizationsTeamsService,
+    MembershipsRepository,
+    OrganizationsSchedulesService,
+    OrganizationSchedulesRepository,
+  ],
+  exports: [OrganizationsService, OrganizationsRepository, OrganizationsTeamsRepository],
+  controllers: [OrganizationsTeamsController, OrganizationsSchedulesController],
 })
 export class OrganizationsModule {}

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

@@ -16,6 +16,7 @@ export class OrganizationsRepository {
     return this.dbRead.prisma.team.findUnique({
       where: {
         id: organizationId,
+        isOrganization: true,
       },
     });
   }
@@ -69,4 +70,12 @@ export class OrganizationsRepository {
       },
     });
   }
+  async findOrgUser(organizationId: number, userId: number) {
+    return this.dbRead.prisma.user.findUnique({
+      where: {
+        id: userId,
+        organizationId,
+      },
+    });
+  }
 }

apps/api/v2/src/modules/organizations/outputs/organization-team.output.ts

@@ -0,0 +1,107 @@
+import { Expose } from "class-transformer";
+import { IsBoolean, IsInt, IsOptional, IsString, IsUrl, Length } from "class-validator";
+
+export class OrgTeamOutputDto {
+  @IsInt()
+  @Expose()
+  readonly id!: number;
+
+  @IsInt()
+  @IsOptional()
+  @Expose()
+  readonly parentId?: number;
+
+  @IsString()
+  @Length(1)
+  @Expose()
+  readonly name!: string;
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly slug?: string;
+
+  @IsOptional()
+  @IsUrl()
+  @Expose()
+  readonly logoUrl?: string;
+
+  @IsOptional()
+  @IsUrl()
+  @Expose()
+  readonly calVideoLogo?: string;
+
+  @IsOptional()
+  @IsUrl()
+  @Expose()
+  readonly appLogo?: string;
+
+  @IsOptional()
+  @IsUrl()
+  @Expose()
+  readonly appIconLogo?: string;
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly bio?: string;
+
+  @IsOptional()
+  @IsBoolean()
+  @Expose()
+  readonly hideBranding?: boolean;
+
+  @IsBoolean()
+  @Expose()
+  readonly isOrganization?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  @Expose()
+  readonly isPrivate?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  @Expose()
+  readonly hideBookATeamMember?: boolean = false;
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly metadata?: string;
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly theme?: string;
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly brandColor?: string;
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly darkBrandColor?: string;
+
+  @IsOptional()
+  @IsUrl()
+  @Expose()
+  readonly bannerUrl?: string;
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly timeFormat?: number;
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly timeZone?: string = "Europe/London";
+
+  @IsOptional()
+  @IsString()
+  @Expose()
+  readonly weekStart?: string = "Sunday";
+}

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

@@ -0,0 +1,23 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrganizationSchedulesRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async getSchedulesByUserIds(userIds: number[], skip: number, take: number) {
+    return this.dbRead.prisma.schedule.findMany({
+      where: {
+        userId: {
+          in: userIds,
+        },
+      },
+      include: {
+        availability: true,
+      },
+      skip,
+      take,
+    });
+  }
+}

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

@@ -0,0 +1,58 @@
+import { PlatformPlan } from "@/modules/billing/types";
+import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { StripeService } from "@/modules/stripe/stripe.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrganizationsTeamsRepository {
+  constructor(
+    private readonly dbRead: PrismaReadService,
+    private readonly dbWrite: PrismaWriteService,
+    private readonly stripeService: StripeService
+  ) {}
+
+  async findOrgTeam(organizationId: number, teamId: number) {
+    return this.dbRead.prisma.team.findUnique({
+      where: {
+        id: teamId,
+        isOrganization: false,
+        parentId: organizationId,
+      },
+    });
+  }
+
+  async deleteOrgTeam(organizationId: number, teamId: number) {
+    return this.dbRead.prisma.team.delete({
+      where: {
+        id: teamId,
+        isOrganization: false,
+        parentId: organizationId,
+      },
+    });
+  }
+
+  async createOrgTeam(organizationId: number, data: CreateOrgTeamDto) {
+    return this.dbRead.prisma.team.create({
+      data: { ...data, parentId: organizationId },
+    });
+  }
+
+  async updateOrgTeam(organizationId: number, teamId: number, data: CreateOrgTeamDto) {
+    return this.dbRead.prisma.team.update({
+      data: { ...data },
+      where: { id: teamId, parentId: organizationId, isOrganization: false },
+    });
+  }
+
+  async findOrgTeamsPaginated(organizationId: number, skip: number, take: number) {
+    return this.dbRead.prisma.team.findMany({
+      where: {
+        parentId: organizationId,
+      },
+      skip,
+      take,
+    });
+  }
+}

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

@@ -0,0 +1,30 @@
+import { OutputSchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/output-schedules.service";
+import { OrganizationSchedulesRepository } from "@/modules/organizations/repositories/organizations-schedules.repository";
+import { UsersRepository } from "@/modules/users/users.repository";
+import { Injectable } from "@nestjs/common";
+
+import { ScheduleOutput_2024_06_11 } from "@calcom/platform-types";
+
+@Injectable()
+export class OrganizationsSchedulesService {
+  constructor(
+    private readonly organizationSchedulesService: OrganizationSchedulesRepository,
+    private readonly outputSchedulesService: OutputSchedulesService_2024_06_11,
+    private readonly usersRepository: UsersRepository
+  ) {}
+
+  async getOrganizationSchedules(organizationId: number, skip = 0, take = 250) {
+    const users = await this.usersRepository.getOrganizationUsers(organizationId);
+    const usersIds = users.map((user) => user.id);
+
+    const schedules = await this.organizationSchedulesService.getSchedulesByUserIds(usersIds, skip, take);
+
+    const responseSchedules: ScheduleOutput_2024_06_11[] = [];
+
+    for (const schedule of schedules) {
+      responseSchedules.push(await this.outputSchedulesService.getResponseSchedule(schedule));
+    }
+
+    return responseSchedules;
+  }
+}

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

@@ -0,0 +1,28 @@
+import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrganizationsTeamsService {
+  constructor(private readonly organizationsTeamRepository: OrganizationsTeamsRepository) {}
+
+  async getPaginatedOrgTeams(organizationId: number, skip = 0, take = 250) {
+    const teams = await this.organizationsTeamRepository.findOrgTeamsPaginated(organizationId, skip, take);
+    return teams;
+  }
+
+  async deleteOrgTeam(organizationId: number, teamId: number) {
+    const team = await this.organizationsTeamRepository.deleteOrgTeam(organizationId, teamId);
+    return team;
+  }
+
+  async updateOrgTeam(organizationId: number, teamId: number, data: CreateOrgTeamDto) {
+    const team = await this.organizationsTeamRepository.updateOrgTeam(organizationId, teamId, data);
+    return team;
+  }
+
+  async createOrgTeam(organizationId: number, data: CreateOrgTeamDto) {
+    const team = await this.organizationsTeamRepository.createOrgTeam(organizationId, data);
+    return team;
+  }
+}

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

@@ -1,7 +1,6 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
-import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { SlotsService } from "@/modules/slots/services/slots.service";
-import { Query, Body, Controller, Get, Delete, Post, Req, Res, UseGuards } from "@nestjs/common";
+import { Query, Body, Controller, Get, Delete, Post, Req, Res } from "@nestjs/common";
 import { ApiTags as DocsTags } from "@nestjs/swagger";
 import { Response as ExpressResponse, Request as ExpressRequest } from "express";
 

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

@@ -1,4 +1,4 @@
-import { EventTypesRepository } from "@/ee/event-types/event-types.repository";
+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 { v4 as uuid } from "uuid";
@@ -8,7 +8,7 @@ import { ReserveSlotInput } from "@calcom/platform-types";
 @Injectable()
 export class SlotsService {
   constructor(
-    private readonly eventTypeRepo: EventTypesRepository,
+    private readonly eventTypeRepo: EventTypesRepository_2024_04_15,
     private readonly slotsRepo: SlotsRepository
   ) {}
 

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

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

apps/api/v2/src/modules/users/inputs/update-managed-user.input.ts

@@ -1,3 +1,4 @@
+import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { TimeFormat, WeekDay } from "@/modules/users/inputs/create-managed-user.input";
 import { ApiProperty } from "@nestjs/swagger";
 import { IsIn, IsNumber, IsOptional, IsString, IsTimeZone } from "class-validator";
@@ -31,5 +32,6 @@ export class UpdateManagedUserInput {
 
   @IsTimeZone()
   @IsOptional()
+  @CapitalizeTimeZone()
   timeZone?: string;
 }

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

@@ -0,0 +1,24 @@
+import { UsersRepository } from "@/modules/users/users.repository";
+import { Injectable } from "@nestjs/common";
+
+import { User } from "@calcom/prisma/client";
+
+@Injectable()
+export class UsersService {
+  constructor(private readonly usersRepository: UsersRepository) {}
+
+  async getByUsernames(usernames: string[]) {
+    const users = await Promise.all(
+      usernames.map((username) => this.usersRepository.findByUsername(username))
+    );
+    const usersFiltered: User[] = [];
+
+    for (const user of users) {
+      if (user) {
+        usersFiltered.push(user);
+      }
+    }
+
+    return users;
+  }
+}

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

@@ -1,10 +1,13 @@
+import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersService } from "@/modules/users/services/users.service";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { Module } from "@nestjs/common";
 
 @Module({
-  imports: [PrismaModule],
-  providers: [UsersRepository],
-  exports: [UsersRepository],
+  imports: [PrismaModule, EventTypesModule_2024_06_14, TokensModule],
+  providers: [UsersRepository, UsersService],
+  exports: [UsersRepository, UsersService],
 })
 export class UsersModule {}

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

@@ -181,6 +181,18 @@ export class UsersRepository {
 
     return user?.defaultScheduleId;
   }
+
+  async getOrganizationUsers(organizationId: number) {
+    const profiles = await this.dbRead.prisma.profile.findMany({
+      where: {
+        organizationId,
+      },
+      include: {
+        user: true,
+      },
+    });
+    return profiles.map((profile) => profile.user);
+  }
 }
 
 function capitalizeTimezone(timezone: string) {

apps/api/v2/test/fixtures/repository/event-types.repository.fixture.ts

@@ -1,4 +1,4 @@
-import { CreateEventTypeInput } from "@/ee/event-types/inputs/create-event-type.input";
+import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { TestingModule } from "@nestjs/testing";
@@ -21,7 +21,10 @@ export class EventTypesRepositoryFixture {
     });
   }
 
-  async create(data: Pick<CreateEventTypeInput, "title" | "slug" | "length" | "hidden">, userId: number) {
+  async create(
+    data: Pick<CreateEventTypeInput_2024_04_15, "title" | "slug" | "length" | "hidden">,
+    userId: number
+  ) {
     return this.prismaWriteClient.eventType.create({
       data: {
         ...data,