feat: v2 teams event types (calcom#18085)

* feat: v2 teams event-types endpoints

* refactor: rely on teams event types service and repository

* finish mergin main into this branch

* test: teams event types

* refactor: move teams event types output from org to teams folder

* refactor: move teams event types output from org to teams folder

* chore: finish merge main

* refactor: logger name and unused import

* chore: finish main merge

---------

Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>

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

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

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

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

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

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

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

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

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

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

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

@@ -39,6 +39,7 @@ import { OrganizationsService } from "@/modules/organizations/services/organizat
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
+import { TeamsEventTypesModule } from "@/modules/teams/event-types/teams-event-types.module";
 import { TeamsModule } from "@/modules/teams/teams/teams.module";
 import { UsersModule } from "@/modules/users/users.module";
 import { WebhooksService } from "@/modules/webhooks/services/webhooks.service";
@@ -54,6 +55,7 @@ import { Module } from "@nestjs/common";
     RedisModule,
     EmailModule,
     EventTypesModule_2024_06_14,
+    TeamsEventTypesModule,
     TeamsModule,
   ],
   providers: [

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

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

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

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