chore: Add PR's requested changes

Author: matiasperrone

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Swagger\schemas;
+
+use OpenApi\Attributes as OA;
+
+
+
+#[OA\Schema(
+    schema: 'AdminMember',
+    allOf: [
+        new OA\Schema(ref: '#/components/schemas/Member'),
+        new OA\Schema(
+            type: 'object',
+            properties: [
+                new OA\Property(property: 'email', type: 'string', format: 'email'),
+                new OA\Property(property: 'second_email', type: 'string', format: 'email'),
+                new OA\Property(property: 'third_email', type: 'string', format: 'email'),
+                new OA\Property(property: 'user_external_id', type: 'integer'),
+                new OA\Property(property: 'rsvp', type: 'array', items: new OA\Items(type: 'integer'), description: 'Array of RSVP IDs, full objects available when expand=rsvp'),
+                new OA\Property(property: 'rsvp_invitations', type: 'array', items: new OA\Items(type: 'integer'), description: 'Array of RSVP Invitation IDs, full objects available when expand=rsvp_invitations'),
+            ]
+        )
+    ]
+)]
+class AdminMemberSchema {}

app/Swagger/Models/AdminMemberSchema.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Swagger\schemas;
+
+use OpenApi\Attributes as OA;
+
+
+#[OA\Schema(
+    schema: 'SummitAbstractLocation',
+    type: 'object',
+    properties: [
+        new OA\Property(property: 'id', type: 'integer', example: 1),
+        new OA\Property(property: 'created', type: 'integer', example: 1),
+        new OA\Property(property: 'last_edited', type: 'integer', example: 1),
+        new OA\Property(property: 'name', type: 'string'),
+        new OA\Property(property: 'short_name', type: 'string'),
+        new OA\Property(property: 'description', type: 'string'),
+        new OA\Property(property: 'location_type', type: 'string'),
+        new OA\Property(property: 'order', type: 'integer'),
+        new OA\Property(property: 'opening_hour', type: 'integer'),
+        new OA\Property(property: 'closing_hour', type: 'integer'),
+        new OA\Property(property: 'class_name', type: 'string'),
+        new OA\Property(property: 'published_events', type: 'array', items: new OA\Items(type: 'integer'), description: 'Array of published event IDs'),
+    ]
+)]
+class SummitAbstractLocationSchema
+{
+}

app/Swagger/Models/SummitAbstractLocationSchema.php

@@ -1,12 +1,11 @@
-<?php 
-namespace App\Swagger\schemas;
+<?php
 
+namespace App\Swagger\schemas;
 
 use App\Security\SummitScopes;
 use OpenApi\Attributes as OA;
 
-#[
-    OA\SecurityScheme(
+#[OA\SecurityScheme(
         type: 'oauth2',
         securityScheme: 'summit_track_chairs_oauth2',
         flows: [
@@ -23,4 +22,4 @@
         ],
     )
 ]
-class TrackChairsAuthSchema{}
+class TrackChairsAuthSchema{}

…ger/Security/SummitTrackChairSchemas.php …agger/Security/TrackChairsAuthSchema.phpapp/Swagger/Security/SummitTrackChairSchemas.php renamed to app/Swagger/Security/TrackChairsAuthSchema.php app/Swagger/Security/SummitTrackChairSchemas.php renamed to app/Swagger/Security/TrackChairsAuthSchema.php

@@ -10,14 +10,16 @@
         new OA\Property(property: "id", type: "integer", example: 1),
         new OA\Property(property: "created", type: "integer", description: "Unix timestamp", example: 1640995200),
         new OA\Property(property: "last_edited", type: "integer", description: "Unix timestamp", example: 1640995200),
-        new OA\Property(property: "allowed_timeframes", type: "array", items: new OA\Items(type: "integer"), description: "Array SummitProposedScheduleAllowedDay IDs or full SummitProposedScheduleAllowedDay objects when expanded", nullable: true),
+        new OA\Property(property: "allowed_timeframes", type: "array", items: new OA\Items(oneOf: [
+            new OA\Schema(type: 'integer'),
+            new OA\Schema(ref: '#/components/schemas/SummitProposedScheduleAllowedDay')
+        ]), description: "Array of allowed timeframe IDs or objects when expand=allowed_timeframes",),
         new OA\Property(property: "location_id", type: "integer", example: 10, description: "only when not expanded"),
-        new OA\Property(property: "location", type: "integer", description: "ID of the SummitAbstractLocation, when not expanded, when ?expand=location, you get a SummitAbstractLocation schema object in a 'location' property"),
-        new OA\Property(property: "track_id", type: "integer", example: 5, description: "only when not expanded"),
-        new OA\Property(property: "track", type: "integer", description: "ID of the PresentationCategory, when not expanded, when ?expand=track, you get a PresentationCategory schema object in a 'track' property"),
+        new OA\Property(property: "location", ref: '#/components/schemas/SummitAbstractLocation', description: "only when expand=location"),
+        new OA\Property(property: "track_id", type: "integer", example: 5, description: "PresentationCategory ID, use expand=track for full object details"),
     ],
 )]
-class SummitProposedScheduleAllowedLocation {}
+class SummitProposedScheduleAllowedLocationSchema {}
 
 #[OA\Schema(
     schema: "SummitProposedScheduleAllowedLocationRequest",
