chore: v4.3.2 (#15879)

* Update feature_request.md

* Update .github/ISSUE_TEMPLATE/feature_request.md

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,39 +1,81 @@
----
 name: Bug report
-about: Report any issues with the platform
+description: "Found a bug? Please fill out the sections below. \U0001F44D"
 title: ""
-labels: bug
-assignees: ""
----
-
-Found a bug? Please fill out the sections below. 👍
-
-### Issue Summary
-
-A summary of the issue. This needs to be a clear detailed-rich summary.
-
-### Steps to Reproduce
-
-1. (for example) Went to ...
-2. Clicked on...
-3. ...
-
-Any other relevant information. For example, why do you consider this a bug and what did you expect to happen instead?
-
-### Actual Results
-
-- What's happening right now that is different from what is expected
-
-### Expected Results
-
-- This is an ideal result that the system should get after the tests are performed
-
-### Technical details
-
-- Browser version, screen recording, console logs, network requests: You can make a recording with [Bird Eats Bug](https://birdeatsbug.com/).
-- Node.js version
-- Anything else that you think could be an issue.
-
-### Evidence
-
-- How was this tested? This is quite mandatory in terms of bugs. Providing evidence of your testing with screenshots or/and videos is an amazing way to prove the bug and a troubleshooting chance to find the solution.
+labels: 🐛 bug
+assignees: []
+body:
+- type: textarea
+  id: issue-summary
+  attributes:
+    label: Issue Summary
+    description: A summary of the issue. This needs to be a clear detailed-rich summary.
+  validations:
+    required: true
+- type: textarea
+  id: steps-to-reproduce
+  attributes:
+    label: Steps to Reproduce
+    value: |
+      1. (for example) Went to ...
+      2. Clicked on...
+      3. ...
+  validations:
+    required: true
+- type: textarea
+  id: expected-behavior
+  attributes:
+    label: Expected behavior
+    description: A clear and concise description of what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  id: other-information
+  attributes:
+    label: Other information
+  validations:
+    required: false
+- type: textarea
+  id: screenshots
+  attributes:
+    label: Screenshots
+    description: If applicable, add screenshots to help explain your problem.
+  validations:
+    required: false
+- type: checkboxes
+  id: environment
+  attributes:
+    label: Environment
+    options:
+      - label: app.cal.com
+      - label: Self-hosted Cal
+- type: textarea
+  id: desktop-version
+  attributes:
+    label: Desktop (please complete the following information)
+    description: | 
+      examples: 
+      - **OS**: [e.g. iOS]
+      - **Browser**: [e.g. chrome, safari]
+      - **Version**: [e.g. 22]
+    value: |
+      - OS:
+      - Node:
+      - npm: 
+    render: markdown
+  validations:
+    required: true
+- type: markdown
+  id: nodejs-version
+  attributes:
+    value: | 
+      #### Node.JS version
+      
+      [e.g. v18.15.0] 
+- type: markdown
+  id: anything-else
+  attributes:
+    value: |
+      #### Anything else?
+      
+      - Screen recording, console logs, network requests: You can make a recording with [Loom](https://www.loom.com).
+      - Anything else that you think could be an issue?

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,55 +1,41 @@
----
 name: Feature request
-about: Suggest a feature or idea
+description: "Suggest an idea for this project \U0001F680"
 title: ""
-labels: feature
-assignees: ""
----
+labels: ["✨ feature", "🚨 needs approval"], 
+assignees: []
+body:
+  - type: textarea
+    id: problem-description
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    id: solution-description
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: alternate-solution-description
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
+  - type: markdown
+    id: cal-info
+    attributes:
+      value: |
+        ### How we code at Cal.com
 
-### Is your proposal related to a problem?
-
-<!--
-  Provide a clear and concise description of what the problem is.
-  For example, "I'm always frustrated when..."
--->
-
-(Write your answer here.)
-
-### Describe the solution you'd like
-
-<!--
-  Provide a clear and concise description of what you want to happen.
--->
-
-(Describe your proposed solution here.)
-
-### Describe alternatives you've considered
-
-<!--
-  Let us know about other solutions you've tried or researched.
--->
-
-(Write your answer here.)
-
-### Additional context
-
-<!--
-  Is there anything else you can add about the proposal?
-  You might want to link to related issues here, if you haven't already.
--->
-
-(Write your answer here.)
-
-### Requirement/Document
-
-<!--
-  Is there any type of document that could support that feature?
--->
-
-(Share it here.)
-
----
-##### House rules
-- If this issue has a `🚨 needs approval` label, don't start coding yet. Wait until a core member approves feature request by removing this label, then you can start coding.
-  - For clarity: Non-core member issues automatically get the `🚨 needs approval` label.
-  - Your feature ideas are invaluable to us! However, they undergo review to ensure alignment with the product's direction.
+        - Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)

CONTRIBUTING.md

@@ -74,7 +74,7 @@ branch are tagged into a release monthly.
 
 To develop locally:
 
-1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your
+1. [Fork](https://github.com/calcom/cal.com/fork/) this repository to your
    own GitHub account and then
    [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
 2. Create a new branch:

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

@@ -43,7 +43,6 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
       language: data.language,
       teamId: data.teamId,
       usernameOrEmail: data.usernameOrEmail,
-      isOrg: data.isOrg,
     });
 
     return { success: true, message: `${data.usernameOrEmail} has been invited.` };

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

@@ -0,0 +1,112 @@
+import prismaMock from "../../../../../../tests/libs/__mocks__/prismaMock";
+
+import type { Request, Response } from "express";
+import type { NextApiRequest, NextApiResponse } from "next";
+import { createMocks } from "node-mocks-http";
+import { describe, expect, test } from "vitest";
+
+import handler from "../../../pages/api/attendees/_post";
+
+type CustomNextApiRequest = NextApiRequest & Request;
+type CustomNextApiResponse = NextApiResponse & Response;
+
+describe("POST /api/attendees", () => {
+  describe("Errors", () => {
+    test("Returns 403 if user is not admin and has no booking", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          bookingId: 1,
+          email: "test@example.com",
+          name: "Test User",
+          timeZone: "UTC",
+        },
+      });
+
+      prismaMock.booking.findFirst.mockResolvedValue(null);
+
+      req.userId = 123;
+      // req.isAdmin = false;
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(403);
+      expect(JSON.parse(res._getData()).message).toBe("Forbidden");
+    });
+
+    test("Returns 200 if user is admin", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          bookingId: 1,
+          email: "test@example.com",
+          name: "Test User",
+          timeZone: "UTC",
+        },
+      });
+
+      const attendeeData = {
+        id: 1,
+        email: "test@example.com",
+        name: "Test User",
+        timeZone: "UTC",
+        bookingId: 1,
+      };
+
+      prismaMock.attendee.create.mockResolvedValue(attendeeData);
+      req.isSystemWideAdmin = true;
+      req.userId = 123;
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(200);
+      expect(JSON.parse(res._getData()).attendee).toEqual(attendeeData);
+      expect(JSON.parse(res._getData()).message).toBe("Attendee created successfully");
+    });
+
+    test("Returns 200 if user is not admin but has a booking", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          bookingId: 1,
+          email: "test@example.com",
+          name: "Test User",
+          timeZone: "UTC",
+        },
+      });
+
+      const userBooking = { id: 1 };
+
+      prismaMock.booking.findFirst.mockResolvedValue(userBooking);
+
+      const attendeeData = {
+        id: 1,
+        email: "test@example.com",
+        name: "Test User",
+        timeZone: "UTC",
+        bookingId: 1,
+      };
+
+      prismaMock.attendee.create.mockResolvedValue(attendeeData);
+
+      req.userId = 123;
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(200);
+      expect(JSON.parse(res._getData()).attendee).toEqual(attendeeData);
+      expect(JSON.parse(res._getData()).message).toBe("Attendee created successfully");
+    });
+
+    test("Returns 400 if request body is invalid", async () => {
+      const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+        method: "POST",
+        body: {
+          // Missing required fields
+        },
+      });
+
+      req.userId = 123;
+      await handler(req, res);
+
+      expect(res.statusCode).toBe(400);
+    });
+  });
+});

apps/api/v2/package.json

@@ -25,12 +25,8 @@
   },
   "dependencies": {
     "@calcom/platform-constants": "*",
-    "@calcom/platform-libraries-0.0.13": "npm:@calcom/platform-libraries@0.0.13",
-    "@calcom/platform-libraries-0.0.14": "npm:@calcom/platform-libraries@0.0.14",
-    "@calcom/platform-libraries-0.0.15": "npm:@calcom/platform-libraries@0.0.15",
-    "@calcom/platform-libraries-0.0.17": "npm:@calcom/platform-libraries@0.0.17",
     "@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.20": "npm:@calcom/platform-libraries@0.0.20",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
     "@calcom/prisma": "*",

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

@@ -19,7 +19,7 @@ import { UserRepositoryFixture } from "test/fixtures/repository/users.repository
 import { withApiAuth } from "test/utils/withApiAuth";
 
 import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
-import { handleNewBooking } from "@calcom/platform-libraries-0.0.2";
+import { handleNewBooking } from "@calcom/platform-libraries-0.0.20";
 import { ApiSuccessResponse, ApiResponse } from "@calcom/platform-types";
 
 describe("Bookings Endpoints", () => {

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

@@ -35,20 +35,18 @@ import { NextApiRequest } from "next/types";
 
 import { X_CAL_CLIENT_ID } from "@calcom/platform-constants";
 import { BOOKING_READ, SUCCESS_STATUS, BOOKING_WRITE } from "@calcom/platform-constants";
-import {
-  getAllUserBookings,
-  getBookingInfo,
-  handleCancelBooking,
-  getBookingForReschedule,
-} from "@calcom/platform-libraries-0.0.2";
 import {
   handleNewBooking,
   BookingResponse,
   HttpError,
   handleNewRecurringBooking,
   handleInstantMeeting,
-} from "@calcom/platform-libraries-0.0.2";
-import { handleMarkNoShow } from "@calcom/platform-libraries-0.0.17";
+  handleMarkNoShow,
+  getAllUserBookings,
+  getBookingInfo,
+  handleCancelBooking,
+  getBookingForReschedule,
+} from "@calcom/platform-libraries-0.0.20";
 import { GetBookingsInput, CancelBookingInput, Status } from "@calcom/platform-types";
 import { ApiResponse } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";

apps/api/v2/src/ee/bookings/inputs/create-recurring-booking.input.ts

@@ -1,7 +1,7 @@
 import { CreateBookingInput } from "@/ee/bookings/inputs/create-booking.input";
 import { IsBoolean, IsNumber, IsOptional } from "class-validator";
 
-import type { AppsStatus } from "@calcom/platform-libraries-0.0.2";
+import type { AppsStatus } from "@calcom/platform-libraries-0.0.20";
 
 export class CreateRecurringBookingInput extends CreateBookingInput {
   @IsBoolean()

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

@@ -1,3 +1,4 @@
+import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
 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";
@@ -21,6 +22,7 @@ import { Module } from "@nestjs/common";
     AppleCalendarService,
     SelectedCalendarsRepository,
     AppsRepository,
+    CalendarsRepository,
   ],
   controllers: [CalendarsController],
   exports: [CalendarsService],

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

@@ -0,0 +1,51 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+import { Prisma } from "@prisma/client";
+
+const credentialForCalendarRepositorySelect = Prisma.validator<Prisma.CredentialSelect>()({
+  id: true,
+  appId: true,
+  type: true,
+  userId: true,
+  user: {
+    select: {
+      email: true,
+    },
+  },
+  teamId: true,
+  key: true,
+  invalid: true,
+});
+
+@Injectable()
+export class CalendarsRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async getCalendarCredentials(credentialId: number, userId: number) {
+    return await this.dbRead.prisma.credential.findFirst({
+      where: {
+        id: credentialId,
+        userId,
+      },
+      select: {
+        ...credentialForCalendarRepositorySelect,
+        app: {
+          select: {
+            slug: true,
+            categories: true,
+            dirName: true,
+          },
+        },
+      },
+    });
+  }
+
+  async deleteCredentials(credentialId: number) {
+    return await this.dbWrite.prisma.credential.delete({
+      where: {
+        id: credentialId,
+      },
+    });
+  }
+}

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

@@ -1,5 +1,6 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
+import { DeletedCalendarCredentialsOutputResponseDto } from "@/ee/calendars/outputs/delete-calendar-credentials.output";
 import { CalendarsService } from "@/ee/calendars/services/calendars.service";
 import { HttpExceptionFilter } from "@/filters/http-exception.filter";
 import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
@@ -18,6 +19,7 @@ import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.reposit
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { CalendarsServiceMock } from "test/mocks/calendars-service-mock";
 
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import {
   GOOGLE_CALENDAR,
   OFFICE_365_CALENDAR,
@@ -189,6 +191,26 @@ describe("Platform Calendars Endpoints", () => {
       .expect(200);
   });
 
+  it.skip(`/POST/v2/calendars/${OFFICE_365_CALENDAR}/disconnect: it should respond with a 201 returning back the user deleted calendar credentials`, async () => {
+    const body = {
+      id: 10,
+    };
+
+    return request(app.getHttpServer())
+      .post(`/v2/calendars/${OFFICE_365_CALENDAR}/disconnect`)
+      .set("Authorization", `Bearer ${accessTokenSecret}`)
+      .send(body)
+      .expect(201)
+      .then(async (response) => {
+        const responseBody: Promise<DeletedCalendarCredentialsOutputResponseDto> = response.body;
+
+        expect((await responseBody).status).toEqual(SUCCESS_STATUS);
+        expect((await responseBody).data).toBeDefined();
+        expect((await responseBody).data.id).toEqual(body.id);
+        expect((await responseBody).data.userId).toEqual(user.id);
+      });
+  });
+
   afterAll(async () => {
     await oauthClientRepositoryFixture.delete(oAuthClient.id);
     await teamRepositoryFixture.delete(organization.id);

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

@@ -1,5 +1,10 @@
+import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
 import { GetBusyTimesOutput } from "@/ee/calendars/outputs/busy-times.output";
 import { ConnectedCalendarsOutput } from "@/ee/calendars/outputs/connected-calendars.output";
+import {
+  DeletedCalendarCredentialsOutputResponseDto,
+  DeletedCalendarCredentialsOutputDto,
+} from "@/ee/calendars/outputs/delete-calendar-credentials.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";
@@ -27,6 +32,7 @@ import {
 } from "@nestjs/common";
 import { ApiTags as DocsTags } from "@nestjs/swagger";
 import { User } from "@prisma/client";
+import { plainToClass } from "class-transformer";
 import { Request } from "express";
 import { z } from "zod";
 
@@ -50,7 +56,8 @@ export class CalendarsController {
     private readonly calendarsService: CalendarsService,
     private readonly outlookService: OutlookService,
     private readonly googleCalendarService: GoogleCalendarService,
-    private readonly appleCalendarService: AppleCalendarService
+    private readonly appleCalendarService: AppleCalendarService,
+    private readonly calendarsRepository: CalendarsRepository
   ) {}
 
   @UseGuards(ApiAuthGuard)
@@ -183,4 +190,29 @@ export class CalendarsController {
         );
     }
   }
+
+  @UseGuards(ApiAuthGuard)
+  @Post("/:calendar/disconnect")
+  @HttpCode(HttpStatus.OK)
+  async deleteCalendarCredentials(
+    @Param("calendar") calendar: string,
+    @Body() body: { id: number },
+    @GetUser() user: UserWithProfile
+  ): Promise<DeletedCalendarCredentialsOutputResponseDto> {
+    const { id: credentialId } = body;
+    await this.calendarsService.checkCalendarCredentials(credentialId, user.id);
+
+    const { id, type, userId, teamId, appId, invalid } = await this.calendarsRepository.deleteCredentials(
+      credentialId
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(
+        DeletedCalendarCredentialsOutputDto,
+        { id, type, userId, teamId, appId, invalid },
+        { strategy: "excludeAll" }
+      ),
+    };
+  }
 }

apps/api/v2/src/ee/calendars/outputs/delete-calendar-credentials.output.ts

@@ -0,0 +1,42 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsString, ValidateNested, IsEnum, IsInt, IsBoolean } from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class DeletedCalendarCredentialsOutputDto {
+  @IsInt()
+  @Expose()
+  readonly id!: number;
+
+  @IsString()
+  @Expose()
+  readonly type!: string;
+
+  @IsInt()
+  @Expose()
+  readonly userId!: number | null;
+
+  @IsInt()
+  @Expose()
+  readonly teamId!: number | null;
+
+  @IsString()
+  @Expose()
+  readonly appId!: string | null;
+
+  @IsBoolean()
+  @Expose()
+  readonly invalid!: boolean | null;
+}
+
+export class DeletedCalendarCredentialsOutputResponseDto {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @Expose()
+  @ValidateNested()
+  @Type(() => DeletedCalendarCredentialsOutputDto)
+  data!: DeletedCalendarCredentialsOutputDto;
+}

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

