chore: change HTTP code 200 to constant and fix merge conflicts

Signed-off-by: Matias Perrone <github@matiasperrone.com>

Author: matiasperrone

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSpeakersAssistanceApiController.php

@@ -135,7 +135,7 @@ public function __construct
         ],
         responses: [
             new OA\Response(
-                response: 200,
+                response: Response::HTTP_OK,
                 description: "OK",
                 content: new OA\JsonContent(ref: "#/components/schemas/PaginatedPresentationSpeakerSummitAssistanceConfirmationRequestsResponse")
             ),
@@ -263,7 +263,7 @@ public function getBySummit($summit_id)
         ],
         responses: [
             new OA\Response(
-                response: 200,
+                response: Response::HTTP_OK,
                 description: "OK",
                 content: new OA\MediaType(mediaType: "text/csv", schema: new OA\Schema(type: "string"))
             ),
@@ -375,7 +375,7 @@ public function getBySummitCSV($summit_id){
         ),
         responses: [
             new OA\Response(
-                response: 201,
+                response: Response::HTTP_CREATED,
                 description: "Created",
                 content: new OA\JsonContent(ref: "#/components/schemas/PresentationSpeakerSummitAssistanceConfirmationRequest")
             ),
@@ -473,7 +473,7 @@ public function addSpeakerSummitAssistance($summit_id)
         ),
         responses: [
             new OA\Response(
-                response: 200,
+                response: Response::HTTP_OK,
                 description: "OK",
                 content: new OA\JsonContent(ref: "#/components/schemas/PresentationSpeakerSummitAssistanceConfirmationRequest")
             ),
@@ -563,7 +563,7 @@ public function updateSpeakerSummitAssistance($summit_id, $assistance_id)
             )
         ],
         responses: [
-            new OA\Response(response: 204, description: "No Content"),
+            new OA\Response(response: Response::HTTP_NO_CONTENT, description: "No Content"),
             new OA\Response(response: Response::HTTP_UNAUTHORIZED, description: "Unauthorized"),
             new OA\Response(response: Response::HTTP_FORBIDDEN, description: "Forbidden"),
             new OA\Response(response: Response::HTTP_NOT_FOUND, description: "Not Found"),
@@ -632,7 +632,7 @@ public function deleteSpeakerSummitAssistance($summit_id, $assistance_id)
         ],
         responses: [
             new OA\Response(
-                response: 200,
+                response: Response::HTTP_OK,
                 description: "OK",
                 content: new OA\JsonContent(ref: "#/components/schemas/PresentationSpeakerSummitAssistanceConfirmationRequest")
             ),
@@ -673,4 +673,4 @@ public function getSpeakerSummitAssistanceBySummit($summit_id, $assistance_id)
         }
     }
 
-}
+}

app/Swagger/SummitPresentationSchemas.php

@@ -280,64 +280,4 @@ class PresentationActionTypeCreateRequestSchema
 )]
 class PresentationActionTypeUpdateRequestSchema
 {
-}
-
-#[OA\Schema(
-    schema: 'PresentationActionType',
-    type: 'object',
-    properties: [
-        new OA\Property(property: 'id', type: 'integer', example: 1),
-        new OA\Property(property: 'created', type: 'integer', example: 1630500518),
-        new OA\Property(property: 'last_edited', type: 'integer', example: 1630500518),
-        new OA\Property(property: 'label', type: 'string', example: 'Review'),
-        new OA\Property(property: 'summit_id', type: 'integer', example: 42, description: 'Summit ID, add ?expand=summit to get full summit object'),
-        new OA\Property(property: 'order', type: 'integer', example: 1, description: 'Order within a selection plan. Only present when filtering by selection_plan_id', ),
-    ]
-)]
-class PresentationActionTypeSchema
-{
-}
-
-#[OA\Schema(
-    schema: 'PaginatedPresentationActionTypesResponse',
-    allOf: [
-        new OA\Schema(ref: '#/components/schemas/PaginateDataSchemaResponse'),
-        new OA\Schema(
-            type: 'object',
-            properties: [
-                new OA\Property(
-                    property: 'data',
-                    type: 'array',
-                    items: new OA\Items(ref: '#/components/schemas/PresentationActionType')
-                )
-            ]
-        )
-    ]
-)]
-class PaginatedPresentationActionTypesResponseSchema
-{
-}
-
-#[OA\Schema(
-    schema: 'PresentationActionTypeCreateRequest',
-    type: 'object',
-    required: ['label'],
-    properties: [
-        new OA\Property(property: 'label', type: 'string', example: 'Review', maxLength: 255),
-        new OA\Property(property: 'selection_plan_id', type: 'integer', example: 42, description: 'If provided, the order field will be set within the context of the selection plan'),
-    ]
-)]
-class PresentationActionTypeCreateRequestSchema
-{
-}
-
-#[OA\Schema(
-    schema: 'PresentationActionTypeUpdateRequest',
-    type: 'object',
-    properties: [
-        new OA\Property(property: 'label', type: 'string', example: 'Review', maxLength: 255),
-    ]
-)]
-class PresentationActionTypeUpdateRequestSchema
-{
-}
+}