@@ -26,7 +28,7 @@ class SummitProposedScheduleAllowedLocation {}
         new OA\Property(property: "location_id", type: "integer", example: 10)
     ]
 )]
-class SummitProposedScheduleAllowedLocationRequest {}
+class SummitProposedScheduleAllowedLocationRequestSchema {}
 
 #[OA\Schema(
     schema: "SummitProposedScheduleAllowedDay",
@@ -40,7 +42,7 @@ class SummitProposedScheduleAllowedLocationRequest {}
         new OA\Property(property: "closing_hour", type: "integer", description: "Closing hour in HHMM format (0-2359)", example: 1700)
     ]
 )]
-class SummitProposedScheduleAllowedDay {}
+class SummitProposedScheduleAllowedDaySchema {}
 
 #[OA\Schema(
     schema: "SummitProposedScheduleAllowedDayAddRequest",
@@ -51,7 +53,7 @@ class SummitProposedScheduleAllowedDay {}
         new OA\Property(property: "closing_hour", type: "integer", description: "Closing hour in HHMM format (0-2359)", example: 1700)
     ]
 )]
-class SummitProposedScheduleAllowedDayAddRequest {}
+class SummitProposedScheduleAllowedDayAddRequestSchema {}
 
 #[OA\Schema(
     schema: "SummitProposedScheduleAllowedDayUpdateRequest",
@@ -61,7 +63,7 @@ class SummitProposedScheduleAllowedDayAddRequest {}
         new OA\Property(property: "closing_hour", type: "integer", description: "Closing hour in HHMM format (0-2359)", example: 1700)
     ]
 )]
-class SummitProposedScheduleAllowedDayUpdateRequest {}
+class SummitProposedScheduleAllowedDayUpdateRequestSchema {}
 #[OA\Schema(
     schema: "SummitProposedScheduleSummitEvent",
     properties: [

app/Swagger/SummitProposedScheduleSchemas.php

@@ -14,17 +14,15 @@
         new OA\Property(property: 'created', type: 'integer', description: 'Unix timestamp'),
         new OA\Property(property: 'last_edited', type: 'integer', description: 'Unix timestamp'),
         new OA\Property(
-            property: 'categories', 
-            type: 'array', 
-            items: new OA\Items(type: ['integer', 'PresentationCategory']), 
-            description: 'Array of category IDs by default. Use expand=categories to get full objects. Use relations=categories to include'
+            property: 'categories',
+            type: 'array',
+            items: new OA\Items(type: 'integer'),
+            description: "Array of PresentationCategory ID, Use expand=categories to get full objects"
         ),
-    ],
-    anyOf: [
         new OA\Property(property: 'summit_id', type: 'integer', example: 10, description: 'Summit ID when not expanded'),
-        new OA\Property(property: 'summit', type: 'Summit', description: 'Full Summit object when expanded (expand=summit)'),
+        new OA\Property(property: 'summit', ref: '#/components/schemas/Summit', description: 'Full Summit object when expanded (expand=summit)'),
         new OA\Property(property: 'member_id', type: 'integer', example: 123, description: 'Member ID when not expanded'),
-        new OA\Property(property: 'member', type: 'Member', description: 'Full Member object (without email) when expanded (expand=member)'),
+        new OA\Property(property: 'member', ref: '#/components/schemas/Member', description: 'Full Member object (without email) when expanded (expand=member)'),
     ]
 )]
 class SummitTrackChairSchema {}
@@ -39,17 +37,15 @@ class SummitTrackChairSchema {}
         new OA\Property(property: 'created', type: 'integer', description: 'Unix timestamp'),
         new OA\Property(property: 'last_edited', type: 'integer', description: 'Unix timestamp'),
         new OA\Property(
-            property: 'categories', 
-            type: 'array', 
-            items: new OA\Items(type: ['integer', 'PresentationCategory']), 
-            description: 'Array of category IDs by default. Use expand=categories to get full objects. Use relations=categories to include'
+            property: 'categories',
+            type: 'array',
+            items: new OA\Items(type: 'integer'),
+            description: "Array of PresentationCategory ID, Use expand=categories to get full objects"
         ),
-    ],
-    anyOf: [
         new OA\Property(property: 'summit_id', type: 'integer', example: 10, description: 'Summit ID when not expanded'),
-        new OA\Property(property: 'summit', type: 'Summit', description: 'Full Summit object when expanded (expand=summit)'),
+        new OA\Property(property: 'summit', ref: '#/components/schemas/Summit', description: 'Full Summit object when expanded (expand=summit)'),
         new OA\Property(property: 'member_id', type: 'integer', example: 123, description: 'Member ID when not expanded'),
-        new OA\Property(property: 'member', type: 'AdminMember', description: 'Full Member object (WITH email) when expanded (expand=member)'),
+        new OA\Property(property: 'member', ref: '#/components/schemas/AdminMember', description: 'Full Member object (WITH email) when expanded (expand=member)'),
     ]
 )]
 class AdminSummitTrackChairSchema {}

app/Swagger/SummitTrackChairSchemas.php

@@ -9,6 +9,7 @@
 use App\Security\SummitScopes;
 use models\summit\RSVP;
 use OpenApi\Attributes as OA;
+use function Laravel\Prompts\form;
 
 #[OA\Schema(
     schema: 'Owner',
@@ -773,4 +774,4 @@ class PaymentGatewayProfileUpdateRequestSchema
 )]
 class PaginatedUserStoriesResponseSchema
 {
-}
+}