@@ -5,7 +5,7 @@ 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";
+import { symmetricEncrypt, CalendarService } from "@calcom/platform-libraries-0.0.20";
 
 @Injectable()
 export class AppleCalendarService implements CredentialSyncCalendarApp {

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

@@ -1,3 +1,4 @@
+import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
 import { AppsRepository } from "@/modules/apps/apps.repository";
 import {
   CredentialsRepository,
@@ -17,8 +18,7 @@ import { User } from "@prisma/client";
 import { DateTime } from "luxon";
 import { z } from "zod";
 
-import { getConnectedDestinationCalendars } from "@calcom/platform-libraries-0.0.2";
-import { getBusyCalendarTimes } from "@calcom/platform-libraries-0.0.2";
+import { getConnectedDestinationCalendars, getBusyCalendarTimes } from "@calcom/platform-libraries-0.0.20";
 import { Calendar } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
 
@@ -30,6 +30,7 @@ export class CalendarsService {
     private readonly usersRepository: UsersRepository,
     private readonly credentialsRepository: CredentialsRepository,
     private readonly appsRepository: AppsRepository,
+    private readonly calendarsRepository: CalendarsRepository,
     private readonly dbRead: PrismaReadService,
     private readonly dbWrite: PrismaWriteService,
     private readonly config: ConfigService
@@ -137,4 +138,11 @@ export class CalendarsService {
 
     return { client_id, client_secret };
   }
+
+  async checkCalendarCredentials(credentialId: number, userId: number) {
+    const credential = await this.calendarsRepository.getCalendarCredentials(credentialId, userId);
+    if (!credential) {
+      throw new NotFoundException("Calendar credentials not found");
+    }
+  }
 }

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

@@ -35,7 +35,7 @@ import {
   EventTypesPublic,
   eventTypeBookingFields,
   eventTypeLocations,
-} from "@calcom/platform-libraries-0.0.2";
+} from "@calcom/platform-libraries-0.0.20";
 import { ApiSuccessResponse } from "@calcom/platform-types";
 
 describe("Event types Endpoints", () => {

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

@@ -39,8 +39,8 @@ import {
 import { ApiTags as DocsTags } from "@nestjs/swagger";
 
 import { EVENT_TYPE_READ, EVENT_TYPE_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";
-import { getPublicEvent } from "@calcom/platform-libraries-0.0.2";
-import { getEventTypesByViewer } from "@calcom/platform-libraries-0.0.2";
+import { getPublicEvent, getEventTypesByViewer } from "@calcom/platform-libraries-0.0.2";
+
 import { PrismaClient } from "@calcom/prisma";
 
 @Controller({

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

@@ -4,7 +4,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";
 
-import { getEventTypeById } from "@calcom/platform-libraries-0.0.2";
+import { getEventTypeById } from "@calcom/platform-libraries-0.0.20";
 import type { PrismaClient } from "@calcom/prisma";
 
 @Injectable()

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

@@ -9,8 +9,12 @@ import { SelectedCalendarsRepository } from "@/modules/selected-calendars/select
 import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
 
-import { createEventType, updateEventType } from "@calcom/platform-libraries-0.0.2";
-import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries-0.0.2";
+import {
+  createEventType,
+  updateEventType,
+  EventTypesPublic,
+  getEventTypesPublic,
+} from "@calcom/platform-libraries-0.0.20";
 import { EventType } from "@calcom/prisma/client";
 
 @Injectable()
@@ -56,6 +60,7 @@ export class EventTypesService_2024_04_15 {
     const profileId = user.movedToProfile?.id || null;
     return {
       id: user.id,
+      role: user.role,
       organizationId: user.organizationId,
       organization: { isOrgAdmin },
       profile: { id: profileId },

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

@@ -9,10 +9,11 @@ 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 { PlatformOAuthClient, Team, User, Schedule } 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 { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { withApiAuth } from "test/utils/withApiAuth";
@@ -63,12 +64,18 @@ describe("Event types Endpoints", () => {
     let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
     let teamRepositoryFixture: TeamRepositoryFixture;
     let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let schedulesRepostoryFixture: SchedulesRepositoryFixture;
 
     const userEmail = "event-types-test-e2e@api.com";
+    const falseTestEmail = "false-event-types@api.com";
     const name = "bob-the-builder";
     const username = name;
     let eventType: EventTypeOutput_2024_06_14;
     let user: User;
+    let falseTestUser: User;
+    let firstSchedule: Schedule;
+    let secondSchedule: Schedule;
+    let falseTestSchedule: Schedule;
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
@@ -91,6 +98,7 @@ describe("Event types Endpoints", () => {
       userRepositoryFixture = new UserRepositoryFixture(moduleRef);
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      schedulesRepostoryFixture = new SchedulesRepositoryFixture(moduleRef);
 
       organization = await teamRepositoryFixture.create({ name: "organization" });
       oAuthClient = await createOAuthClient(organization.id);
@@ -100,6 +108,30 @@ describe("Event types Endpoints", () => {
         username,
       });
 
+      falseTestUser = await userRepositoryFixture.create({
+        email: falseTestEmail,
+        name: "false-test",
+        username: falseTestEmail,
+      });
+
+      firstSchedule = await schedulesRepostoryFixture.create({
+        userId: user.id,
+        name: "work",
+        timeZone: "Europe/Rome",
+      });
+
+      secondSchedule = await schedulesRepostoryFixture.create({
+        userId: user.id,
+        name: "chill",
+        timeZone: "Europe/Rome",
+      });
+
+      falseTestSchedule = await schedulesRepostoryFixture.create({
+        userId: falseTestUser.id,
+        name: "work",
+        timeZone: "Europe/Rome",
+      });
+
       await app.init();
     });
 
@@ -123,6 +155,40 @@ describe("Event types Endpoints", () => {
       expect(user).toBeDefined();
     });
 
+    it("should not allow creating an event type with schedule user does not own", async () => {
+      const scheduleId = falseTestSchedule.id;
+
+      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"],
+          },
+        ],
+        scheduleId,
+      };
+
+      return request(app.getHttpServer())
+        .post("/api/v2/event-types")
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        .send(body)
+        .expect(404);
+    });
+
     it("should create an event type", async () => {
       const body: CreateEventTypeInput_2024_06_14 = {
         title: "Coding class",
@@ -145,6 +211,7 @@ describe("Event types Endpoints", () => {
             options: ["javascript", "python", "cobol"],
           },
         ],
+        scheduleId: firstSchedule.id,
       };
 
       return request(app.getHttpServer())
@@ -162,6 +229,7 @@ describe("Event types Endpoints", () => {
           expect(createdEventType.locations).toEqual(body.locations);
           expect(createdEventType.bookingFields).toEqual(body.bookingFields);
           expect(createdEventType.ownerId).toEqual(user.id);
+          expect(createdEventType.scheduleId).toEqual(firstSchedule.id);
 
           eventType = responseBody.data;
         });
@@ -172,6 +240,7 @@ describe("Event types Endpoints", () => {
 
       const body: UpdateEventTypeInput_2024_06_14 = {
         title: newTitle,
+        scheduleId: secondSchedule.id,
       };
 
       return request(app.getHttpServer())
@@ -191,11 +260,25 @@ describe("Event types Endpoints", () => {
           expect(updatedEventType.locations).toEqual(eventType.locations);
           expect(updatedEventType.bookingFields).toEqual(eventType.bookingFields);
           expect(updatedEventType.ownerId).toEqual(user.id);
+          expect(updatedEventType.scheduleId).toEqual(secondSchedule.id);
 
           eventType.title = newTitle;
+          eventType.scheduleId = secondSchedule.id;
         });
     });
 
+    it("should not allow to update event type with scheduleId user does not own", async () => {
+      const body: UpdateEventTypeInput_2024_06_14 = {
+        scheduleId: falseTestSchedule.id,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/api/v2/event-types/${eventType.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        .send(body)
+        .expect(404);
+    });
+
     it(`/GET/:id`, async () => {
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types/${eventType.id}`)
@@ -272,7 +355,7 @@ describe("Event types Endpoints", () => {
         .expect(404);
     });
 
-    it("should delete schedule", async () => {
+    it("should delete event type", async () => {
       return request(app.getHttpServer()).delete(`/api/v2/event-types/${eventType.id}`).expect(200);
     });
 
@@ -289,6 +372,11 @@ describe("Event types Endpoints", () => {
       } catch (e) {
         // User might have been deleted by the test
       }
+      try {
+        await userRepositoryFixture.delete(falseTestUser.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

@@ -77,7 +77,6 @@ export class EventTypesController_2024_06_14 {
   }
 
   @Get("/")
-  @Permissions([EVENT_TYPE_READ])
   async getEventTypes(
     @Query() queryParams: GetEventTypesQuery_2024_06_14
   ): Promise<GetEventTypesOutput_2024_06_14> {

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

@@ -3,6 +3,7 @@ import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_20
 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 { SchedulesRepository_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.repository";
 import { MembershipsModule } from "@/modules/memberships/memberships.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { SelectedCalendarsModule } from "@/modules/selected-calendars/selected-calendars.module";
@@ -20,8 +21,14 @@ import { Module } from "@nestjs/common";
     OutputEventTypesService_2024_06_14,
     UsersRepository,
     UsersService,
+    SchedulesRepository_2024_06_11,
   ],
   controllers: [EventTypesController_2024_06_14],
-  exports: [EventTypesService_2024_06_14, EventTypesRepository_2024_06_14],
+  exports: [
+    EventTypesService_2024_06_14,
+    EventTypesRepository_2024_06_14,
+    InputEventTypesService_2024_06_14,
+    OutputEventTypesService_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

@@ -7,7 +7,7 @@ import {
   getEventTypeById,
   transformApiEventTypeBookingFields,
   transformApiEventTypeLocations,
-} from "@calcom/platform-libraries-0.0.13";
+} from "@calcom/platform-libraries-0.0.20";
 import { CreateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
 import type { PrismaClient } from "@calcom/prisma";
 

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

@@ -2,6 +2,7 @@ import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/event-types_2024_06_14/con
 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 { SchedulesRepository_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.repository";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
@@ -9,9 +10,9 @@ 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 { createEventType, updateEventType } from "@calcom/platform-libraries-0.0.20";
+import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries-0.0.20";
+import { dynamicEvent } from "@calcom/platform-libraries-0.0.20";
 import {
   CreateEventTypeInput_2024_06_14,
   UpdateEventTypeInput_2024_06_14,
@@ -30,7 +31,8 @@ export class EventTypesService_2024_06_14 {
     private readonly usersRepository: UsersRepository,
     private readonly usersService: UsersService,
     private readonly selectedCalendarsRepository: SelectedCalendarsRepository,
-    private readonly dbWrite: PrismaWriteService
+    private readonly dbWrite: PrismaWriteService,
+    private readonly schedulesRepository: SchedulesRepository_2024_06_11
   ) {}
 
   async createUserEventType(user: UserWithProfile, body: CreateEventTypeInput_2024_06_14) {
@@ -61,6 +63,7 @@ export class EventTypesService_2024_06_14 {
     if (existsWithSlug) {
       throw new BadRequestException("User already has an event type with this slug.");
     }
+    await this.checkUserOwnsSchedule(userId, body.scheduleId);
   }
 
   async getEventTypeByUsernameAndSlug(username: string, eventTypeSlug: string) {
@@ -94,6 +97,7 @@ export class EventTypesService_2024_06_14 {
     const profileId = user.movedToProfile?.id || null;
     return {
       id: user.id,
+      role: user.role,
       organizationId: user.organizationId,
       organization: { isOrgAdmin },
       profile: { id: profileId },
@@ -202,7 +206,7 @@ export class EventTypesService_2024_06_14 {
   }
 
   async updateEventType(eventTypeId: number, body: UpdateEventTypeInput_2024_06_14, user: UserWithProfile) {
-    this.checkCanUpdateEventType(user.id, eventTypeId);
+    await this.checkCanUpdateEventType(user.id, eventTypeId, body.scheduleId);
     const eventTypeUser = await this.getUserToUpdateEvent(user);
     const bodyTransformed = this.inputEventTypesService.transformInputUpdateEventType(body);
     await updateEventType({
@@ -224,12 +228,13 @@ export class EventTypesService_2024_06_14 {
     return this.outputEventTypesService.getResponseEventType(user.id, eventType);
   }
 
-  async checkCanUpdateEventType(userId: number, eventTypeId: number) {
+  async checkCanUpdateEventType(userId: number, eventTypeId: number, scheduleId: number | undefined) {
     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 });
+    await this.checkUserOwnsSchedule(userId, scheduleId);
   }
 
   async getUserToUpdateEvent(user: UserWithProfile) {
@@ -254,4 +259,16 @@ export class EventTypesService_2024_06_14 {
       throw new ForbiddenException(`User with ID=${userId} does not own event type with ID=${eventType.id}`);
     }
   }
+
+  async checkUserOwnsSchedule(userId: number, scheduleId: number | null | undefined) {
+    if (!scheduleId) {
+      return;
+    }
+
+    const schedule = await this.schedulesRepository.getScheduleByIdAndUserId(scheduleId, userId);
+
+    if (!schedule) {
+      throw new NotFoundException(`User with ID=${userId} does not own schedule with ID=${scheduleId}`);
+    }
+  }
 }

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

@@ -3,7 +3,7 @@ import { Injectable } from "@nestjs/common";
 import {
   transformApiEventTypeBookingFields,
   transformApiEventTypeLocations,
-} from "@calcom/platform-libraries-0.0.13";
+} from "@calcom/platform-libraries-0.0.20";
 import { CreateEventTypeInput_2024_06_14, UpdateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
 
 @Injectable()
@@ -29,12 +29,14 @@ export class InputEventTypesService_2024_06_14 {
   }
 
   transformInputUpdateEventType(inputEventType: UpdateEventTypeInput_2024_06_14) {
-    const { locations, bookingFields, ...rest } = inputEventType;
+    const { lengthInMinutes, locations, bookingFields, scheduleId, ...rest } = inputEventType;
 
     const eventType = {
       ...rest,
+      length: lengthInMinutes,
       locations: locations ? this.transformInputLocations(locations) : undefined,
       bookingFields: bookingFields ? this.transformInputBookingFields(bookingFields) : undefined,
+      schedule: scheduleId,
     };
 
     return eventType;

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

@@ -9,7 +9,7 @@ import {
   parseRecurringEvent,
   TransformedLocationsSchema,
   BookingFieldsSchema,
-} from "@calcom/platform-libraries-0.0.13";
+} from "@calcom/platform-libraries-0.0.20";
 
 type EventTypeRelations = { users: User[]; schedule: Schedule | null };
 type DatabaseEventType = EventType & EventTypeRelations;
@@ -41,7 +41,7 @@ type Input = Pick<
   | "recurringEvent"
   | "metadata"
   | "users"
-  | "schedule"
+  | "scheduleId"
 >;
 
 @Injectable()
@@ -68,13 +68,13 @@ export class OutputEventTypesService_2024_06_14 {
       successRedirectUrl,
       seatsShowAvailabilityCount,
       isInstantEvent,
+      scheduleId,
     } = 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 {
@@ -104,7 +104,7 @@ export class OutputEventTypesService_2024_06_14 {
       seatsShowAvailabilityCount,
       isInstantEvent,
       users,
-      schedule,
+      scheduleId,
     };
   }
 
@@ -128,10 +128,6 @@ export class OutputEventTypesService_2024_06_14 {
     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) : {};

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

@@ -1,3 +1,4 @@
+import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
 import { CalendarsService } from "@/ee/calendars/services/calendars.service";
 import { GcalController } from "@/ee/gcal/gcal.controller";
 import { AppsRepository } from "@/modules/apps/apps.repository";
@@ -21,6 +22,7 @@ import { ConfigService } from "@nestjs/config";
     GCalService,
     CalendarsService,
     UsersRepository,
+    CalendarsRepository,
   ],
   controllers: [GcalController],
 })

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

@@ -103,6 +103,21 @@ describe("Me Endpoints", () => {
         });
     });
 
+    it("should update user associated with access token given badly formatted timezone", async () => {
+      const bodyWithBadlyFormattedTimeZone: UpdateManagedUserInput = { timeZone: "America/New_york" };
+
+      return request(app.getHttpServer())
+        .patch("/v2/me")
+        .send(bodyWithBadlyFormattedTimeZone)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<UserResponse> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          expect(responseBody.data.timeZone).toEqual("America/New_York");
+        });
+    });
+
     it("should not update user associated with access token given invalid timezone", async () => {
       const bodyWithIncorrectTimeZone: UpdateManagedUserInput = { timeZone: "Narnia/Woods" };
 

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

@@ -23,7 +23,7 @@ import { userSchemaResponse } from "@calcom/platform-types";
 export class MeController {
   constructor(
     private readonly usersRepository: UsersRepository,
-    private readonly schedulesRepository: SchedulesService_2024_04_15
+    private readonly schedulesService: SchedulesService_2024_04_15
   ) {}
 
   @Get("/")
@@ -45,7 +45,7 @@ export class MeController {
   ): Promise<UpdateMeOutput> {
     const updatedUser = await this.usersRepository.update(user.id, bodySchedule);
     if (bodySchedule.timeZone && user.defaultScheduleId) {
-      await this.schedulesRepository.updateUserSchedule(user, user.defaultScheduleId, {
+      await this.schedulesService.updateUserSchedule(user, user.defaultScheduleId, {
         timeZone: bodySchedule.timeZone,
       });
     }

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

@@ -96,6 +96,17 @@ export class SchedulesRepository_2024_06_11 {
     return schedule;
   }
 
+  async getScheduleByIdAndUserId(scheduleId: number, userId: number) {
+    const schedule = await this.dbRead.prisma.schedule.findUnique({
+      where: {
+        id: scheduleId,
+        userId,
+      },
+    });
+
+    return schedule;
+  }
+
   async updateSchedule(
     userId: number,
     scheduleId: number,

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

@@ -3,7 +3,7 @@ import { Injectable } from "@nestjs/common";
 import {
   transformApiScheduleOverrides,
   transformApiScheduleAvailability,
-} from "@calcom/platform-libraries-0.0.4";
+} from "@calcom/platform-libraries-0.0.20";
 import { CreateScheduleInput_2024_06_11, ScheduleAvailabilityInput_2024_06_11 } from "@calcom/platform-types";
 import { ScheduleOverrideInput_2024_06_11 } from "@calcom/platform-types";
 

apps/api/v2/src/filters/trpc-exception.filter.ts

@@ -2,7 +2,7 @@ import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
 import { Request } from "express";
 
 import { ERROR_STATUS } from "@calcom/platform-constants";
-import { TRPCError } from "@calcom/platform-libraries-0.0.2";
+import { TRPCError } from "@calcom/platform-libraries-0.0.20";
 import { Response } from "@calcom/platform-types";
 
 @Catch(TRPCError)

apps/api/v2/src/lib/enums/locales.ts

@@ -0,0 +1,44 @@
+export enum Locales {
+  AR = "ar",
+  CA = "ca",
+  DE = "de",
+  ES = "es",
+  EU = "eu",
+  HE = "he",
+  ID = "id",
+  JA = "ja",
+  LV = "lv",
+  PL = "pl",
+  RO = "ro",
+  SR = "sr",
+  TH = "th",
+  VI = "vi",
+  AZ = "az",
+  CS = "cs",
+  EL = "el",
+  ES_419 = "es-419",
+  FI = "fi",
+  HR = "hr",
+  IT = "it",
+  KM = "km",
+  NL = "nl",
+  PT = "pt",
+  RU = "ru",
+  SV = "sv",
+  TR = "tr",
+  ZH_CN = "zh-CN",
+  BG = "bg",
+  DA = "da",
+  EN = "en",
+  ET = "et",
+  FR = "fr",
+  HU = "hu",
+  IW = "iw",
+  KO = "ko",
+  NO = "no",
+  PT_BR = "pt-BR",
+  SK = "sk",
+  TA = "ta",
+  UK = "uk",
+  ZH_TW = "zh-TW",
+}

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

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

apps/api/v2/src/modules/auth/guards/memberships/is-membership-in-org.guard.ts

@@ -0,0 +1,42 @@
+import { OrganizationsMembershipRepository } from "@/modules/organizations/repositories/organizations-membership.repository";
+import {
+  Injectable,
+  CanActivate,
+  ExecutionContext,
+  ForbiddenException,
+  NotFoundException,
+} from "@nestjs/common";
+import { Request } from "express";
+
+import { Membership } from "@calcom/prisma/client";
+
+@Injectable()
+export class IsMembershipInOrg implements CanActivate {
+  constructor(private organizationsMembershipRepository: OrganizationsMembershipRepository) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request & { membership: Membership }>();
+    const membershipId: string = request.params.membershipId;
+    const orgId: string = request.params.orgId;
+
+    if (!orgId) {
+      throw new ForbiddenException("No org id found in request params.");
+    }
+
+    if (!membershipId) {
+      throw new ForbiddenException("No membership id found in request params.");
+    }
+
+    const membership = await this.organizationsMembershipRepository.findOrgMembership(
+      Number(orgId),
+      Number(membershipId)
+    );
+
+    if (!membership) {
+      throw new NotFoundException(`Membership (${membershipId}) not found.`);
+    }
+
+    request.membership = membership;
+    return true;
+  }
+}

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

@@ -37,9 +37,9 @@ describe("ApiAuthStrategy", () => {
   const validAccessTokenEmail = "access-token-user-email@example.com";
   let validApiKeyUser: User;
   let validAccessTokenUser: User;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+  let module: TestingModule;
+  beforeAll(async () => {
+    module = await Test.createTestingModule({
       imports: [
         ConfigModule.forRoot({
           ignoreEnvFile: true,
@@ -177,4 +177,10 @@ describe("ApiAuthStrategy", () => {
       }
     });
   });
+
+  afterAll(async () => {
+    await userRepositoryFixture.deleteByEmail(validApiKeyEmail);
+    await userRepositoryFixture.deleteByEmail(validAccessTokenEmail);
+    module.close();
+  });
 });

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

@@ -0,0 +1,11 @@
+import { Global, Module } from "@nestjs/common";
+
+import { EmailService } from "./email.service";
+
+@Global()
+@Module({
+  imports: [],
+  providers: [EmailService],
+  exports: [EmailService],
+})
+export class EmailModule {}

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

@@ -0,0 +1,31 @@
+import { Injectable } from "@nestjs/common";
+
+import { sendSignupToOrganizationEmail, getTranslation } from "@calcom/platform-libraries-0.0.20";
+
+@Injectable()
+export class EmailService {
+  public async sendSignupToOrganizationEmail({
+    usernameOrEmail,
+    orgName,
+    orgId,
+    locale,
+    inviterName,
+  }: {
+    usernameOrEmail: string;
+    orgName: string;
+    orgId: number;
+    locale: string | null;
+    inviterName: string;
+  }) {
+    const translation = await getTranslation(locale || "en", "common");
+
+    await sendSignupToOrganizationEmail({
+      usernameOrEmail,
+      team: { name: orgName, parent: null },
+      inviterName: inviterName,
+      isOrg: true,
+      teamId: orgId,
+      translation,
+    });
+  }
+}

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

@@ -1,6 +1,8 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { Injectable } from "@nestjs/common";
 
+import { MembershipRole } from "@calcom/prisma/client";
+
 @Injectable()
 export class MembershipsRepository {
   constructor(private readonly dbRead: PrismaReadService) {}
@@ -47,4 +49,17 @@ export class MembershipsRepository {
 
     return !!adminMembership;
   }
+
+  async createMembership(teamId: number, userId: number, role: MembershipRole, accepted: boolean) {
+    const membership = await this.dbRead.prisma.membership.create({
+      data: {
+        role,
+        teamId,
+        userId,
+        accepted,
+      },
+    });
+
+    return membership;
+  }
 }

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

@@ -3,6 +3,7 @@ import { AppModule } from "@/app.module";
 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 { Locales } from "@/lib/enums/locales";
 import {
   CreateUserResponse,
   UserReturned,
@@ -141,6 +142,7 @@ describe("OAuth Client Users Endpoints", () => {
         timeZone: userTimeZone,
         weekStart: "Monday",
         timeFormat: 24,
+        locale: Locales.FR,
       };
 
       const response = await request(app.getHttpServer())
@@ -163,6 +165,7 @@ describe("OAuth Client Users Endpoints", () => {
       expect(responseBody.data.user.timeZone).toEqual(requestBody.timeZone);
       expect(responseBody.data.user.weekStart).toEqual(requestBody.weekStart);
       expect(responseBody.data.user.timeFormat).toEqual(requestBody.timeFormat);
+      expect(responseBody.data.user.locale).toEqual(requestBody.locale);
       expect(responseBody.data.accessToken).toBeDefined();
       expect(responseBody.data.refreshToken).toBeDefined();
 
@@ -234,7 +237,7 @@ describe("OAuth Client Users Endpoints", () => {
 
     it(`/PUT/:id`, async () => {
       const userUpdatedEmail = "pineapple-pizza@gmail.com";
-      const body: UpdateManagedUserInput = { email: userUpdatedEmail };
+      const body: UpdateManagedUserInput = { email: userUpdatedEmail, locale: Locales.PT_BR };
 
       const response = await request(app.getHttpServer())
         .patch(`/api/v2/oauth-clients/${oAuthClient.id}/users/${postResponseData.user.id}`)
@@ -248,6 +251,7 @@ describe("OAuth Client Users Endpoints", () => {
       expect(responseBody.status).toEqual(SUCCESS_STATUS);
       expect(responseBody.data).toBeDefined();
       expect(responseBody.data.email).toEqual(getOAuthUserEmail(oAuthClient.id, userUpdatedEmail));
+      expect(responseBody.data.locale).toEqual(Locales.PT_BR);
     });
 
     it(`/DELETE/:id`, () => {

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

@@ -1,4 +1,5 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { Locales } from "@/lib/enums/locales";
 import { CreateManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/create-managed-user.output";
 import { GetManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-user.output";
 import { GetManagedUsersOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-users.output";
@@ -191,6 +192,7 @@ export class OAuthClientUsersController {
       createdDate: user.createdDate,
       timeFormat: user.timeFormat,
       defaultScheduleId: user.defaultScheduleId,
+      locale: user.locale as Locales,
     };
   }
 }

apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/outputs/managed-user.output.ts

@@ -1,5 +1,7 @@
+import { Locales } from "@/lib/enums/locales";
 import { ApiProperty } from "@nestjs/swagger";
 import { Transform } from "class-transformer";
+import { IsEnum, IsOptional } from "class-validator";
 
 export class ManagedUserOutput {
   @ApiProperty({ example: 1 })
@@ -26,4 +28,9 @@ export class ManagedUserOutput {
 
   @ApiProperty({ example: null })
   defaultScheduleId!: number | null;
+
+  @IsEnum(Locales)
+  @IsOptional()
+  @ApiProperty({ example: Locales.EN, enum: Locales })
+  locale?: Locales;
 }

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

@@ -7,7 +7,7 @@ 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.15";
+import { createNewUsersConnectToOrgIfExists, slugify } from "@calcom/platform-libraries-0.0.20";
 
 @Injectable()
 export class OAuthClientUsersService {
@@ -59,7 +59,11 @@ export class OAuthClientUsersService {
         })
       )[0];
       await this.userRepository.addToOAuthClient(user.id, oAuthClientId);
-      await this.userRepository.update(user.id, { name: body.name ?? user.username ?? undefined });
+      const updatedUser = await this.userRepository.update(user.id, {
+        name: body.name ?? user.username ?? undefined,
+        locale: body.locale,
+      });
+      user.locale = updatedUser.locale;
     }
 
     const { accessToken, refreshToken, accessTokenExpiresAt } = await this.tokensRepository.createOAuthTokens(

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

@@ -0,0 +1,156 @@
+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 { 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 { CreateTeamEventTypeOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/create-team-event-type.output";
+import { DeleteTeamEventTypeOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/delete-team-event-type.output";
+import { GetTeamEventTypeOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/get-team-event-type.output";
+import { GetTeamEventTypesOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/get-team-event-types.output";
+import { UpdateTeamEventTypeOutput } from "@/modules/organizations/controllers/event-types/outputs/teams/update-team-event-type.output";
+import { OrganizationsEventTypesService } from "@/modules/organizations/services/event-types/organizations-event-types.service";
+import { UserWithProfile } from "@/modules/users/users.repository";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Post,
+  Param,
+  ParseIntPipe,
+  Body,
+  Patch,
+  Delete,
+  HttpCode,
+  HttpStatus,
+  NotFoundException,
+  Query,
+} from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import {
+  CreateTeamEventTypeInput_2024_06_14,
+  SkipTakePagination,
+  UpdateTeamEventTypeInput_2024_06_14,
+} from "@calcom/platform-types";
+
+@Controller({
+  path: "/v2/organizations/:orgId",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard)
+@DocsTags("Organizations Event Types")
+export class OrganizationsEventTypesController {
+  constructor(private readonly organizationsEventTypesService: OrganizationsEventTypesService) {}
+
+  @Roles("TEAM_ADMIN")
+  @UseGuards(IsTeamInOrg)
+  @Post("/teams/:teamId/event-types")
+  async createTeamEventType(
+    @GetUser() user: UserWithProfile,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Body() bodyEventType: CreateTeamEventTypeInput_2024_06_14
+  ): Promise<CreateTeamEventTypeOutput> {
+    const eventType = await this.organizationsEventTypesService.createTeamEventType(
+      user,
+      teamId,
+      orgId,
+      bodyEventType
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventType,
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @UseGuards(IsTeamInOrg)
+  @Get("/teams/:teamId/event-types/:eventTypeId")
+  async getTeamEventType(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("eventTypeId") eventTypeId: number
+  ): Promise<GetTeamEventTypeOutput> {
+    const eventType = await this.organizationsEventTypesService.getTeamEventType(teamId, eventTypeId);
+
+    if (!eventType) {
+      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
+    }
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventType,
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @UseGuards(IsTeamInOrg)
+  @Get("/teams/:teamId/event-types")
+  async getTeamEventTypes(@Param("teamId", ParseIntPipe) teamId: number): Promise<GetTeamEventTypesOutput> {
+    const eventTypes = await this.organizationsEventTypesService.getTeamEventTypes(teamId);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventTypes,
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @Get("/teams/event-types")
+  async getTeamsEventTypes(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<GetTeamEventTypesOutput> {
+    const { skip, take } = queryParams;
+    const eventTypes = await this.organizationsEventTypesService.getTeamsEventTypes(orgId, skip, take);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventTypes,
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @UseGuards(IsTeamInOrg)
+  @Patch("/teams/:teamId/event-types/:eventTypeId")
+  async updateTeamEventType(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("eventTypeId") eventTypeId: number,
+    @GetUser() user: UserWithProfile,
+    @Body() bodyEventType: UpdateTeamEventTypeInput_2024_06_14
+  ): Promise<UpdateTeamEventTypeOutput> {
+    const eventType = await this.organizationsEventTypesService.updateTeamEventType(
+      eventTypeId,
+      teamId,
+      bodyEventType,
+      user
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: eventType,
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @UseGuards(IsTeamInOrg)
+  @Delete("/teams/:teamId/event-types/:eventTypeId")
+  @HttpCode(HttpStatus.OK)
+  async deleteTeamEventType(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("eventTypeId") eventTypeId: number
+  ): Promise<DeleteTeamEventTypeOutput> {
+    const eventType = await this.organizationsEventTypesService.deleteTeamEventType(teamId, eventTypeId);
+
+    return {
+      status: SUCCESS_STATUS,
+      data: {
+        id: eventTypeId,
+        title: eventType.title,
+      },
+    };
+  }
+}

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

@@ -0,0 +1,596 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { User } from "@prisma/client";
+import * as request from "supertest";
+import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { 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 {
+  ApiSuccessResponse,
+  CreateTeamEventTypeInput_2024_06_14,
+  Host,
+  TeamEventTypeOutput_2024_06_14,
+  UpdateTeamEventTypeInput_2024_06_14,
+} from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+describe("Organizations Event Types Endpoints", () => {
+  describe("User Authentication - User is Org Admin", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+
+    let org: Team;
+    let team: Team;
+    let falseTestOrg: Team;
+    let falseTestTeam: Team;
+
+    const userEmail = "org-admin-event-types-controller-e222e@api.com";
+    let userAdmin: User;
+
+    const teammate1Email = "teammate111@team.com";
+    const teammate2Email = "teammate221@team.com";
+    const falseTestUserEmail = "false-user@false-team.com";
+    let teammate1: User;
+    let teammate2: User;
+    let falseTestUser: User;
+
+    let collectiveEventType: TeamEventTypeOutput_2024_06_14;
+    let managedEventType: TeamEventTypeOutput_2024_06_14;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+
+      userAdmin = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        role: "ADMIN",
+      });
+
+      teammate1 = await userRepositoryFixture.create({
+        email: teammate1Email,
+        username: teammate1Email,
+      });
+
+      teammate2 = await userRepositoryFixture.create({
+        email: teammate2Email,
+        username: teammate2Email,
+      });
+
+      falseTestUser = await userRepositoryFixture.create({
+        email: falseTestUserEmail,
+        username: falseTestUserEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      falseTestOrg = await organizationsRepositoryFixture.create({
+        name: "False test org",
+        isOrganization: true,
+      });
+
+      team = await teamsRepositoryFixture.create({
+        name: "Test org team",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      falseTestTeam = await teamsRepositoryFixture.create({
+        name: "Outside org team",
+        isOrganization: false,
+        parent: { connect: { id: falseTestOrg.id } },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${userAdmin.id}`,
+        username: userEmail,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: userAdmin.id,
+          },
+        },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: userAdmin.id } },
+        team: { connect: { id: org.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: teammate1.id } },
+        team: { connect: { id: team.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: teammate2.id } },
+        team: { connect: { id: team.id } },
+        accepted: true,
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: falseTestUser.id } },
+        team: { connect: { id: falseTestTeam.id } },
+        accepted: true,
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(userAdmin).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should not be able to create event-type for team outside org", async () => {
+      const body: CreateTeamEventTypeInput_2024_06_14 = {
+        title: "Coding consultation",
+        slug: "coding-consultation",
+        description: "Our team will review your codebase.",
+        lengthInMinutes: 60,
+        locations: [
+          {
+            type: "integration",
+            integration: "cal-video",
+          },
+        ],
+        schedulingType: "COLLECTIVE",
+        hosts: [
+          {
+            userId: teammate1.id,
+            mandatory: true,
+            priority: "high",
+          },
+        ],
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${falseTestTeam.id}/event-types`)
+        .send(body)
+        .expect(404);
+    });
+
+    it("should not be able to create event-type for user outside org", async () => {
+      const userId = falseTestUser.id;
+
+      const body: CreateTeamEventTypeInput_2024_06_14 = {
+        title: "Coding consultation",
+        slug: "coding-consultation",
+        description: "Our team will review your codebase.",
+        lengthInMinutes: 60,
+        locations: [
+          {
+            type: "integration",
+            integration: "cal-video",
+          },
+        ],
+        schedulingType: "COLLECTIVE",
+        hosts: [
+          {
+            userId,
+            mandatory: true,
+            priority: "high",
+          },
+        ],
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${team.id}/event-types`)
+        .send(body)
+        .expect(404);
+    });
+
+    it("should create a collective team event-type", async () => {
+      const body: CreateTeamEventTypeInput_2024_06_14 = {
+        title: "Coding consultation collective",
+        slug: "coding-consultation collective",
+        description: "Our team will review your codebase.",
+        lengthInMinutes: 60,
+        locations: [
+          {
+            type: "integration",
+            integration: "cal-video",
+          },
+        ],
+        bookingFields: [
+          {
+            type: "select",
+            label: "select which language is your codebase in",
+            slug: "select-language",
+            required: true,
+            placeholder: "select language",
+            options: ["javascript", "python", "cobol"],
+          },
+        ],
+        schedulingType: "COLLECTIVE",
+        hosts: [
+          {
+            userId: teammate1.id,
+            mandatory: true,
+            priority: "high",
+          },
+          {
+            userId: teammate2.id,
+            mandatory: false,
+            priority: "low",
+          },
+        ],
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${team.id}/event-types`)
+        .send(body)
+        .expect(201)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.title).toEqual(body.title);
+          expect(data.hosts.length).toEqual(2);
+          evaluateHost(body.hosts[0], data.hosts[0]);
+          evaluateHost(body.hosts[1], data.hosts[1]);
+
+          collectiveEventType = responseBody.data;
+        });
+    });
+
+    it("should create a managed team event-type", async () => {
+      const body: CreateTeamEventTypeInput_2024_06_14 = {
+        title: "Coding consultation managed",
+        slug: "coding-consultation-managed",
+        description: "Our team will review your codebase.",
+        lengthInMinutes: 60,
+        locations: [
+          {
+            type: "integration",
+            integration: "cal-video",
+          },
+        ],
+        schedulingType: "MANAGED",
+        hosts: [
+          {
+            userId: teammate1.id,
+            mandatory: true,
+            priority: "high",
+          },
+          {
+            userId: teammate2.id,
+            mandatory: false,
+            priority: "low",
+          },
+        ],
+      };
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${team.id}/event-types`)
+        .send(body)
+        .expect(201)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.length).toEqual(3);
+
+          const teammate1EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teammate1.id);
+          const teammate2EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teammate2.id);
+          const teamEventTypes = await eventTypesRepositoryFixture.getAllTeamEventTypes(team.id);
+
+          expect(teammate1EventTypes.length).toEqual(1);
+          expect(teammate2EventTypes.length).toEqual(1);
+          expect(teamEventTypes.filter((eventType) => eventType.schedulingType === "MANAGED").length).toEqual(
+            1
+          );
+
+          const responseTeamEvent = responseBody.data[0];
+          expect(responseTeamEvent?.teamId).toEqual(team.id);
+
+          const responseTeammate1Event = responseBody.data[1];
+          expect(responseTeammate1Event?.ownerId).toEqual(teammate1.id);
+          expect(responseTeammate1Event?.parentEventTypeId).toEqual(responseTeamEvent?.id);
+
+          const responseTeammate2Event = responseBody.data[2];
+          expect(responseTeammate2Event?.ownerId).toEqual(teammate2.id);
+          expect(responseTeammate2Event?.parentEventTypeId).toEqual(responseTeamEvent?.id);
+
+          managedEventType = responseTeamEvent;
+        });
+    });
+
+    it("should not get an event-type of team outside org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${falseTestTeam.id}/event-types/${collectiveEventType.id}`)
+        .expect(404);
+    });
+
+    it("should not get a non existing event-type", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${team.id}/event-types/999999`)
+        .expect(404);
+    });
+
+    it("should get a team event-type", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${team.id}/event-types/${collectiveEventType.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.title).toEqual(collectiveEventType.title);
+          expect(data.hosts.length).toEqual(2);
+          evaluateHost(collectiveEventType.hosts[0], data.hosts[0]);
+          evaluateHost(collectiveEventType.hosts[1], data.hosts[1]);
+
+          collectiveEventType = responseBody.data;
+        });
+    });
+
+    it("should not get event-types of team outside org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${falseTestTeam.id}/event-types`)
+        .expect(404);
+    });
+
+    it("should get team event-types", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${team.id}/event-types`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          console.log("asap responseBody.data", JSON.stringify(responseBody.data, null, 2));
+          expect(data.length).toEqual(2);
+
+          const eventTypeCollective = data.find((eventType) => eventType.schedulingType === "COLLECTIVE");
+          const eventTypeManaged = data.find((eventType) => eventType.schedulingType === "MANAGED");
+
+          expect(eventTypeCollective?.title).toEqual(collectiveEventType.title);
+          expect(eventTypeCollective?.hosts.length).toEqual(2);
+
+          expect(eventTypeManaged?.title).toEqual(managedEventType.title);
+          expect(eventTypeManaged?.hosts.length).toEqual(2);
+          evaluateHost(collectiveEventType.hosts[0], eventTypeCollective?.hosts[0]);
+          evaluateHost(collectiveEventType.hosts[1], eventTypeCollective?.hosts[1]);
+        });
+    });
+
+    it("should not be able to update event-type for incorrect team", async () => {
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        title: "Clean code consultation",
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${falseTestTeam.id}/event-types/${collectiveEventType.id}`)
+        .send(body)
+        .expect(404);
+    });
+
+    it("should not be able to update non existing event-type", async () => {
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        title: "Clean code consultation",
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${team.id}/event-types/999999`)
+        .send(body)
+        .expect(404);
+    });
+
+    it("should update collective event-type", async () => {
+      const newHosts: UpdateTeamEventTypeInput_2024_06_14["hosts"] = [
+        {
+          userId: teammate1.id,
+          mandatory: true,
+          priority: "medium",
+        },
+      ];
+
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        hosts: newHosts,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${team.id}/event-types/${collectiveEventType.id}`)
+        .send(body)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const eventType = responseBody.data;
+          expect(eventType.title).toEqual(collectiveEventType.title);
+          expect(eventType.hosts.length).toEqual(1);
+          evaluateHost(eventType.hosts[0], newHosts[0]);
+        });
+    });
+
+    it("should update managed event-type", async () => {
+      const newTitle = "Coding consultation managed updated";
+      const newHosts: UpdateTeamEventTypeInput_2024_06_14["hosts"] = [
+        {
+          userId: teammate1.id,
+          mandatory: true,
+          priority: "medium",
+        },
+      ];
+
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        title: newTitle,
+        hosts: newHosts,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${team.id}/event-types/${managedEventType.id}`)
+        .send(body)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.length).toEqual(2);
+
+          const teammate1EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teammate1.id);
+          const teammate2EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teammate2.id);
+          const teamEventTypes = await eventTypesRepositoryFixture.getAllTeamEventTypes(team.id);
+          const managedTeamEventTypes = teamEventTypes.filter(
+            (eventType) => eventType.schedulingType === "MANAGED"
+          );
+
+          expect(teammate1EventTypes.length).toEqual(1);
+          expect(teammate2EventTypes.length).toEqual(0);
+          expect(managedTeamEventTypes.length).toEqual(1);
+          expect(managedTeamEventTypes[0].assignAllTeamMembers).toEqual(false);
+
+          const responseTeamEvent = responseBody.data[0];
+          expect(responseTeamEvent.title).toEqual(newTitle);
+          expect(responseTeamEvent.assignAllTeamMembers).toEqual(false);
+
+          const responseTeammate1Event = responseBody.data[1];
+          expect(responseTeammate1Event.title).toEqual(newTitle);
+
+          expect(teammate1EventTypes[0].title).toEqual(newTitle);
+          expect(
+            teamEventTypes.filter((eventType) => eventType.schedulingType === "MANAGED")?.[0]?.title
+          ).toEqual(newTitle);
+
+          managedEventType = responseBody.data[0];
+        });
+    });
+
+    it("should assign all members to managed event-type", async () => {
+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        assignAllTeamMembers: true,
+      };
+
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${team.id}/event-types/${managedEventType.id}`)
+        .send(body)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<TeamEventTypeOutput_2024_06_14[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+
+          const data = responseBody.data;
+          expect(data.length).toEqual(3);
+
+          const teammate1EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teammate1.id);
+          const teammate2EventTypes = await eventTypesRepositoryFixture.getAllUserEventTypes(teammate2.id);
+          const teamEventTypes = await eventTypesRepositoryFixture.getAllTeamEventTypes(team.id);
+          const managedTeamEventTypes = teamEventTypes.filter(
+            (eventType) => eventType.schedulingType === "MANAGED"
+          );
+
+          expect(teammate1EventTypes.length).toEqual(1);
+          expect(teammate2EventTypes.length).toEqual(1);
+          expect(managedTeamEventTypes.length).toEqual(1);
+          expect(managedTeamEventTypes[0].assignAllTeamMembers).toEqual(true);
+
+          const responseTeamEvent = responseBody.data[0];
+          expect(responseTeamEvent?.teamId).toEqual(team.id);
+          expect(responseTeamEvent.assignAllTeamMembers).toEqual(true);
+
+          const responseTeammate1Event = responseBody.data[1];
+          expect(responseTeammate1Event?.ownerId).toEqual(teammate1.id);
+          expect(responseTeammate1Event?.parentEventTypeId).toEqual(responseTeamEvent?.id);
+
+          const responseTeammate2Event = responseBody.data[2];
+          expect(responseTeammate2Event?.ownerId).toEqual(teammate2.id);
+          expect(responseTeammate2Event?.parentEventTypeId).toEqual(responseTeamEvent?.id);
+
+          managedEventType = responseTeamEvent;
+        });
+    });
+
+    it("should not delete event-type of team outside org", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/teams/${falseTestTeam.id}/event-types/${collectiveEventType.id}`)
+        .expect(404);
+    });
+
+    it("should delete event-type not part of the team", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/teams/${team.id}/event-types/99999`)
+        .expect(404);
+    });
+
+    it("should delete collective event-type", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/teams/${team.id}/event-types/${collectiveEventType.id}`)
+        .expect(200);
+    });
+
+    it("should delete managed event-type", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/teams/${team.id}/event-types/${managedEventType.id}`)
+        .expect(200);
+    });
+
+    function evaluateHost(expected: Host, received: Host | undefined) {
+      expect(expected.userId).toEqual(received?.userId);
+      expect(expected.mandatory).toEqual(received?.mandatory);
+      expect(expected.priority).toEqual(received?.priority);
+    }
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(userAdmin.email);
+      await userRepositoryFixture.deleteByEmail(teammate1.email);
+      await userRepositoryFixture.deleteByEmail(teammate2.email);
+      await userRepositoryFixture.deleteByEmail(falseTestUser.email);
+      await teamsRepositoryFixture.delete(team.id);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});

