Skip to content

Commit d111df8

Browse files
committed
fix: merge conflicts and repeated operationId
Signed-off-by: Matias Perrone <github@matiasperrone.com>
1 parent 9149482 commit d111df8

3 files changed

Lines changed: 7 additions & 57 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function __construct
7777
#[OA\Get(
7878
path: '/api/v1/summits/{id}/sponsorships-types',
7979
summary: 'Get all sponsorship types for a summit',
80-
operationId: 'getAllSponsorshipTypes',
80+
operationId: 'getSummitAllSponsorshipTypes',
8181
x: [
8282
'required-groups' => [
8383
IGroup::SuperAdmins,
@@ -122,7 +122,7 @@ public function getAllBySummit($summit_id)
122122
#[OA\Post(
123123
path: '/api/v1/summits/{id}/sponsorships-types',
124124
summary: 'Create a new sponsorship type',
125-
operationId: 'createSponsorshipType',
125+
operationId: 'createSummitSponsorshipType',
126126
x: [
127127
'required-groups' => [
128128
IGroup::SuperAdmins,
@@ -167,7 +167,7 @@ public function add($summit_id)
167167
#[OA\Get(
168168
path: '/api/v1/summits/{id}/sponsorships-types/{type_id}',
169169
summary: 'Get a sponsorship type by ID',
170-
operationId: 'getSponsorshipType',
170+
operationId: 'getSummitSponsorshipType',
171171
x: [
172172
'required-groups' => [
173173
IGroup::SuperAdmins,
@@ -209,7 +209,7 @@ public function get($summit_id, $type_id)
209209
#[OA\Put(
210210
path: '/api/v1/summits/{id}/sponsorships-types/{type_id}',
211211
summary: 'Update a sponsorship type',
212-
operationId: 'updateSponsorshipType',
212+
operationId: 'updateSummitSponsorshipType',
213213
x: [
214214
'required-groups' => [
215215
IGroup::SuperAdmins,
@@ -255,7 +255,7 @@ public function update($summit_id, $type_id)
255255
#[OA\Delete(
256256
path: '/api/v1/summits/{id}/sponsorships-types/{type_id}',
257257
summary: 'Delete a sponsorship type',
258-
operationId: 'deleteSponsorshipType',
258+
operationId: 'deleteSummitSponsorshipType',
259259
x: [
260260
'required-groups' => [
261261
IGroup::SuperAdmins,
@@ -407,7 +407,7 @@ protected function updateChild(Summit $summit, int $child_id, array $payload): I
407407
#[OA\Post(
408408
path: '/api/v1/summits/{id}/sponsorships-types/{type_id}/badge-image',
409409
summary: 'Upload a badge image for a sponsorship type',
410-
operationId: 'addSponsorshipTypeBadgeImage',
410+
operationId: 'addSummitSponsorshipTypeBadgeImage',
411411
x: [
412412
'required-groups' => [
413413
IGroup::SuperAdmins,
@@ -494,7 +494,7 @@ public function addBadgeImage(LaravelRequest $request, $summit_id, $type_id)
494494
#[OA\Delete(
495495
path: '/api/v1/summits/{id}/sponsorships-types/{type_id}/badge-image',
496496
summary: 'Remove the badge image from a sponsorship type',
497-
operationId: 'deleteSponsorshipTypeBadgeImage',
497+
operationId: 'deleteSummitSponsorshipTypeBadgeImage',
498498
x: [
499499
'required-groups' => [
500500
IGroup::SuperAdmins,

app/Swagger/SummitSchemas.php

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -343,30 +343,6 @@ class SummitAttendeeBadgeSchema
343343
)]
344344
class PaginatedSummitAttendeeBadgesResponseSchema {}
345345

346-
#[OA\Schema(
347-
schema: 'SummitSponsorshipType',
348-
type: 'object',
349-
properties: [
350-
new OA\Property(property: 'id', type: 'integer', example: 1),
351-
new OA\Property(property: 'widget_title', type: 'string', example: 'Platinum Sponsors', nullable: true),
352-
new OA\Property(property: 'lobby_template', type: 'string', example: 'big-header', nullable: true),
353-
new OA\Property(property: 'expo_hall_template', type: 'string', example: 'big-images', nullable: true),
354-
new OA\Property(property: 'sponsor_page_template', type: 'string', example: 'big-header', nullable: true),
355-
new OA\Property(property: 'event_page_template', type: 'string', example: 'big-header', nullable: true),
356-
new OA\Property(property: 'sponsor_page_use_disqus_widget', type: 'boolean', example: true),
357-
new OA\Property(property: 'sponsor_page_use_live_event_widget', type: 'boolean', example: true),
358-
new OA\Property(property: 'sponsor_page_use_schedule_widget', type: 'boolean', example: true),
359-
new OA\Property(property: 'sponsor_page_use_banner_widget', type: 'boolean', example: true),
360-
new OA\Property(property: 'badge_image', type: 'string', example: 'https://example.com/badge.png', nullable: true),
361-
new OA\Property(property: 'badge_image_alt_text', type: 'string', example: 'Platinum Badge', nullable: true),
362-
new OA\Property(property: 'order', type: 'integer', example: 1),
363-
new OA\Property(property: 'should_display_on_expo_hall_page', type: 'boolean', example: true),
364-
new OA\Property(property: 'should_display_on_lobby_page', type: 'boolean', example: true),
365-
new OA\Property(property: 'summit', type: 'Summit'),
366-
new OA\Property(property: 'type', type: 'SponsorshipType'),
367-
]
368-
)]
369-
class SummitSponsorshipTypeSchema {}
370346

371347
#[OA\Schema(
372348
schema: 'PaginatedSummitSponsorshipTypesResponse',

app/Swagger/SummitSponsorshipSchemas.php

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -79,29 +79,3 @@ class AddAddOnRequestSchema {}
7979
]
8080
)]
8181
class UpdateAddOnRequestSchema {}
82-
83-
#[OA\Schema(
84-
title: "Summit Sponsorship Type",
85-
description: "Summit Sponsorship Type Schema",
86-
type: "object",
87-
properties: [
88-
new OA\Property(property: "id", type: "integer", format: "int64"),
89-
new OA\Property(property: "widget_title", type: "string"),
90-
new OA\Property(property: "lobby_template", type: "string"),
91-
new OA\Property(property: "expo_hall_template", type: "string"),
92-
new OA\Property(property: "sponsor_page_template", type: "string"),
93-
new OA\Property(property: "event_page_template", type: "string"),
94-
new OA\Property(property: "sponsor_page_use_disqus_widget", type: "boolean"),
95-
new OA\Property(property: "sponsor_page_use_live_event_widget", type: "boolean"),
96-
new OA\Property(property: "sponsor_page_use_schedule_widget", type: "boolean"),
97-
new OA\Property(property: "sponsor_page_use_banner_widget", type: "boolean"),
98-
new OA\Property(property: "type_id", type: "integer", format: "int64"),
99-
new OA\Property(property: "badge_image", type: "string"),
100-
new OA\Property(property: "badge_image_alt_text", type: "string"),
101-
new OA\Property(property: "summit_id", type: "integer", format: "int64"),
102-
new OA\Property(property: "order", type: "integer", format: "int32"),
103-
new OA\Property(property: "should_display_on_expo_hall_page", type: "boolean"),
104-
new OA\Property(property: "should_display_on_lobby_page", type: "boolean"),
105-
]
106-
)]
107-
class SummitSponsorshipTypeSchemas {}

0 commit comments

Comments
 (0)