resolve merge conflicts

calcom · Dec 17, 2024 · e0c5146 · e0c5146
1 parent 0b3df44
commit e0c5146
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 89 deletions.
diff --git a/apps/api/v2/swagger/documentation.json b/apps/api/v2/swagger/documentation.json
@@ -10884,41 +10884,6 @@
           "name"
         ]
       },
-      "EventTypeTeam": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "number"
-          },
-          "slug": {
-            "type": "string"
-          },
-          "bannerUrl": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "logoUrl": {
-            "type": "string"
-          },
-          "weekStart": {
-            "type": "string"
-          },
-          "brandColor": {
-            "type": "string"
-          },
-          "darkBrandColor": {
-            "type": "string"
-          },
-          "theme": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "id"
-        ]
-      },
       "TeamEventTypeOutput_2024_06_14": {
         "type": "object",
         "properties": {
@@ -11196,9 +11161,6 @@
               "COLLECTIVE",
               "MANAGED"
             ]
-          },
-          "team": {
-            "$ref": "#/components/schemas/EventTypeTeam"
           }
         },
         "required": [
@@ -11219,10 +11181,8 @@
           "successRedirectUrl",
           "isInstantEvent",
           "scheduleId",
-          "teamId",
           "hosts",
-          "schedulingType",
-          "team"
+          "schedulingType"
         ]
       },
       "GetTeamEventTypeOutput": {

diff --git a/docs/api-reference/v2/openapi.json b/docs/api-reference/v2/openapi.json
@@ -9919,39 +9919,6 @@
         },
         "required": ["userId", "name"]
       },
-      "EventTypeTeam": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "number"
-          },
-          "slug": {
-            "type": "string"
-          },
-          "bannerUrl": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "logoUrl": {
-            "type": "string"
-          },
-          "weekStart": {
-            "type": "string"
-          },
-          "brandColor": {
-            "type": "string"
-          },
-          "darkBrandColor": {
-            "type": "string"
-          },
-          "theme": {
-            "type": "string"
-          }
-        },
-        "required": ["id"]
-      },
       "TeamEventTypeOutput_2024_06_14": {
         "type": "object",
         "properties": {
@@ -10221,9 +10188,6 @@
             "type": "string",
             "nullable": true,
             "enum": ["ROUND_ROBIN", "COLLECTIVE", "MANAGED"]
-          },
-          "team": {
-            "$ref": "#/components/schemas/EventTypeTeam"
           }
         },
         "required": [
@@ -10244,10 +10208,8 @@
           "successRedirectUrl",
           "isInstantEvent",
           "scheduleId",
-          "teamId",
           "hosts",
-          "schedulingType",
-          "team"
+          "schedulingType"
         ]
       },
       "GetTeamEventTypeOutput": {

diff --git a/packages/platform/types/event-types/event-types_2024_06_14/outputs/event-type.output.ts b/packages/platform/types/event-types/event-types_2024_06_14/outputs/event-type.output.ts
@@ -1,4 +1,9 @@
-import { ApiProperty as DocsProperty, ApiExtraModels, getSchemaPath } from "@nestjs/swagger";
+import {
+  ApiProperty as DocsProperty,
+  ApiPropertyOptional,
+  ApiExtraModels,
+  getSchemaPath,
+} from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   ArrayNotEmpty,
@@ -427,9 +432,9 @@ export class EventTypeOutput_2024_06_14 extends BaseEventTypeOutput_2024_06_14 {
 }
 
 export class TeamEventTypeOutput_2024_06_14 extends BaseEventTypeOutput_2024_06_14 {
-  @IsInt()
-  @DocsProperty()
-  teamId!: number;
+  @IsOptional()
+  @ApiPropertyOptional({ nullable: true })
+  teamId?: number | null;
 
   @IsInt()
   @IsOptional()
@@ -463,9 +468,4 @@ export class TeamEventTypeOutput_2024_06_14 extends BaseEventTypeOutput_2024_06_
   @IsBoolean()
   @DocsProperty()
   hideCalendarEventDetails?: boolean;
-
-  @ValidateNested()
-  @Type(() => EventTypeTeam)
-  @DocsProperty()
-  team!: EventTypeTeam;
 }