apps/api/v2/src/modules/organizations/controllers/event-types/outputs/teams/create-team-event-type.output.ts

@@ -0,0 +1,21 @@
+import { ApiProperty, getSchemaPath } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { ApiResponseWithoutData, TeamEventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class CreateTeamEventTypeOutput extends ApiResponseWithoutData {
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @ApiProperty({
+    oneOf: [
+      { $ref: getSchemaPath(TeamEventTypeOutput_2024_06_14) },
+      {
+        type: "array",
+        items: { $ref: getSchemaPath(TeamEventTypeOutput_2024_06_14) },
+      },
+    ],
+  })
+  @Type(() => TeamEventTypeOutput_2024_06_14)
+  data!: TeamEventTypeOutput_2024_06_14 | TeamEventTypeOutput_2024_06_14[];
+}

apps/api/v2/src/modules/organizations/controllers/event-types/outputs/teams/delete-team-event-type.output.ts

@@ -0,0 +1,10 @@
+import { Type } from "class-transformer";
+import { ValidateNested } from "class-validator";
+
+import { ApiResponseWithoutData, TeamEventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class DeleteTeamEventTypeOutput extends ApiResponseWithoutData {
+  @ValidateNested()
+  @Type(() => TeamEventTypeOutput_2024_06_14)
+  data!: Pick<TeamEventTypeOutput_2024_06_14, "id" | "title">;
+}

apps/api/v2/src/modules/organizations/controllers/event-types/outputs/teams/get-team-event-type.output.ts

@@ -0,0 +1,10 @@
+import { Type } from "class-transformer";
+import { ValidateNested } from "class-validator";
+
+import { ApiResponseWithoutData, TeamEventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class GetTeamEventTypeOutput extends ApiResponseWithoutData {
+  @ValidateNested()
+  @Type(() => TeamEventTypeOutput_2024_06_14)
+  data!: TeamEventTypeOutput_2024_06_14;
+}

apps/api/v2/src/modules/organizations/controllers/event-types/outputs/teams/get-team-event-types.output.ts

@@ -0,0 +1,10 @@
+import { Type } from "class-transformer";
+import { ValidateNested } from "class-validator";
+
+import { ApiResponseWithoutData, TeamEventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class GetTeamEventTypesOutput extends ApiResponseWithoutData {
+  @ValidateNested({ each: true })
+  @Type(() => TeamEventTypeOutput_2024_06_14)
+  data!: TeamEventTypeOutput_2024_06_14[];
+}

apps/api/v2/src/modules/organizations/controllers/event-types/outputs/teams/update-team-event-type.output.ts

@@ -0,0 +1,21 @@
+import { ApiProperty, getSchemaPath } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { ApiResponseWithoutData, TeamEventTypeOutput_2024_06_14 } from "@calcom/platform-types";
+
+export class UpdateTeamEventTypeOutput extends ApiResponseWithoutData {
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @ApiProperty({
+    oneOf: [
+      { $ref: getSchemaPath(TeamEventTypeOutput_2024_06_14) },
+      {
+        type: "array",
+        items: { $ref: getSchemaPath(TeamEventTypeOutput_2024_06_14) },
+      },
+    ],
+  })
+  @Type(() => TeamEventTypeOutput_2024_06_14)
+  data!: TeamEventTypeOutput_2024_06_14 | TeamEventTypeOutput_2024_06_14[];
+}

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

@@ -0,0 +1,311 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { UpdateOrgMembershipDto } from "@/modules/organizations/inputs/update-organization-membership.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 { Membership, Team } from "@calcom/prisma/client";
+
+describe("Organizations Memberships Endpoints", () => {
+  describe("User Authentication - User is Org Admin", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let membership: Membership;
+    let membership2: Membership;
+    let membershipCreatedViaApi: Membership;
+
+    const userEmail = "org-admin-membership-controller-e2e@api.com";
+    const userEmail2 = "org-member-membership-controller-e2e@api.com";
+
+    const invitedUserEmail = "org-member-invited-membership-controller-e2e@api.com";
+
+    let user: User;
+    let user2: User;
+
+    let userToInviteViaApi: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+      user2 = await userRepositoryFixture.create({
+        email: userEmail2,
+        username: userEmail2,
+      });
+
+      userToInviteViaApi = await userRepositoryFixture.create({
+        email: invitedUserEmail,
+        username: invitedUserEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      membership = await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      membership2 = await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user2.id } },
+        team: { 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 memberships of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data[0].id).toEqual(membership.id);
+          expect(responseBody.data[1].id).toEqual(membership2.id);
+        });
+    });
+
+    it("should get all the memberships of the org paginated", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships?skip=1&take=1`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data[0].id).toEqual(membership2.id);
+          expect(responseBody.data[0].userId).toEqual(user2.id);
+        });
+    });
+
+    it("should fail if org does not exist", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/120494059/memberships`).expect(403);
+    });
+
+    it("should get the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships/${membership.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(membership.id);
+          expect(responseBody.data.userId).toEqual(user.id);
+        });
+    });
+
+    it("should create the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/memberships`)
+        .send({
+          userId: userToInviteViaApi.id,
+          accepted: true,
+          role: "MEMBER",
+        } satisfies CreateOrgMembershipDto)
+        .expect(201)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          membershipCreatedViaApi = responseBody.data;
+          expect(membershipCreatedViaApi.teamId).toEqual(org.id);
+          expect(membershipCreatedViaApi.role).toEqual("MEMBER");
+          expect(membershipCreatedViaApi.userId).toEqual(userToInviteViaApi.id);
+        });
+    });
+
+    it("should update the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/memberships/${membershipCreatedViaApi.id}`)
+        .send({
+          role: "OWNER",
+        } satisfies UpdateOrgMembershipDto)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          membershipCreatedViaApi = responseBody.data;
+          expect(membershipCreatedViaApi.role).toEqual("OWNER");
+        });
+    });
+
+    it("should delete the membership of the org we created via api", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/memberships/${membershipCreatedViaApi.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(membershipCreatedViaApi.id);
+        });
+    });
+
+    it("should fail to get the membership of the org we just deleted", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships/${membershipCreatedViaApi.id}`)
+        .expect(404);
+    });
+
+    it("should fail if the membership does not exist", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships/123132145`)
+        .expect(404);
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await userRepositoryFixture.deleteByEmail(user2.email);
+      await userRepositoryFixture.deleteByEmail(userToInviteViaApi.email);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});
+
+describe("Organizations Memberships Endpoints", () => {
+  describe("User Authentication - User is Org Member", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let membership: Membership;
+
+    const userEmail = "org-member-memberships-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);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      membership = await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user.id } },
+        team: { 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 memberships of the org", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/memberships`).expect(403);
+    });
+
+    it("should deny get all the memberships of the org paginated", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships?skip=1&take=1`)
+        .expect(403);
+    });
+
+    it("should deny get the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships/${membership.id}`)
+        .expect(403);
+    });
+
+    it("should deny create the membership for the org", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/memberships`)
+        .send({
+          role: "OWNER",
+          userId: user.id,
+          accepted: true,
+        } satisfies CreateOrgMembershipDto)
+        .expect(403);
+    });
+
+    it("should deny update the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/memberships/${membership.id}`)
+        .send({
+          role: "MEMBER",
+        } satisfies Partial<CreateOrgMembershipDto>)
+        .expect(403);
+    });
+
+    it("should deny delete the membership of the org we created via api", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/memberships/${membership.id}`)
+        .expect(403);
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});

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

@@ -0,0 +1,127 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { GetMembership } from "@/modules/auth/decorators/get-membership/get-membership.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { IsMembershipInOrg } from "@/modules/auth/guards/memberships/is-membership-in-org.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { UpdateOrgMembershipDto } from "@/modules/organizations/inputs/update-organization-membership.input";
+import { CreateOrgMembershipOutput } from "@/modules/organizations/outputs/organization-membership/create-membership.output";
+import { DeleteOrgMembership } from "@/modules/organizations/outputs/organization-membership/delete-membership.output";
+import { GetAllOrgMemberships } from "@/modules/organizations/outputs/organization-membership/get-all-memberships.output";
+import { GetOrgMembership } from "@/modules/organizations/outputs/organization-membership/get-membership.output";
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { UpdateOrgMembership } from "@/modules/organizations/outputs/organization-membership/update-membership.output";
+import { OrganizationsMembershipService } from "@/modules/organizations/services/organizations-membership.service";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Param,
+  ParseIntPipe,
+  Query,
+  Delete,
+  Patch,
+  Post,
+  Body,
+  HttpCode,
+  HttpStatus,
+} from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+import { plainToClass } from "class-transformer";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { SkipTakePagination } from "@calcom/platform-types";
+import { Membership } from "@calcom/prisma/client";
+
+@Controller({
+  path: "/v2/organizations/:orgId/memberships",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard)
+@DocsTags("Organizations Memberships")
+export class OrganizationsMembershipsController {
+  constructor(private organizationsMembershipService: OrganizationsMembershipService) {}
+
+  @Roles("ORG_ADMIN")
+  @Get("/")
+  @HttpCode(HttpStatus.OK)
+  async getAllMemberships(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<GetAllOrgMemberships> {
+    const { skip, take } = queryParams;
+    const memberships = await this.organizationsMembershipService.getPaginatedOrgMemberships(
+      orgId,
+      skip ?? 0,
+      take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: memberships.map((membership) =>
+        plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" })
+      ),
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @Post("/")
+  @HttpCode(HttpStatus.CREATED)
+  async createMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Body() body: CreateOrgMembershipDto
+  ): Promise<CreateOrgMembershipOutput> {
+    const membership = await this.organizationsMembershipService.createOrgMembership(orgId, body);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsMembershipInOrg)
+  @Get("/:membershipId")
+  @HttpCode(HttpStatus.OK)
+  async getUserSchedule(@GetMembership() membership: Membership): Promise<GetOrgMembership> {
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsMembershipInOrg)
+  @Delete("/:membershipId")
+  @HttpCode(HttpStatus.OK)
+  async deleteMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("membershipId", ParseIntPipe) membershipId: number
+  ): Promise<DeleteOrgMembership> {
+    const membership = await this.organizationsMembershipService.deleteOrgMembership(orgId, membershipId);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @UseGuards(IsMembershipInOrg)
+  @Roles("ORG_ADMIN")
+  @Patch("/:membershipId")
+  @HttpCode(HttpStatus.OK)
+  async updateMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("membershipId", ParseIntPipe) membershipId: number,
+    @Body() body: UpdateOrgMembershipDto
+  ): Promise<UpdateOrgMembership> {
+    const membership = await this.organizationsMembershipService.updateOrgMembership(
+      orgId,
+      membershipId,
+      body
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+}

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

@@ -0,0 +1,342 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateOrgTeamMembershipDto } from "@/modules/organizations/inputs/create-organization-team-membership.input";
+import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/inputs/update-organization-team-membership.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 { 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 { ApiSuccessResponse } from "@calcom/platform-types";
+import { Membership, Team } from "@calcom/prisma/client";
+
+describe("Organizations Teams Memberships Endpoints", () => {
+  describe("User Authentication - User is Org Admin", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let orgTeam: Team;
+    let nonOrgTeam: Team;
+    let membership: Membership;
+    let membership2: Membership;
+    let membershipCreatedViaApi: Membership;
+
+    const userEmail = "org-admin-membership-teams-controller-e2e@api.com";
+    const userEmail2 = "org-member-membership-teams-controller-e2e@api.com";
+    const nonOrgUserEmail = "non-org-member-membership-teams-controller-e2e@api.com";
+
+    const invitedUserEmail = "org-member-invited-membership-teams-controller-e2e@api.com";
+
+    let user: User;
+    let user2: User;
+    let nonOrgUser: User;
+
+    let userToInviteViaApi: 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);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+      user2 = await userRepositoryFixture.create({
+        email: userEmail2,
+        username: userEmail2,
+      });
+
+      nonOrgUser = await userRepositoryFixture.create({
+        email: nonOrgUserEmail,
+        username: nonOrgUserEmail,
+      });
+
+      userToInviteViaApi = await userRepositoryFixture.create({
+        email: invitedUserEmail,
+        username: invitedUserEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      orgTeam = await teamsRepositoryFixture.create({
+        name: "Org Team",
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      nonOrgTeam = await teamsRepositoryFixture.create({
+        name: "Non Org Team",
+        isOrganization: false,
+      });
+
+      membership = await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: orgTeam.id } },
+      });
+
+      membership2 = await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user2.id } },
+        team: { connect: { id: orgTeam.id } },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user2.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: userToInviteViaApi.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: nonOrgUser.id } },
+        team: { connect: { id: nonOrgTeam.id } },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${user.id}`,
+        username: userEmail,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${user2.id}`,
+        username: userEmail2,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: user2.id,
+          },
+        },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${userToInviteViaApi.id}`,
+        username: invitedUserEmail,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: userToInviteViaApi.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 memberships of the org's team", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data[0].id).toEqual(membership.id);
+          expect(responseBody.data[1].id).toEqual(membership2.id);
+          expect(responseBody.data.length).toEqual(2);
+        });
+    });
+
+    it("should fail to get all the memberships of team which is not in the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${nonOrgTeam.id}/memberships`)
+        .expect(404);
+    });
+
+    it("should get all the memberships of the org's team paginated", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships?skip=1&take=1`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data[0].id).toEqual(membership2.id);
+          expect(responseBody.data[0].userId).toEqual(user2.id);
+          expect(responseBody.data.length).toEqual(1);
+        });
+    });
+
+    it("should fail if org does not exist", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/120494059/teams/${orgTeam.id}/memberships`)
+        .expect(403);
+    });
+
+    it("should get the membership of the org's team", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships/${membership.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(membership.id);
+          expect(responseBody.data.userId).toEqual(user.id);
+        });
+    });
+
+    it("should fail to get the membership of a team not in the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${nonOrgTeam.id}/memberships/${membership.id}`)
+        .expect(404);
+    });
+
+    it("should fail to create the membership of a team not in the org", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${nonOrgTeam.id}/memberships`)
+        .send({
+          userId: userToInviteViaApi.id,
+          accepted: true,
+          role: "MEMBER",
+        } satisfies CreateOrgTeamMembershipDto)
+        .expect(404);
+    });
+
+    it("should create the membership of the org's team", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships`)
+        .send({
+          userId: userToInviteViaApi.id,
+          accepted: true,
+          role: "MEMBER",
+        } satisfies CreateOrgTeamMembershipDto)
+        .expect(201)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          membershipCreatedViaApi = responseBody.data;
+          expect(membershipCreatedViaApi.teamId).toEqual(orgTeam.id);
+          expect(membershipCreatedViaApi.role).toEqual("MEMBER");
+          expect(membershipCreatedViaApi.userId).toEqual(userToInviteViaApi.id);
+        });
+    });
+
+    it("should fail to create the membership of the org's team for a non org user", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships`)
+        .send({
+          userId: nonOrgUser.id,
+          accepted: true,
+          role: "MEMBER",
+        } satisfies CreateOrgTeamMembershipDto)
+        .expect(422);
+    });
+
+    it("should update the membership of the org's team", async () => {
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships/${membershipCreatedViaApi.id}`)
+        .send({
+          role: "OWNER",
+        } satisfies UpdateOrgTeamMembershipDto)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          membershipCreatedViaApi = responseBody.data;
+          expect(membershipCreatedViaApi.role).toEqual("OWNER");
+        });
+    });
+
+    it("should delete the membership of the org's team we created via api", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships/${membershipCreatedViaApi.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(membershipCreatedViaApi.id);
+        });
+    });
+
+    it("should fail to get the membership of the org's team we just deleted", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships/${membershipCreatedViaApi.id}`)
+        .expect(404);
+    });
+
+    it("should fail if the membership does not exist", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/memberships/123132145`)
+        .expect(404);
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await userRepositoryFixture.deleteByEmail(userToInviteViaApi.email);
+      await userRepositoryFixture.deleteByEmail(nonOrgUser.email);
+      await userRepositoryFixture.deleteByEmail(user2.email);
+      await organizationsRepositoryFixture.delete(org.id);
+      await organizationsRepositoryFixture.delete(nonOrgTeam.id);
+      await app.close();
+    });
+  });
+});

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

@@ -0,0 +1,158 @@
+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 { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
+import { CreateOrgTeamMembershipDto } from "@/modules/organizations/inputs/create-organization-team-membership.input";
+import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/inputs/update-organization-team-membership.input";
+import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import {
+  OrgTeamMembershipOutputDto,
+  OrgTeamMembershipsOutputResponseDto,
+  OrgTeamMembershipOutputResponseDto,
+} from "@/modules/organizations/outputs/organization-teams-memberships.output";
+import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/services/organizations-teams-memberships.service";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Param,
+  ParseIntPipe,
+  Query,
+  Delete,
+  Patch,
+  Post,
+  Body,
+  HttpStatus,
+  HttpCode,
+  UnprocessableEntityException,
+} from "@nestjs/common";
+import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
+import { plainToClass } from "class-transformer";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { SkipTakePagination } from "@calcom/platform-types";
+
+@Controller({
+  path: "/v2/organizations/:orgId/teams/:teamId/memberships",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, IsTeamInOrg)
+@DocsTags("Organizations Teams")
+export class OrganizationsTeamsMembershipsController {
+  constructor(
+    private organizationsTeamsMembershipsService: OrganizationsTeamsMembershipsService,
+    private readonly organizationsRepository: OrganizationsRepository
+  ) {}
+
+  @Get("/")
+  @ApiOperation({ summary: "Get all the memberships of a team of an organization." })
+  @UseGuards()
+  @Roles("TEAM_ADMIN")
+  @HttpCode(HttpStatus.OK)
+  async getAllOrgTeamMemberships(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<OrgTeamMembershipsOutputResponseDto> {
+    const { skip, take } = queryParams;
+    const orgTeamMemberships = await this.organizationsTeamsMembershipsService.getPaginatedOrgTeamMemberships(
+      orgId,
+      teamId,
+      skip ?? 0,
+      take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: orgTeamMemberships.map((membership) =>
+        plainToClass(OrgTeamMembershipOutputDto, membership, { strategy: "excludeAll" })
+      ),
+    };
+  }
+
+  @Get("/:membershipId")
+  @ApiOperation({ summary: "Get the membership of an organization's team by ID" })
+  @UseGuards()
+  @Roles("TEAM_ADMIN")
+  @HttpCode(HttpStatus.OK)
+  async getOrgTeamMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("membershipId", ParseIntPipe) membershipId: number
+  ): Promise<OrgTeamMembershipOutputResponseDto> {
+    const orgTeamMembership = await this.organizationsTeamsMembershipsService.getOrgTeamMembership(
+      orgId,
+      teamId,
+      membershipId
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgTeamMembershipOutputDto, orgTeamMembership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @Delete("/:membershipId")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: "Delete the membership of an organization's team by ID" })
+  async deleteOrgTeamMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("membershipId", ParseIntPipe) membershipId: number
+  ): Promise<OrgTeamMembershipOutputResponseDto> {
+    const membership = await this.organizationsTeamsMembershipsService.deleteOrgTeamMembership(
+      orgId,
+      teamId,
+      membershipId
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgTeamMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @Patch("/:membershipId")
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: "Update the membership of an organization's team by ID" })
+  async updateOrgTeamMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("membershipId", ParseIntPipe) membershipId: number,
+    @Body() data: UpdateOrgTeamMembershipDto
+  ): Promise<OrgTeamMembershipOutputResponseDto> {
+    const membership = await this.organizationsTeamsMembershipsService.updateOrgTeamMembership(
+      orgId,
+      teamId,
+      membershipId,
+      data
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgTeamMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Roles("TEAM_ADMIN")
+  @Post("/")
+  @HttpCode(HttpStatus.CREATED)
+  @ApiOperation({ summary: "Create a membership of an organization's team" })
+  async createOrgTeamMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Body() data: CreateOrgTeamMembershipDto
+  ): Promise<OrgTeamMembershipOutputResponseDto> {
+    const user = await this.organizationsRepository.findOrgUser(Number(orgId), Number(data.userId));
+
+    if (!user) {
+      throw new UnprocessableEntityException("User is not part of the Organization");
+    }
+
+    const membership = await this.organizationsTeamsMembershipsService.createOrgTeamMembership(teamId, data);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgTeamMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+}

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

@@ -135,12 +135,17 @@ describe("Organizations Team Endpoints", () => {
           name: "Team created via API",
         } satisfies CreateOrgTeamDto)
         .expect(201)
-        .then((response) => {
+        .then(async (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);
+          const membership = await membershipsRepositoryFixture.getUserMembershipByTeamId(
+            user.id,
+            teamCreatedViaApi.id
+          );
+          expect(membership?.role ?? "").toEqual("OWNER");
         });
     });
 

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

@@ -1,5 +1,6 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
 import { GetTeam } from "@/modules/auth/decorators/get-team/get-team.decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
@@ -12,6 +13,7 @@ import {
   OrgTeamsOutputResponseDto,
 } from "@/modules/organizations/outputs/organization-team.output";
 import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
+import { UserWithProfile } from "@/modules/users/users.repository";
 import {
   Controller,
   UseGuards,
@@ -99,14 +101,14 @@ export class OrganizationsTeamsController {
   }
 
   @Post()
-  @UseGuards()
   @Roles("ORG_ADMIN")
   @ApiOperation({ summary: "Create a team for an organization." })
   async createTeam(
     @Param("orgId", ParseIntPipe) orgId: number,
-    @Body() body: CreateOrgTeamDto
+    @Body() body: CreateOrgTeamDto,
+    @GetUser() user: UserWithProfile
   ): Promise<OrgTeamOutputResponseDto> {
-    const team = await this.organizationsTeamsService.createOrgTeam(orgId, body);
+    const team = await this.organizationsTeamsService.createOrgTeam(orgId, body, user);
     return {
       status: SUCCESS_STATUS,
       data: plainToClass(OrgTeamOutputDto, team, { strategy: "excludeAll" }),

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

@@ -0,0 +1,115 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { GetOrg } from "@/modules/auth/decorators/get-org/get-org.decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { 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 { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
+import { GetOrganizationsUsersInput } from "@/modules/organizations/inputs/get-organization-users.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
+import { GetOrganizationUsersOutput } from "@/modules/organizations/outputs/get-organization-users.output";
+import { GetOrganizationUserOutput } from "@/modules/organizations/outputs/get-organization-users.output";
+import { OrganizationsUsersService } from "@/modules/organizations/services/organizations-users-service";
+import { GetUserOutput } from "@/modules/users/outputs/get-users.output";
+import { UserWithProfile } from "@/modules/users/users.repository";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Post,
+  Patch,
+  Delete,
+  Param,
+  ParseIntPipe,
+  Body,
+  UseInterceptors,
+  Query,
+} from "@nestjs/common";
+import { ClassSerializerInterceptor } from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+import { plainToInstance } from "class-transformer";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { Team } from "@calcom/prisma/client";
+
+@Controller({
+  path: "/v2/organizations/:orgId/users",
+  version: API_VERSIONS_VALUES,
+})
+@UseInterceptors(ClassSerializerInterceptor)
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard)
+@UseGuards(IsOrgGuard)
+@DocsTags("Organizations Users")
+export class OrganizationsUsersController {
+  constructor(private readonly organizationsUsersService: OrganizationsUsersService) {}
+
+  @Get()
+  @Roles("ORG_ADMIN")
+  async getOrganizationsUsers(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Query() query: GetOrganizationsUsersInput
+  ): Promise<GetOrganizationUsersOutput> {
+    const users = await this.organizationsUsersService.getUsers(
+      orgId,
+      query.emails,
+      query.skip ?? 0,
+      query.take ?? 250
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: users.map((user) => plainToInstance(GetUserOutput, user, { strategy: "excludeAll" })),
+    };
+  }
+
+  @Post()
+  @Roles("ORG_ADMIN")
+  async createOrganizationUser(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @GetOrg() org: Team,
+    @Body() input: CreateOrganizationUserInput,
+    @GetUser() inviter: UserWithProfile
+  ): Promise<GetOrganizationUserOutput> {
+    const user = await this.organizationsUsersService.createUser(
+      org,
+      input,
+      inviter.name ?? inviter.username ?? inviter.email
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(GetUserOutput, user, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Patch("/:userId")
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  async updateOrganizationUser(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("userId", ParseIntPipe) userId: number,
+    @GetOrg() org: Team,
+    @Body() input: UpdateOrganizationUserInput
+  ): Promise<GetOrganizationUserOutput> {
+    const user = await this.organizationsUsersService.updateUser(orgId, userId, input);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(GetUserOutput, user, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Delete("/:userId")
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  async deleteOrganizationUser(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("userId", ParseIntPipe) userId: number
+  ): Promise<GetOrganizationUserOutput> {
+    const user = await this.organizationsUsersService.deleteUser(orgId, userId);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(GetUserOutput, user, { strategy: "excludeAll" }),
+    };
+  }
+}

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

@@ -0,0 +1,347 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { EmailService } from "@/modules/email/email.service";
+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 { User, Team, Membership } from "@calcom/prisma/client";
+
+describe("Organizations Users Endpoints", () => {
+  describe("Member role", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipFixtures: MembershipRepositoryFixture;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+
+    const userEmail = "member1@org.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);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test org 3",
+        isOrganization: true,
+      });
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        organization: { connect: { id: org.id } },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${user.id}`,
+        username: userEmail,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: user.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 find org users", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/users`).expect(403);
+    });
+
+    it("should not be able to create a new org user", async () => {
+      return request(app.getHttpServer()).post(`/v2/organizations/${org.id}/users`).expect(403);
+    });
+
+    it("should not be able to update an org user", async () => {
+      return request(app.getHttpServer()).patch(`/v2/organizations/${org.id}/users/${user.id}`).expect(403);
+    });
+
+    it("should not be able to delete an org user", async () => {
+      return request(app.getHttpServer()).delete(`/v2/organizations/${org.id}/users/${user.id}`).expect(403);
+    });
+
+    afterAll(async () => {
+      // await membershipFixtures.delete(membership.id);
+      await Promise.all([userRepositoryFixture.deleteByEmail(user.email)]);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+
+      await app.close();
+    });
+  });
+  describe("Admin role", () => {
+    let app: INestApplication;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipFixtures: MembershipRepositoryFixture;
+
+    const userEmail = "admin1@org.com";
+    const nonMemberEmail = "non-member@test.com";
+    let user: User;
+    let org: Team;
+    let createdUser: User;
+
+    const orgMembersData = [
+      {
+        email: "member1@org.com",
+        username: "member1@org.com",
+      },
+      {
+        email: "member2@org.com",
+        username: "member2@org.com",
+      },
+      {
+        email: "member3@org.com",
+        username: "member3@org.com",
+      },
+    ];
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipFixtures = new MembershipRepositoryFixture(moduleRef);
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test org 2",
+        isOrganization: true,
+      });
+
+      await userRepositoryFixture.create({
+        email: nonMemberEmail,
+        username: "non-member",
+      });
+
+      const orgMembers = await Promise.all(
+        orgMembersData.map((member) =>
+          userRepositoryFixture.create({
+            email: member.email,
+            username: member.username,
+            organization: { connect: { id: org.id } },
+          })
+        )
+      );
+      // create profiles of orgMember like they would be when being invied to the org
+      await Promise.all(
+        orgMembers.map((member) =>
+          profileRepositoryFixture.create({
+            uid: `usr-${member.id}`,
+            username: member.username ?? `usr-${member.id}`,
+            organization: {
+              connect: {
+                id: org.id,
+              },
+            },
+            user: {
+              connect: {
+                id: member.id,
+              },
+            },
+          })
+        )
+      );
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        organization: { connect: { id: org.id } },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${user.id}`,
+        username: userEmail,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+      });
+
+      await membershipFixtures.addUserToOrg(user, org, "ADMIN", true);
+      await Promise.all(
+        orgMembers.map((member) => membershipFixtures.addUserToOrg(member, 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 get all org users", async () => {
+      const { body } = await request(app.getHttpServer()).get(`/v2/organizations/${org.id}/users`);
+
+      const userData = body.data;
+
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.length).toBe(4);
+
+      expect(userData.filter((user: { email: string }) => user.email === nonMemberEmail).length).toBe(0);
+    });
+
+    it("should only get users with the specified email", async () => {
+      const { body } = await request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users`)
+        .query({
+          emails: userEmail,
+        })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data;
+
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.length).toBe(1);
+
+      expect(userData.filter((user: { email: string }) => user.email === userEmail).length).toBe(1);
+    });
+
+    it("should get users within the specified emails array", async () => {
+      const orgMemberEmail = orgMembersData[0].email;
+
+      const { body } = await request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users`)
+        .query({
+          emails: [userEmail, orgMemberEmail],
+        })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data;
+
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.length).toBe(2);
+
+      expect(userData.filter((user: { email: string }) => user.email === userEmail).length).toBe(1);
+      expect(userData.filter((user: { email: string }) => user.email === orgMemberEmail).length).toBe(1);
+    });
+
+    it("should update an org user", async () => {
+      const { body } = await request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${user.id}`)
+        .send({
+          theme: "light",
+        })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data as User;
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.theme).toBe("light");
+    });
+
+    it("should create a new org user", async () => {
+      const newOrgUser = {
+        email: "new-org-member-b@org.com",
+        organizationRole: "MEMBER",
+        autoAccept: true,
+      };
+
+      const emailSpy = jest
+        .spyOn(EmailService.prototype, "sendSignupToOrganizationEmail")
+        .mockImplementation(() => Promise.resolve());
+      const { body } = await request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users`)
+        .send({
+          email: newOrgUser.email,
+        })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data;
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.email).toBe(newOrgUser.email);
+      expect(emailSpy).toHaveBeenCalledWith({
+        usernameOrEmail: newOrgUser.email,
+        orgName: org.name,
+        orgId: org.id,
+        inviterName: "admin1@org.com",
+        locale: null,
+      });
+      createdUser = userData;
+    });
+
+    it("should delete an org user", async () => {
+      const { body } = await request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/users/${createdUser.id}`)
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data as User;
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.id).toBe(createdUser.id);
+    });
+
+    afterAll(async () => {
+      // await membershipFixtures.delete(membership.id);
+      await Promise.all([
+        userRepositoryFixture.deleteByEmail(user.email),
+        userRepositoryFixture.deleteByEmail(nonMemberEmail),
+        ...orgMembersData.map((member) => userRepositoryFixture.deleteByEmail(member.email)),
+      ]);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});

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

@@ -0,0 +1,20 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator";
+
+export class CreateOrgMembershipDto {
+  @IsInt()
+  readonly userId!: number;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly accepted?: boolean = false;
+
+  @IsEnum(MembershipRole)
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  readonly role: MembershipRole = MembershipRole.MEMBER;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly disableImpersonation?: boolean = false;
+}

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

@@ -0,0 +1,20 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator";
+
+export class CreateOrgTeamMembershipDto {
+  @IsInt()
+  readonly userId!: number;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly accepted?: boolean = false;
+
+  @IsEnum(MembershipRole)
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  readonly role: MembershipRole = MembershipRole.MEMBER;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly disableImpersonation?: boolean = false;
+}

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

@@ -0,0 +1,17 @@
+import { CreateUserInput } from "@/modules/users/inputs/create-user.input";
+import { MembershipRole } from "@prisma/client";
+import { IsString, IsOptional, IsBoolean, IsEnum } from "class-validator";
+
+export class CreateOrganizationUserInput extends CreateUserInput {
+  @IsOptional()
+  @IsString()
+  locale = "en";
+
+  @IsOptional()
+  @IsEnum(MembershipRole)
+  organizationRole: MembershipRole = MembershipRole.MEMBER;
+
+  @IsOptional()
+  @IsBoolean()
+  autoAccept = true;
+}

apps/api/v2/src/modules/organizations/inputs/get-organization-users.input.ts

@@ -0,0 +1,3 @@
+import { GetUsersInput } from "@/modules/users/inputs/get-users.input";
+
+export class GetOrganizationsUsersInput extends GetUsersInput {}

apps/api/v2/src/modules/organizations/inputs/update-organization-membership.input.ts

@@ -0,0 +1,17 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { IsBoolean, IsOptional, IsEnum } from "class-validator";
+
+export class UpdateOrgMembershipDto {
+  @IsOptional()
+  @IsBoolean()
+  readonly accepted?: boolean = false;
+
+  @IsEnum(MembershipRole)
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  readonly role?: MembershipRole = MembershipRole.MEMBER;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly disableImpersonation?: boolean = false;
+}

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

@@ -0,0 +1,17 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { IsBoolean, IsOptional, IsEnum } from "class-validator";
+
+export class UpdateOrgTeamMembershipDto {
+  @IsOptional()
+  @IsBoolean()
+  readonly accepted?: boolean = false;
+
+  @IsEnum(MembershipRole)
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  readonly role?: MembershipRole = MembershipRole.MEMBER;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly disableImpersonation?: boolean = false;
+}

apps/api/v2/src/modules/organizations/inputs/update-organization-user.input.ts

@@ -0,0 +1,3 @@
+import { UpdateUserInput } from "@/modules/users/inputs/update-user.input";
+
+export class UpdateOrganizationUserInput extends UpdateUserInput {}

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

@@ -1,12 +1,29 @@
+import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
 import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module";
+import { EmailModule } from "@/modules/email/email.module";
+import { EmailService } from "@/modules/email/email.service";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { OrganizationsEventTypesController } from "@/modules/organizations/controllers/event-types/organizations-event-types.controller";
+import { OrganizationsMembershipsController } from "@/modules/organizations/controllers/memberships/organizations-membership.controller";
 import { OrganizationsSchedulesController } from "@/modules/organizations/controllers/schedules/organizations-schedules.controller";
+import { OrganizationsTeamsMembershipsController } from "@/modules/organizations/controllers/teams/memberships/organizations-teams-memberships.controller";
 import { OrganizationsTeamsController } from "@/modules/organizations/controllers/teams/organizations-teams.controller";
+import { OrganizationsUsersController } from "@/modules/organizations/controllers/users/organizations-users.controller";
 import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
+import { OrganizationsMembershipRepository } from "@/modules/organizations/repositories/organizations-membership.repository";
 import { OrganizationSchedulesRepository } from "@/modules/organizations/repositories/organizations-schedules.repository";
+import { OrganizationsTeamsMembershipsRepository } from "@/modules/organizations/repositories/organizations-teams-memberships.repository";
 import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { OrganizationsUsersRepository } from "@/modules/organizations/repositories/organizations-users.repository";
+import { InputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/input.service";
+import { OrganizationsEventTypesService } from "@/modules/organizations/services/event-types/organizations-event-types.service";
+import { OutputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/output.service";
+import { OrganizationsMembershipService } from "@/modules/organizations/services/organizations-membership.service";
 import { OrganizationsSchedulesService } from "@/modules/organizations/services/organizations-schedules.service";
+import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/services/organizations-teams-memberships.service";
 import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
+import { OrganizationsUsersService } from "@/modules/organizations/services/organizations-users-service";
 import { OrganizationsService } from "@/modules/organizations/services/organizations.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
@@ -15,7 +32,15 @@ import { UsersModule } from "@/modules/users/users.module";
 import { Module } from "@nestjs/common";
 
 @Module({
-  imports: [PrismaModule, StripeModule, SchedulesModule_2024_06_11, UsersModule, RedisModule],
+  imports: [
+    PrismaModule,
+    StripeModule,
+    SchedulesModule_2024_06_11,
+    UsersModule,
+    RedisModule,
+    EmailModule,
+    EventTypesModule_2024_06_14,
+  ],
   providers: [
     OrganizationsRepository,
     OrganizationsTeamsRepository,
@@ -24,8 +49,36 @@ import { Module } from "@nestjs/common";
     MembershipsRepository,
     OrganizationsSchedulesService,
     OrganizationSchedulesRepository,
+    OrganizationsUsersRepository,
+    OrganizationsUsersService,
+    EmailService,
+    OrganizationsMembershipRepository,
+    OrganizationsMembershipService,
+    OrganizationsEventTypesService,
+    InputOrganizationsEventTypesService,
+    OutputOrganizationsEventTypesService,
+    OrganizationsEventTypesRepository,
+    OrganizationsTeamsMembershipsRepository,
+    OrganizationsTeamsMembershipsService,
+  ],
+  exports: [
+    OrganizationsService,
+    OrganizationsRepository,
+    OrganizationsTeamsRepository,
+    OrganizationsUsersRepository,
+    OrganizationsUsersService,
+    OrganizationsMembershipRepository,
+    OrganizationsMembershipService,
+    OrganizationsTeamsMembershipsRepository,
+    OrganizationsTeamsMembershipsService,
+  ],
+  controllers: [
+    OrganizationsTeamsController,
+    OrganizationsSchedulesController,
+    OrganizationsUsersController,
+    OrganizationsMembershipsController,
+    OrganizationsEventTypesController,
+    OrganizationsTeamsMembershipsController,
   ],
-  exports: [OrganizationsService, OrganizationsRepository, OrganizationsTeamsRepository],
-  controllers: [OrganizationsTeamsController, OrganizationsSchedulesController],
 })
 export class OrganizationsModule {}

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

@@ -74,7 +74,11 @@ export class OrganizationsRepository {
     return this.dbRead.prisma.user.findUnique({
       where: {
         id: userId,
-        organizationId,
+        profiles: {
+          some: {
+            organizationId,
+          },
+        },
       },
     });
   }

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

@@ -0,0 +1,20 @@
+import { GetUserOutput } from "@/modules/users/outputs/get-users.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEnum } from "class-validator";
+
+import { ERROR_STATUS } from "@calcom/platform-constants";
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class GetOrganizationUsersOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+  data!: GetUserOutput[];
+}
+
+export class GetOrganizationUserOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+  data!: GetUserOutput;
+}

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

@@ -0,0 +1,20 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class CreateOrgMembershipOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: OrgMembershipOutputDto,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @Type(() => OrgMembershipOutputDto)
+  data!: OrgMembershipOutputDto;
+}

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

@@ -0,0 +1,13 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEnum } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class DeleteOrgMembership {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  data!: OrgMembershipOutputDto;
+}

apps/api/v2/src/modules/organizations/outputs/organization-membership/get-all-memberships.output.ts

@@ -0,0 +1,21 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsEnum, IsNotEmptyObject, ValidateNested, IsArray } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class GetAllOrgMemberships {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: OrgMembershipOutputDto,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested({ each: true })
+  @Type(() => OrgMembershipOutputDto)
+  @IsArray()
+  data!: OrgMembershipOutputDto[];
+}

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

@@ -0,0 +1,20 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class GetOrgMembership {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: OrgMembershipOutputDto,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @Type(() => OrgMembershipOutputDto)
+  data!: OrgMembershipOutputDto;
+}

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

@@ -0,0 +1,32 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { Expose } from "class-transformer";
+import { IsBoolean, IsInt, IsOptional, IsString } from "class-validator";
+
+export class OrgMembershipOutputDto {
+  @IsInt()
+  @Expose()
+  readonly id!: number;
+
+  @IsInt()
+  @Expose()
+  readonly userId!: number;
+
+  @IsInt()
+  @Expose()
+  readonly teamId!: number;
+
+  @IsBoolean()
+  @Expose()
+  readonly accepted!: boolean;
+
+  @IsString()
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  @Expose()
+  readonly role!: MembershipRole;
+
+  @IsOptional()
+  @IsBoolean()
+  @Expose()
+  readonly disableImpersonation?: boolean;
+}

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

@@ -0,0 +1,20 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class UpdateOrgMembership {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: OrgMembershipOutputDto,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @Type(() => OrgMembershipOutputDto)
+  data!: OrgMembershipOutputDto;
+}

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

@@ -0,0 +1,57 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { Expose, Type } from "class-transformer";
+import { IsArray, IsBoolean, IsEnum, IsInt, IsOptional, IsString, ValidateNested } from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class OrgTeamMembershipOutputDto {
+  @IsInt()
+  @Expose()
+  readonly id!: number;
+
+  @IsInt()
+  @Expose()
+  readonly userId!: number;
+
+  @IsInt()
+  @Expose()
+  readonly teamId!: number;
+
+  @IsBoolean()
+  @Expose()
+  readonly accepted!: boolean;
+
+  @IsString()
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  @Expose()
+  readonly role!: MembershipRole;
+
+  @IsOptional()
+  @IsBoolean()
+  @Expose()
+  readonly disableImpersonation?: boolean;
+}
+
+export class OrgTeamMembershipsOutputResponseDto {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @Expose()
+  @ValidateNested()
+  @Type(() => OrgTeamMembershipOutputDto)
+  @IsArray()
+  data!: OrgTeamMembershipOutputDto[];
+}
+
+export class OrgTeamMembershipOutputResponseDto {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @Expose()
+  @ValidateNested()
+  @Type(() => OrgTeamMembershipOutputDto)
+  data!: OrgTeamMembershipOutputDto;
+}

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

@@ -0,0 +1,61 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrganizationsEventTypesRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async getTeamEventType(teamId: number, eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: {
+        id: eventTypeId,
+        teamId,
+      },
+      include: { users: true, schedule: true, hosts: true },
+    });
+  }
+
+  async getTeamEventTypes(teamId: number) {
+    return this.dbRead.prisma.eventType.findMany({
+      where: {
+        teamId,
+      },
+      include: { users: true, schedule: true, hosts: true },
+    });
+  }
+
+  async getEventTypeById(eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: { id: eventTypeId },
+      include: { users: true, schedule: true, hosts: true },
+    });
+  }
+
+  async getEventTypeChildren(eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findMany({
+      where: { parentId: eventTypeId },
+      include: { users: true, schedule: true, hosts: true },
+    });
+  }
+
+  async getTeamsEventTypes(orgId: number, skip: number, take: number) {
+    return this.dbRead.prisma.eventType.findMany({
+      where: {
+        team: {
+          parentId: orgId,
+        },
+      },
+      skip,
+      take,
+      include: { users: true, schedule: true, hosts: true },
+    });
+  }
+
+  async getEventTypeByIdWithChildren(eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: { id: eventTypeId },
+      include: { children: true },
+    });
+  }
+}

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

@@ -0,0 +1,52 @@
+import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { UpdateOrgMembershipDto } from "../inputs/update-organization-membership.input";
+
+@Injectable()
+export class OrganizationsMembershipRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async findOrgMembership(organizationId: number, membershipId: number) {
+    return this.dbRead.prisma.membership.findUnique({
+      where: {
+        id: membershipId,
+        teamId: organizationId,
+      },
+    });
+  }
+
+  async deleteOrgMembership(organizationId: number, membershipId: number) {
+    return this.dbWrite.prisma.membership.delete({
+      where: {
+        id: membershipId,
+        teamId: organizationId,
+      },
+    });
+  }
+
+  async createOrgMembership(organizationId: number, data: CreateOrgMembershipDto) {
+    return this.dbWrite.prisma.membership.create({
+      data: { ...data, teamId: organizationId },
+    });
+  }
+
+  async updateOrgMembership(organizationId: number, membershipId: number, data: UpdateOrgMembershipDto) {
+    return this.dbWrite.prisma.membership.update({
+      data: { ...data },
+      where: { id: membershipId, teamId: organizationId },
+    });
+  }
+
+  async findOrgMembershipsPaginated(organizationId: number, skip: number, take: number) {
+    return this.dbRead.prisma.membership.findMany({
+      where: {
+        teamId: organizationId,
+      },
+      skip,
+      take,
+    });
+  }
+}

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

@@ -0,0 +1,70 @@
+import { CreateOrgTeamMembershipDto } from "@/modules/organizations/inputs/create-organization-team-membership.input";
+import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/inputs/update-organization-team-membership.input";
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrganizationsTeamsMembershipsRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async findOrgTeamMembershipsPaginated(organizationId: number, teamId: number, skip: number, take: number) {
+    return this.dbRead.prisma.membership.findMany({
+      where: {
+        teamId: teamId,
+        team: {
+          parentId: organizationId,
+        },
+      },
+      skip,
+      take,
+    });
+  }
+
+  async findOrgTeamMembership(organizationId: number, teamId: number, membershipId: number) {
+    return this.dbRead.prisma.membership.findUnique({
+      where: {
+        id: membershipId,
+        teamId: teamId,
+        team: {
+          parentId: organizationId,
+        },
+      },
+    });
+  }
+  async deleteOrgTeamMembershipById(organizationId: number, teamId: number, membershipId: number) {
+    return this.dbWrite.prisma.membership.delete({
+      where: {
+        id: membershipId,
+        teamId: teamId,
+        team: {
+          parentId: organizationId,
+        },
+      },
+    });
+  }
+
+  async updateOrgTeamMembershipById(
+    organizationId: number,
+    teamId: number,
+    membershipId: number,
+    data: UpdateOrgTeamMembershipDto
+  ) {
+    return this.dbWrite.prisma.membership.update({
+      data: { ...data },
+      where: {
+        id: membershipId,
+        teamId: teamId,
+        team: {
+          parentId: organizationId,
+        },
+      },
+    });
+  }
+
+  async createOrgTeamMembership(teamId: number, data: CreateOrgTeamMembershipDto) {
+    return this.dbWrite.prisma.membership.create({
+      data: { ...data, teamId: teamId },
+    });
+  }
+}

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

@@ -1,17 +1,10 @@
-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
-  ) {}
+  constructor(private readonly dbRead: PrismaReadService) {}
 
   async findOrgTeam(organizationId: number, teamId: number) {
     return this.dbRead.prisma.team.findUnique({
@@ -55,4 +48,20 @@ export class OrganizationsTeamsRepository {
       take,
     });
   }
+
+  async getTeamMembersIds(teamId: number) {
+    const team = await this.dbRead.prisma.team.findUnique({
+      where: {
+        id: teamId,
+      },
+      include: {
+        members: true,
+      },
+    });
+    if (!team) {
+      return [];
+    }
+
+    return team.members.map((member) => member.userId);
+  }
 }

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

@@ -0,0 +1,76 @@
+import { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrganizationsUsersRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  private filterOnOrgMembership(orgId: number) {
+    return {
+      profiles: {
+        some: {
+          organizationId: orgId,
+        },
+      },
+    };
+  }
+
+  async getOrganizationUsersByEmails(orgId: number, emailArray?: string[], skip?: number, take?: number) {
+    return await this.dbRead.prisma.user.findMany({
+      where: {
+        ...this.filterOnOrgMembership(orgId),
+        ...(emailArray && emailArray.length ? { email: { in: emailArray } } : {}),
+      },
+      skip,
+      take,
+    });
+  }
+
+  async getOrganizationUserByUsername(orgId: number, username: string) {
+    return await this.dbRead.prisma.user.findFirst({
+      where: {
+        username,
+        ...this.filterOnOrgMembership(orgId),
+      },
+    });
+  }
+
+  async getOrganizationUserByEmail(orgId: number, email: string) {
+    return await this.dbRead.prisma.user.findFirst({
+      where: {
+        email,
+        ...this.filterOnOrgMembership(orgId),
+      },
+    });
+  }
+
+  async createOrganizationUser(orgId: number, createUserBody: CreateOrganizationUserInput) {
+    const createdUser = await this.dbWrite.prisma.user.create({
+      data: createUserBody,
+    });
+
+    return createdUser;
+  }
+
+  async updateOrganizationUser(orgId: number, userId: number, updateUserBody: UpdateOrganizationUserInput) {
+    return await this.dbWrite.prisma.user.update({
+      where: {
+        id: userId,
+        organizationId: orgId,
+      },
+      data: updateUserBody,
+    });
+  }
+
+  async deleteUser(orgId: number, userId: number) {
+    return await this.dbWrite.prisma.user.delete({
+      where: {
+        id: userId,
+        organizationId: orgId,
+      },
+    });
+  }
+}

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

@@ -0,0 +1,162 @@
+import { InputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/input-event-types.service";
+import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { UsersRepository } from "@/modules/users/users.repository";
+import { Injectable } from "@nestjs/common";
+
+import {
+  CreateTeamEventTypeInput_2024_06_14,
+  UpdateTeamEventTypeInput_2024_06_14,
+  HostPriority,
+} from "@calcom/platform-types";
+
+@Injectable()
+export class InputOrganizationsEventTypesService {
+  constructor(
+    private readonly inputEventTypesService: InputEventTypesService_2024_06_14,
+    private readonly organizationsTeamsRepository: OrganizationsTeamsRepository,
+    private readonly usersRepository: UsersRepository,
+    private readonly orgEventTypesRepository: OrganizationsEventTypesRepository
+  ) {}
+  async transformInputCreateTeamEventType(
+    teamId: number,
+    inputEventType: CreateTeamEventTypeInput_2024_06_14
+  ) {
+    const { hosts, assignAllTeamMembers, ...rest } = inputEventType;
+
+    const eventType = this.inputEventTypesService.transformInputCreateEventType(rest);
+
+    const metadata = rest.schedulingType === "MANAGED" ? { managedEventConfig: {} } : undefined;
+
+    const teamEventType = {
+      ...eventType,
+      hosts: assignAllTeamMembers ? await this.getAllTeamMembers(teamId) : this.transformInputHosts(hosts),
+      assignAllTeamMembers,
+      metadata,
+    };
+
+    return teamEventType;
+  }
+
+  async transformInputUpdateTeamEventType(
+    eventTypeId: number,
+    teamId: number,
+    inputEventType: UpdateTeamEventTypeInput_2024_06_14
+  ) {
+    const { hosts, assignAllTeamMembers, ...rest } = inputEventType;
+
+    const eventType = this.inputEventTypesService.transformInputUpdateEventType(rest);
+
+    const children = await this.getChildEventTypesForManagedEventType(eventTypeId, inputEventType, teamId);
+    const teamEventType = {
+      ...eventType,
+      // note(Lauris): we don't populate hosts for managed event-types because they are handled by the children
+      hosts: !children
+        ? assignAllTeamMembers
+          ? await this.getAllTeamMembers(teamId)
+          : this.transformInputHosts(hosts)
+        : undefined,
+      assignAllTeamMembers,
+      children,
+    };
+
+    return teamEventType;
+  }
+
+  async getChildEventTypesForManagedEventType(
+    eventTypeId: number,
+    inputEventType: UpdateTeamEventTypeInput_2024_06_14,
+    teamId: number
+  ) {
+    const eventType = await this.orgEventTypesRepository.getEventTypeByIdWithChildren(eventTypeId);
+
+    if (!eventType || eventType.schedulingType !== "MANAGED") {
+      return undefined;
+    }
+
+    const ownersIds = await this.getOwnersIdsForManagedEventType(teamId, inputEventType, eventType);
+    const owners = await this.getOwnersForManagedEventType(ownersIds);
+
+    return owners.map((owner) => {
+      return {
+        hidden: false,
+        owner,
+      };
+    });
+  }
+
+  async getOwnersIdsForManagedEventType(
+    teamId: number,
+    inputEventType: UpdateTeamEventTypeInput_2024_06_14,
+    eventType: { children: { userId: number | null }[] }
+  ) {
+    if (inputEventType.assignAllTeamMembers) {
+      return await this.organizationsTeamsRepository.getTeamMembersIds(teamId);
+    }
+
+    // note(Lauris): when API user updates managed event type users
+    if (inputEventType.hosts) {
+      return inputEventType.hosts.map((host) => host.userId);
+    }
+
+    // note(Lauris): when API user DOES NOT update managed event type users, but we still need existing managed event type users to know which event-types to update
+    return eventType.children.map((child) => child.userId).filter((id) => !!id) as number[];
+  }
+
+  async getOwnersForManagedEventType(userIds: number[]) {
+    const users = await this.usersRepository.findByIdsWithEventTypes(userIds);
+
+    return users.map((user) => {
+      const nonManagedEventTypes = user.eventTypes.filter((eventType) => !eventType.parentId);
+      return {
+        id: user.id,
+        name: user.name || user.email,
+        email: user.email,
+        // note(Lauris): managed event types slugs have to be excluded otherwise checkExistentEventTypes within handleChildrenEventTypes.ts will incorrectly delete managed user event type.
+        eventTypeSlugs: nonManagedEventTypes.map((eventType) => eventType.slug),
+      };
+    });
+  }
+
+  async getAllTeamMembers(teamId: number) {
+    const membersIds = await this.organizationsTeamsRepository.getTeamMembersIds(teamId);
+
+    return membersIds.map((id) => ({
+      userId: id,
+      isFixed: false,
+      priority: 2,
+    }));
+  }
+
+  transformInputHosts(inputHosts: CreateTeamEventTypeInput_2024_06_14["hosts"] | undefined) {
+    if (!inputHosts) {
+      return undefined;
+    }
+
+    const defaultMandatory = false;
+    const defaultPriority = "medium";
+
+    return inputHosts.map((host) => ({
+      userId: host.userId,
+      isFixed: host.mandatory || defaultMandatory,
+      priority: getPriorityValue(host.priority || defaultPriority),
+    }));
+  }
+}
+
+function getPriorityValue(priority: keyof typeof HostPriority): number {
+  switch (priority) {
+    case "lowest":
+      return 0;
+    case "low":
+      return 1;
+    case "medium":
+      return 2;
+    case "high":
+      return 3;
+    case "highest":
+      return 4;
+    default:
+      throw new Error("Invalid HostPriority label");
+  }
+}

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

@@ -0,0 +1,179 @@
+import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
+import { EventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/event-types.service";
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { InputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/input.service";
+import { OutputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/output.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { UserWithProfile } from "@/modules/users/users.repository";
+import { Injectable, NotFoundException } from "@nestjs/common";
+
+import { createEventType, updateEventType } from "@calcom/platform-libraries-0.0.20";
+import {
+  CreateTeamEventTypeInput_2024_06_14,
+  UpdateTeamEventTypeInput_2024_06_14,
+} from "@calcom/platform-types";
+
+@Injectable()
+export class OrganizationsEventTypesService {
+  constructor(
+    private readonly inputService: InputOrganizationsEventTypesService,
+    private readonly eventTypesService: EventTypesService_2024_06_14,
+    private readonly dbWrite: PrismaWriteService,
+    private readonly organizationEventTypesRepository: OrganizationsEventTypesRepository,
+    private readonly eventTypesRepository: EventTypesRepository_2024_06_14,
+    private readonly outputService: OutputOrganizationsEventTypesService,
+    private readonly membershipsRepository: MembershipsRepository,
+    private readonly organizationsTeamsRepository: OrganizationsTeamsRepository
+  ) {}
+
+  async createTeamEventType(
+    user: UserWithProfile,
+    teamId: number,
+    orgId: number,
+    body: CreateTeamEventTypeInput_2024_06_14
+  ) {
+    await this.validateHosts(teamId, body.hosts);
+    const eventTypeUser = await this.getUserToCreateTeamEvent(user, orgId);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { hosts, assignAllTeamMembers, ...rest } =
+      await this.inputService.transformInputCreateTeamEventType(teamId, body);
+    const { eventType: eventTypeCreated } = await createEventType({
+      input: { teamId: teamId, ...rest },
+      ctx: {
+        user: eventTypeUser,
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        prisma: this.dbWrite.prisma,
+      },
+    });
+
+    return await this.updateTeamEventType(
+      eventTypeCreated.id,
+      teamId,
+      { hosts: body.hosts, assignAllTeamMembers },
+      user
+    );
+  }
+
+  async validateHosts(teamId: number, hosts: CreateTeamEventTypeInput_2024_06_14["hosts"] | undefined) {
+    if (hosts && hosts.length) {
+      const membersIds = await this.organizationsTeamsRepository.getTeamMembersIds(teamId);
+      const invalidHosts = hosts.filter((host) => !membersIds.includes(host.userId));
+      if (invalidHosts.length) {
+        throw new NotFoundException(`Invalid hosts: ${invalidHosts.join(", ")}`);
+      }
+    }
+  }
+
+  async validateEventTypeExists(teamId: number, eventTypeId: number) {
+    const eventType = await this.organizationEventTypesRepository.getTeamEventType(teamId, eventTypeId);
+
+    if (!eventType) {
+      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
+    }
+  }
+
+  async getUserToCreateTeamEvent(user: UserWithProfile, organizationId: number) {
+    const isOrgAdmin = await this.membershipsRepository.isUserOrganizationAdmin(user.id, organizationId);
+    const profileId = user.movedToProfileId || null;
+    return {
+      id: user.id,
+      role: user.role,
+      organizationId: user.organizationId,
+      organization: { isOrgAdmin },
+      profile: { id: profileId },
+      metadata: user.metadata,
+    };
+  }
+
+  async getTeamEventType(teamId: number, eventTypeId: number) {
+    const eventType = await this.organizationEventTypesRepository.getTeamEventType(teamId, eventTypeId);
+
+    if (!eventType) {
+      return null;
+    }
+
+    return this.outputService.getResponseTeamEventType(eventType);
+  }
+
+  async getTeamEventTypes(teamId: number) {
+    const eventTypes = await this.organizationEventTypesRepository.getTeamEventTypes(teamId);
+
+    const eventTypePromises = eventTypes.map(async (eventType) => {
+      return await this.outputService.getResponseTeamEventType(eventType);
+    });
+
+    return await Promise.all(eventTypePromises);
+  }
+
+  async getTeamsEventTypes(orgId: number, skip = 0, take = 250) {
+    const eventTypes = await this.organizationEventTypesRepository.getTeamsEventTypes(orgId, skip, take);
+
+    const eventTypePromises = eventTypes.map(async (eventType) => {
+      return await this.outputService.getResponseTeamEventType(eventType);
+    });
+
+    return await Promise.all(eventTypePromises);
+  }
+
+  async updateTeamEventType(
+    eventTypeId: number,
+    teamId: number,
+    body: UpdateTeamEventTypeInput_2024_06_14,
+    user: UserWithProfile
+  ) {
+    await this.validateEventTypeExists(teamId, eventTypeId);
+    await this.validateHosts(teamId, body.hosts);
+    const eventTypeUser = await this.eventTypesService.getUserToUpdateEvent(user);
+    const bodyTransformed = await this.inputService.transformInputUpdateTeamEventType(
+      eventTypeId,
+      teamId,
+      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.organizationEventTypesRepository.getEventTypeById(eventTypeId);
+
+    if (!eventType) {
+      throw new NotFoundException(`Event type with id ${eventTypeId} not found`);
+    }
+
+    if (eventType.schedulingType !== "MANAGED") {
+      return this.outputService.getResponseTeamEventType(eventType);
+    }
+
+    const children = await this.organizationEventTypesRepository.getEventTypeChildren(eventType.id);
+
+    const eventTypes = [eventType, ...children];
+
+    const eventTypePromises = eventTypes.map(async (e) => {
+      return await this.outputService.getResponseTeamEventType(e);
+    });
+
+    return await Promise.all(eventTypePromises);
+  }
+
+  async deleteTeamEventType(teamId: number, eventTypeId: number) {
+    const existingEventType = await this.organizationEventTypesRepository.getTeamEventType(
+      teamId,
+      eventTypeId
+    );
+
+    if (!existingEventType) {
+      throw new NotFoundException(`Event type with ID=${eventTypeId} does not exist.`);
+    }
+
+    return this.eventTypesRepository.deleteEventType(eventTypeId);
+  }
+}

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

@@ -0,0 +1,114 @@
+import { OutputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/services/output-event-types.service";
+import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
+import { Injectable } from "@nestjs/common";
+import type { EventType, User, Schedule, Host } from "@prisma/client";
+
+import { HostPriority } from "@calcom/platform-types";
+
+type EventTypeRelations = { users: User[]; schedule: Schedule | null; hosts: Host[] };
+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"
+  | "scheduleId"
+  | "hosts"
+  | "teamId"
+  | "userId"
+  | "parentId"
+  | "assignAllTeamMembers"
+>;
+
+@Injectable()
+export class OutputOrganizationsEventTypesService {
+  constructor(
+    private readonly outputEventTypesService: OutputEventTypesService_2024_06_14,
+    private readonly organizationEventTypesRepository: OrganizationsEventTypesRepository
+  ) {}
+
+  async getResponseTeamEventType(databaseEventType: Input) {
+    const { teamId, userId, parentId, assignAllTeamMembers } = databaseEventType;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { ownerId, users, ...rest } = await this.outputEventTypesService.getResponseEventType(
+      0,
+      databaseEventType
+    );
+    const hosts =
+      databaseEventType.schedulingType === "MANAGED"
+        ? await this.getManagedEventTypeHosts(databaseEventType.id)
+        : this.transformHosts(databaseEventType.hosts);
+
+    return {
+      ...rest,
+      hosts,
+      teamId,
+      ownerId: userId,
+      parentEventTypeId: parentId,
+      assignAllTeamMembers: teamId ? assignAllTeamMembers : undefined,
+    };
+  }
+
+  async getManagedEventTypeHosts(eventTypeId: number) {
+    const children = await this.organizationEventTypesRepository.getEventTypeChildren(eventTypeId);
+    const hostsIds: number[] = [];
+    for (const child of children) {
+      if (child.userId) {
+        hostsIds.push(child.userId);
+      }
+    }
+    return hostsIds.map((userId) => ({ userId }));
+  }
+
+  transformHosts(hosts: Host[]) {
+    if (!hosts) return [];
+
+    return hosts.map((host) => {
+      return {
+        userId: host.userId,
+        mandatory: host.isFixed,
+        priority: getPriorityLabel(host.priority || 2),
+      };
+    });
+  }
+}
+
+function getPriorityLabel(priority: number): keyof typeof HostPriority {
+  switch (priority) {
+    case 0:
+      return "lowest";
+    case 1:
+      return "low";
+    case 2:
+      return "medium";
+    case 3:
+      return "high";
+    case 4:
+      return "highest";
+    default:
+      throw new Error("Invalid HostPriority value");
+  }
+}

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

@@ -0,0 +1,49 @@
+import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { OrganizationsMembershipRepository } from "@/modules/organizations/repositories/organizations-membership.repository";
+import { Injectable } from "@nestjs/common";
+
+import { UpdateOrgMembershipDto } from "../inputs/update-organization-membership.input";
+
+@Injectable()
+export class OrganizationsMembershipService {
+  constructor(private readonly organizationsMembershipRepository: OrganizationsMembershipRepository) {}
+
+  async getOrgMembership(organizationId: number, membershipId: number) {
+    const membership = await this.organizationsMembershipRepository.findOrgMembership(
+      organizationId,
+      membershipId
+    );
+    return membership;
+  }
+
+  async getPaginatedOrgMemberships(organizationId: number, skip = 0, take = 250) {
+    const memberships = await this.organizationsMembershipRepository.findOrgMembershipsPaginated(
+      organizationId,
+      skip,
+      take
+    );
+    return memberships;
+  }
+
+  async deleteOrgMembership(organizationId: number, membershipId: number) {
+    const membership = await this.organizationsMembershipRepository.deleteOrgMembership(
+      organizationId,
+      membershipId
+    );
+    return membership;
+  }
+
+  async updateOrgMembership(organizationId: number, membershipId: number, data: UpdateOrgMembershipDto) {
+    const membership = await this.organizationsMembershipRepository.updateOrgMembership(
+      organizationId,
+      membershipId,
+      data
+    );
+    return membership;
+  }
+
+  async createOrgMembership(organizationId: number, data: CreateOrgMembershipDto) {
+    const membership = await this.organizationsMembershipRepository.createOrgMembership(organizationId, data);
+    return membership;
+  }
+}

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

@@ -0,0 +1,68 @@
+import { CreateOrgTeamMembershipDto } from "@/modules/organizations/inputs/create-organization-team-membership.input";
+import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/inputs/update-organization-team-membership.input";
+import { OrganizationsTeamsMembershipsRepository } from "@/modules/organizations/repositories/organizations-teams-memberships.repository";
+import { Injectable, NotFoundException } from "@nestjs/common";
+
+@Injectable()
+export class OrganizationsTeamsMembershipsService {
+  constructor(
+    private readonly organizationsTeamsMembershipsRepository: OrganizationsTeamsMembershipsRepository
+  ) {}
+
+  async createOrgTeamMembership(teamId: number, data: CreateOrgTeamMembershipDto) {
+    const teamMembership = await this.organizationsTeamsMembershipsRepository.createOrgTeamMembership(
+      teamId,
+      data
+    );
+    return teamMembership;
+  }
+
+  async getPaginatedOrgTeamMemberships(organizationId: number, teamId: number, skip = 0, take = 250) {
+    const teamMemberships =
+      await this.organizationsTeamsMembershipsRepository.findOrgTeamMembershipsPaginated(
+        organizationId,
+        teamId,
+        skip,
+        take
+      );
+    return teamMemberships;
+  }
+
+  async getOrgTeamMembership(organizationId: number, teamId: number, membershipId: number) {
+    const teamMemberships = await this.organizationsTeamsMembershipsRepository.findOrgTeamMembership(
+      organizationId,
+      teamId,
+      membershipId
+    );
+
+    if (!teamMemberships) {
+      throw new NotFoundException("Organization's Team membership not found");
+    }
+
+    return teamMemberships;
+  }
+
+  async updateOrgTeamMembership(
+    organizationId: number,
+    teamId: number,
+    membershipId: number,
+    data: UpdateOrgTeamMembershipDto
+  ) {
+    const teamMembership = await this.organizationsTeamsMembershipsRepository.updateOrgTeamMembershipById(
+      organizationId,
+      teamId,
+      membershipId,
+      data
+    );
+    return teamMembership;
+  }
+
+  async deleteOrgTeamMembership(organizationId: number, teamId: number, membershipId: number) {
+    const teamMembership = await this.organizationsTeamsMembershipsRepository.deleteOrgTeamMembershipById(
+      organizationId,
+      teamId,
+      membershipId
+    );
+    return teamMembership;
+  }
+}

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

@@ -1,10 +1,15 @@
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
 import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";
 
 @Injectable()
 export class OrganizationsTeamsService {
-  constructor(private readonly organizationsTeamRepository: OrganizationsTeamsRepository) {}
+  constructor(
+    private readonly organizationsTeamRepository: OrganizationsTeamsRepository,
+    private readonly membershipsRepository: MembershipsRepository
+  ) {}
 
   async getPaginatedOrgTeams(organizationId: number, skip = 0, take = 250) {
     const teams = await this.organizationsTeamRepository.findOrgTeamsPaginated(organizationId, skip, take);
@@ -21,8 +26,11 @@ export class OrganizationsTeamsService {
     return team;
   }
 
-  async createOrgTeam(organizationId: number, data: CreateOrgTeamDto) {
+  async createOrgTeam(organizationId: number, data: CreateOrgTeamDto, user: UserWithProfile) {
     const team = await this.organizationsTeamRepository.createOrgTeam(organizationId, data);
+    if (user.role !== "ADMIN") {
+      await this.membershipsRepository.createMembership(team.id, user.id, "OWNER", true);
+    }
     return team;
   }
 }

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

@@ -0,0 +1,118 @@
+import { EmailService } from "@/modules/email/email.service";
+import { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
+import { OrganizationsUsersRepository } from "@/modules/organizations/repositories/organizations-users.repository";
+import { CreateUserInput } from "@/modules/users/inputs/create-user.input";
+import { Injectable, ConflictException } from "@nestjs/common";
+import { plainToInstance } from "class-transformer";
+
+import { createNewUsersConnectToOrgIfExists } from "@calcom/platform-libraries-0.0.20";
+import { Team } from "@calcom/prisma/client";
+
+@Injectable()
+export class OrganizationsUsersService {
+  constructor(
+    private readonly organizationsUsersRepository: OrganizationsUsersRepository,
+    private readonly emailService: EmailService
+  ) {}
+
+  async getUsers(orgId: number, emailInput?: string[], skip?: number, take?: number) {
+    const emailArray = !emailInput ? [] : emailInput;
+
+    const users = await this.organizationsUsersRepository.getOrganizationUsersByEmails(
+      orgId,
+      emailArray,
+      skip,
+      take
+    );
+
+    return users;
+  }
+
+  async createUser(org: Team, userCreateBody: CreateOrganizationUserInput, inviterName: string) {
+    // Check if email exists in the system
+    const userEmailCheck = await this.organizationsUsersRepository.getOrganizationUserByEmail(
+      org.id,
+      userCreateBody.email
+    );
+
+    if (userEmailCheck) throw new ConflictException("A user already exists with that email");
+
+    // Check if username is already in use in the org
+    if (userCreateBody.username) {
+      await this.checkForUsernameConflicts(org.id, userCreateBody.username);
+    }
+
+    const usernameOrEmail = userCreateBody.username ? userCreateBody.username : userCreateBody.email;
+
+    // Create new org user
+    const createdUserCall = await createNewUsersConnectToOrgIfExists({
+      invitations: [
+        {
+          usernameOrEmail: usernameOrEmail,
+          role: userCreateBody.organizationRole,
+        },
+      ],
+      teamId: org.id,
+      isOrg: true,
+      parentId: null,
+      autoAcceptEmailDomain: "not-required-for-this-endpoint",
+      orgConnectInfoByUsernameOrEmail: {
+        [usernameOrEmail]: {
+          orgId: org.id,
+          autoAccept: userCreateBody.autoAccept,
+        },
+      },
+    });
+
+    const createdUser = createdUserCall[0];
+
+    // Update user fields that weren't included in createNewUsersConnectToOrgIfExists
+    const updateUserBody = plainToInstance(CreateUserInput, userCreateBody, { strategy: "excludeAll" });
+
+    // Update new user with other userCreateBody params
+    const user = await this.organizationsUsersRepository.updateOrganizationUser(
+      org.id,
+      createdUser.id,
+      updateUserBody
+    );
+
+    // Need to send email to new user to create password
+    await this.emailService.sendSignupToOrganizationEmail({
+      usernameOrEmail,
+      orgName: org.name,
+      orgId: org.id,
+      locale: user?.locale,
+      inviterName,
+    });
+
+    return user;
+  }
+
+  async updateUser(orgId: number, userId: number, userUpdateBody: UpdateOrganizationUserInput) {
+    if (userUpdateBody.username) {
+      await this.checkForUsernameConflicts(orgId, userUpdateBody.username);
+    }
+
+    const user = await this.organizationsUsersRepository.updateOrganizationUser(
+      orgId,
+      userId,
+      userUpdateBody
+    );
+    return user;
+  }
+
+  async deleteUser(orgId: number, userId: number) {
+    const user = await this.organizationsUsersRepository.deleteUser(orgId, userId);
+    return user;
+  }
+
+  async checkForUsernameConflicts(orgId: number, username: string) {
+    const isUsernameTaken = await this.organizationsUsersRepository.getOrganizationUserByUsername(
+      orgId,
+      username
+    );
+
+    if (isUsernameTaken) throw new ConflictException("Username is already taken");
+  }
+}

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

@@ -0,0 +1,156 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CalendarsService } from "@/ee/calendars/services/calendars.service";
+import { HttpExceptionFilter } from "@/filters/http-exception.filter";
+import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { SelectedCalendarOutputResponseDto } from "@/modules/selected-calendars/outputs/selected-calendars.output";
+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, Credential } from "@prisma/client";
+import * as request from "supertest";
+import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture";
+import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { CalendarsServiceMock } from "test/mocks/calendars-service-mock";
+
+import { APPLE_CALENDAR_TYPE, APPLE_CALENDAR_ID } from "@calcom/platform-constants";
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+
+const CLIENT_REDIRECT_URI = "http://localhost:5555";
+
+describe("Platform Selected Calendars Endpoints", () => {
+  let app: INestApplication;
+
+  let oAuthClient: PlatformOAuthClient;
+  let organization: Team;
+  let userRepositoryFixture: UserRepositoryFixture;
+  let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+  let teamRepositoryFixture: TeamRepositoryFixture;
+  let tokensRepositoryFixture: TokensRepositoryFixture;
+  let credentialsRepositoryFixture: CredentialsRepositoryFixture;
+  let appleCalendarCredentials: Credential;
+  let user: User;
+  let accessTokenSecret: string;
+  let refreshTokenSecret: string;
+
+  beforeAll(async () => {
+    const moduleRef = await Test.createTestingModule({
+      providers: [PrismaExceptionFilter, HttpExceptionFilter],
+      imports: [AppModule, UsersModule, 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);
+    tokensRepositoryFixture = new TokensRepositoryFixture(moduleRef);
+    credentialsRepositoryFixture = new CredentialsRepositoryFixture(moduleRef);
+    organization = await teamRepositoryFixture.create({ name: "organization" });
+    oAuthClient = await createOAuthClient(organization.id);
+    user = await userRepositoryFixture.createOAuthManagedUser("office365-connect@gmail.com", oAuthClient.id);
+    const tokens = await tokensRepositoryFixture.createTokens(user.id, oAuthClient.id);
+    accessTokenSecret = tokens.accessToken;
+    refreshTokenSecret = tokens.refreshToken;
+    appleCalendarCredentials = await credentialsRepositoryFixture.create(
+      APPLE_CALENDAR_TYPE,
+      {},
+      user.id,
+      APPLE_CALENDAR_ID
+    );
+    await app.init();
+    jest
+      .spyOn(CalendarsService.prototype, "getCalendars")
+      .mockImplementation(CalendarsServiceMock.prototype.getCalendars);
+  });
+
+  async function createOAuthClient(organizationId: number) {
+    const data = {
+      logo: "logo-url",
+      name: "name",
+      redirectUris: [CLIENT_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(accessTokenSecret).toBeDefined();
+    expect(refreshTokenSecret).toBeDefined();
+    expect(user).toBeDefined();
+  });
+
+  it(`POST /v2/selected-calendars: it should respond with a 201 returning back the user added selected calendar`, async () => {
+    const body = {
+      integration: appleCalendarCredentials.type,
+      externalId: "https://caldav.icloud.com/20961146906/calendars/83C4F9A1-F1D0-41C7-8FC3-0B$9AE22E813/",
+      credentialId: appleCalendarCredentials.id,
+    };
+
+    await request(app.getHttpServer())
+      .post("/v2/selected-calendars")
+      .set("Authorization", `Bearer ${accessTokenSecret}`)
+      .send(body)
+      .expect(201)
+      .then(async (response) => {
+        const responseBody: SelectedCalendarOutputResponseDto = response.body;
+
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        expect(responseBody.data).toBeDefined();
+        expect(responseBody.data.credentialId).toEqual(body.credentialId);
+        expect(responseBody.data.integration).toEqual(body.integration);
+        expect(responseBody.data.externalId).toEqual(body.externalId);
+        expect(responseBody.data.userId).toEqual(user.id);
+      });
+  });
+
+  it(`DELETE /v2/selected-calendars: it should respond with a 200 returning back the user deleted selected calendar`, async () => {
+    const integration = appleCalendarCredentials.type;
+    const externalId =
+      "https://caldav.icloud.com/20961146906/calendars/83C4F9A1-F1D0-41C7-8FC3-0B$9AE22E813/";
+    const credentialId = appleCalendarCredentials.id;
+
+    await request(app.getHttpServer())
+      .delete(
+        `/v2/selected-calendars?credentialId=${credentialId}&integration=${integration}&externalId=${externalId}`
+      )
+      .set("Authorization", `Bearer ${accessTokenSecret}`)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: SelectedCalendarOutputResponseDto = response.body;
+
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        expect(responseBody.data).toBeDefined();
+        expect(responseBody.data.credentialId).toEqual(credentialId);
+        expect(responseBody.data.externalId).toEqual(externalId);
+        expect(responseBody.data.integration).toEqual(integration);
+        expect(responseBody.data.userId).toEqual(user.id);
+      });
+  });
+
+  afterAll(async () => {
+    await oauthClientRepositoryFixture.delete(oAuthClient.id);
+    await teamRepositoryFixture.delete(organization.id);
+    await userRepositoryFixture.deleteByEmail(user.email);
+    await app.close();
+  });
+});

apps/api/v2/src/modules/selected-calendars/controllers/selected-calendars.controller.ts

@@ -0,0 +1,76 @@
+import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
+import { CalendarsService } from "@/ee/calendars/services/calendars.service";
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import {
+  SelectedCalendarsInputDto,
+  SelectedCalendarsQueryParamsInputDto,
+} from "@/modules/selected-calendars/inputs/selected-calendars.input";
+import {
+  SelectedCalendarOutputResponseDto,
+  SelectedCalendarOutputDto,
+} from "@/modules/selected-calendars/outputs/selected-calendars.output";
+import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
+import { UserWithProfile } from "@/modules/users/users.repository";
+import { Body, Controller, Post, UseGuards, Delete, Query } from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+import { plainToClass } from "class-transformer";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+
+@Controller({
+  path: "/v2/selected-calendars",
+  version: API_VERSIONS_VALUES,
+})
+@DocsTags("Selected-Calendars")
+export class SelectedCalendarsController {
+  constructor(
+    private readonly calendarsRepository: CalendarsRepository,
+    private readonly selectedCalendarsRepository: SelectedCalendarsRepository,
+    private readonly calendarsService: CalendarsService
+  ) {}
+
+  @Post("/")
+  @UseGuards(ApiAuthGuard)
+  async addSelectedCalendar(
+    @Body() input: SelectedCalendarsInputDto,
+    @GetUser() user: UserWithProfile
+  ): Promise<SelectedCalendarOutputResponseDto> {
+    const { integration, externalId, credentialId } = input;
+    await this.calendarsService.checkCalendarCredentials(Number(credentialId), user.id);
+
+    const newlyAddedCalendarEntry = await this.selectedCalendarsRepository.addUserSelectedCalendar(
+      user.id,
+      integration,
+      externalId,
+      credentialId
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(SelectedCalendarOutputDto, newlyAddedCalendarEntry, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Delete("/")
+  @UseGuards(ApiAuthGuard)
+  async removeSelectedCalendar(
+    @Query() queryParams: SelectedCalendarsQueryParamsInputDto,
+    @GetUser() user: UserWithProfile
+  ): Promise<SelectedCalendarOutputResponseDto> {
+    const { integration, externalId, credentialId } = queryParams;
+    await this.calendarsService.checkCalendarCredentials(Number(credentialId), user.id);
+
+    const removedCalendarEntry = await this.selectedCalendarsRepository.removeUserSelectedCalendar(
+      user.id,
+      integration,
+      externalId
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(SelectedCalendarOutputDto, removedCalendarEntry, { strategy: "excludeAll" }),
+    };
+  }
+}

apps/api/v2/src/modules/selected-calendars/inputs/selected-calendars.input.ts

@@ -0,0 +1,23 @@
+import { IsInt, IsString } from "class-validator";
+
+export class SelectedCalendarsInputDto {
+  @IsString()
+  readonly integration!: string;
+
+  @IsString()
+  readonly externalId!: string;
+
+  @IsInt()
+  readonly credentialId!: number;
+}
+
+export class SelectedCalendarsQueryParamsInputDto {
+  @IsString()
+  readonly integration!: string;
+
+  @IsString()
+  readonly externalId!: string;
+
+  @IsString()
+  readonly credentialId!: string;
+}

apps/api/v2/src/modules/selected-calendars/outputs/selected-calendars.output.ts

@@ -0,0 +1,34 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsInt, IsString, ValidateNested, IsEnum } from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class SelectedCalendarOutputDto {
+  @IsInt()
+  @Expose()
+  readonly userId!: number;
+
+  @IsString()
+  @Expose()
+  readonly integration!: string;
+
+  @IsString()
+  @Expose()
+  readonly externalId!: string;
+
+  @IsInt()
+  @Expose()
+  readonly credentialId!: number | null;
+}
+
+export class SelectedCalendarOutputResponseDto {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @Expose()
+  @ValidateNested()
+  @Type(() => SelectedCalendarOutputDto)
+  data!: SelectedCalendarOutputDto;
+}

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

@@ -1,10 +1,24 @@
+import { CalendarsRepository } from "@/ee/calendars/calendars.repository";
+import { CalendarsService } from "@/ee/calendars/services/calendars.service";
+import { AppsRepository } from "@/modules/apps/apps.repository";
+import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { SelectedCalendarsController } from "@/modules/selected-calendars/controllers/selected-calendars.controller";
 import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
+import { UsersRepository } from "@/modules/users/users.repository";
 import { Module } from "@nestjs/common";
 
 @Module({
   imports: [PrismaModule],
-  providers: [SelectedCalendarsRepository],
+  providers: [
+    SelectedCalendarsRepository,
+    CalendarsRepository,
+    CalendarsService,
+    UsersRepository,
+    CredentialsRepository,
+    AppsRepository,
+  ],
+  controllers: [SelectedCalendarsController],
   exports: [SelectedCalendarsRepository],
 })
 export class SelectedCalendarsModule {}

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

@@ -37,4 +37,41 @@ export class SelectedCalendarsRepository {
       },
     });
   }
+
+  async addUserSelectedCalendar(
+    userId: number,
+    integration: string,
+    externalId: string,
+    credentialId: number
+  ) {
+    return await this.dbWrite.prisma.selectedCalendar.upsert({
+      where: {
+        userId_integration_externalId: {
+          userId,
+          integration,
+          externalId,
+        },
+      },
+      create: {
+        userId,
+        integration,
+        externalId,
+        credentialId,
+      },
+      // already exists
+      update: {},
+    });
+  }
+
+  async removeUserSelectedCalendar(userId: number, integration: string, externalId: string) {
+    return await this.dbWrite.prisma.selectedCalendar.delete({
+      where: {
+        userId_integration_externalId: {
+          userId,
+          externalId,
+          integration,
+        },
+      },
+    });
+  }
 }

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

@@ -5,8 +5,8 @@ import { ApiTags as DocsTags } from "@nestjs/swagger";
 import { Response as ExpressResponse, Request as ExpressRequest } from "express";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
-import { getAvailableSlots } from "@calcom/platform-libraries-0.0.2";
-import type { AvailableSlotsType } from "@calcom/platform-libraries-0.0.2";
+import { getAvailableSlots } from "@calcom/platform-libraries-0.0.20";
+import type { AvailableSlotsType } from "@calcom/platform-libraries-0.0.20";
 import { RemoveSelectedSlotInput, ReserveSlotInput } from "@calcom/platform-types";
 import { ApiResponse, GetAvailableSlotsInput } from "@calcom/platform-types";
 

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

@@ -3,7 +3,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
 import { DateTime } from "luxon";
 
-import { MINUTES_TO_BOOK } from "@calcom/platform-libraries-0.0.2";
+import { MINUTES_TO_BOOK } from "@calcom/platform-libraries-0.0.20";
 import { ReserveSlotInput } from "@calcom/platform-types";
 
 @Injectable()

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

@@ -4,7 +4,7 @@ import { Controller, Get } from "@nestjs/common";
 import { ApiTags as DocsTags } from "@nestjs/swagger";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
-import type { CityTimezones } from "@calcom/platform-libraries-0.0.2";
+import type { CityTimezones } from "@calcom/platform-libraries-0.0.20";
 import { ApiResponse } from "@calcom/platform-types";
 
 @Controller({

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

@@ -1,8 +1,8 @@
 import { RedisService } from "@/modules/redis/redis.service";
 import { Injectable } from "@nestjs/common";
 
-import { cityTimezonesHandler } from "@calcom/platform-libraries-0.0.2";
-import type { CityTimezones } from "@calcom/platform-libraries-0.0.2";
+import { cityTimezonesHandler } from "@calcom/platform-libraries-0.0.20";
+import type { CityTimezones } from "@calcom/platform-libraries-0.0.20";
 
 @Injectable()
 export class TimezonesService {

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

@@ -1,6 +1,7 @@
+import { Locales } from "@/lib/enums/locales";
 import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { ApiProperty } from "@nestjs/swagger";
-import { IsOptional, IsTimeZone, IsString } from "class-validator";
+import { IsOptional, IsTimeZone, IsString, IsEnum } from "class-validator";
 
 export type WeekDay = "Monday" | "Tuesday" | "Wednesday" | "Thursday" | "Friday" | "Saturday" | "Sunday";
 export type TimeFormat = 12 | 24;
@@ -30,4 +31,9 @@ export class CreateManagedUserInput {
   @CapitalizeTimeZone()
   @ApiProperty({ example: "America/New_York" })
   timeZone?: string;
+
+  @IsEnum(Locales)
+  @IsOptional()
+  @ApiProperty({ example: Locales.EN, enum: Locales })
+  locale?: Locales;
 }

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

@@ -0,0 +1,131 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Transform } from "class-transformer";
+import {
+  IsBoolean,
+  IsEmail,
+  IsHexColor,
+  IsNumber,
+  IsOptional,
+  IsString,
+  Validate,
+  Min,
+} from "class-validator";
+
+import { AvatarValidator } from "../validators/avatarValidator";
+import { LocaleValidator } from "../validators/localeValidator";
+import { ThemeValidator } from "../validators/themeValidator";
+import { TimeFormatValidator } from "../validators/timeFormatValidator";
+import { TimeZoneValidator } from "../validators/timeZoneValidator";
+import { WeekdayValidator } from "../validators/weekdayValidator";
+
+export class CreateUserInput {
+  @ApiProperty({ type: String, description: "User email address", example: "user@example.com" })
+  @IsEmail()
+  @Transform(({ value }) => {
+    if (typeof value === "string") {
+      return value.toLowerCase();
+    }
+  })
+  @Expose()
+  email!: string;
+
+  @ApiProperty({ type: String, required: false, description: "Username", example: "user123" })
+  @IsOptional()
+  @IsString()
+  @Transform(({ value }) => {
+    if (typeof value === "string") {
+      return value.toLowerCase();
+    }
+  })
+  @Expose()
+  username?: string;
+
+  @ApiProperty({ type: String, required: false, description: "Preferred weekday", example: "Monday" })
+  @IsOptional()
+  @IsString()
+  @Validate(WeekdayValidator)
+  @Expose()
+  weekday?: string;
+
+  @ApiProperty({
+    type: String,
+    required: false,
+    description: "Brand color in HEX format",
+    example: "#FFFFFF",
+  })
+  @IsOptional()
+  @IsHexColor()
+  @Expose()
+  brandColor?: string;
+
+  @ApiProperty({
+    type: String,
+    required: false,
+    description: "Dark brand color in HEX format",
+    example: "#000000",
+  })
+  @IsOptional()
+  @IsHexColor()
+  @Expose()
+  darkBrandColor?: string;
+
+  @ApiProperty({ type: Boolean, required: false, description: "Hide branding", example: false })
+  @IsOptional()
+  @IsBoolean()
+  @Expose()
+  hideBranding?: boolean;
+
+  @ApiProperty({ type: String, required: false, description: "Time zone", example: "America/New_York" })
+  @IsOptional()
+  @IsString()
+  @Validate(TimeZoneValidator)
+  @Expose()
+  timeZone?: string;
+
+  @ApiProperty({ type: String, required: false, description: "Theme", example: "dark" })
+  @IsOptional()
+  @IsString()
+  @Validate(ThemeValidator)
+  @Expose()
+  theme?: string | null;
+
+  @ApiProperty({ type: String, required: false, description: "Application theme", example: "light" })
+  @IsOptional()
+  @IsString()
+  @Validate(ThemeValidator)
+  @Expose()
+  appTheme?: string | null;
+
+  @ApiProperty({ type: Number, required: false, description: "Time format", example: 24 })
+  @IsOptional()
+  @IsNumber()
+  @Validate(TimeFormatValidator)
+  @Expose()
+  timeFormat?: number;
+
+  @ApiProperty({ type: Number, required: false, description: "Default schedule ID", example: 1, minimum: 0 })
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  @Expose()
+  defaultScheduleId?: number;
+
+  @ApiProperty({ type: String, required: false, description: "Locale", example: "en", default: "en" })
+  @IsOptional()
+  @IsString()
+  @Validate(LocaleValidator)
+  @Expose()
+  locale?: string | null = "en";
+
+  @ApiProperty({
+    type: String,
+    required: false,
+    description: "Avatar URL",
+    example: "https://example.com/avatar.jpg",
+  })
+  @IsOptional()
+  @IsString()
+  @Validate(AvatarValidator)
+  @Expose()
+  avatarUrl?: string;
+}