Skip to content

Commit ba62c96

Browse files
committed
fix: merge conflict
Signed-off-by: Matias Perrone <github@matiasperrone.com>
1 parent 56ed9f5 commit ba62c96

File tree

1 file changed

+0
-172
lines changed

1 file changed

+0
-172
lines changed

app/Swagger/SummitPresentationSchemas.php

Lines changed: 0 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -177,178 +177,6 @@ class SummitSelectedPresentationList {}
177177
)]
178178
class SummitSelectedPresentationListReorderRequest {}
179179

180-
181-
#[OA\Schema(
182-
schema: "SummitSelectedPresentationList",
183-
properties: [
184-
new OA\Property(property: "id", type: "integer", example: 1),
185-
new OA\Property(property: "created", type: "integer", description: "Unix timestamp", example: 1640995200),
186-
new OA\Property(property: "last_edited", type: "integer", description: "Unix timestamp", example: 1640995200),
187-
new OA\Property(property: "name", type: "string", example: "My Selection List"),
188-
new OA\Property(property: "type", type: "string", enum: ["Individual", "Group"], example: "Individual"),
189-
new OA\Property(property: "hash", type: "string", example: "abc123def456"),
190-
new OA\Property(property: "selected_presentations", type: "array", items: new OA\Items(type: "integer"), description: "Array of selected presentation IDs"),
191-
new OA\Property(property: "interested_presentations", type: "array", items: new OA\Items(type: "integer"), description: "Array of interested presentation IDs (only for Individual lists)", nullable: true),
192-
],
193-
anyOf: [
194-
new OA\Property(property: "category_id", type: "integer", example: 5),
195-
new OA\Property(property: "category", ref: "#/components/schemas/PresentationCategory"),
196-
new OA\Property(property: "owner_id", type: "integer", example: 10),
197-
new OA\Property(property: "owner", ref: "#/components/schemas/Member"),
198-
new OA\Property(property: "selection_plan_id", type: "integer", example: 3),
199-
new OA\Property(property: "selection_plan", ref: "#/components/schemas/SelectionPlan"),
200-
]
201-
)]
202-
class SummitSelectedPresentationList {}
203-
204-
#[OA\Schema(
205-
schema: "SummitSelectedPresentationListReorderRequest",
206-
required: ["collection"],
207-
properties: [
208-
new OA\Property(property: "hash", type: "string", nullable: true, example: "abc123def456"),
209-
new OA\Property(property: "collection", type: "string", enum: ["selected", "maybe"], example: "selected"),
210-
new OA\Property(property: "presentations", type: "array", items: new OA\Items(type: "integer"), description: "Array of presentation IDs in the desired order", nullable: true),
211-
]
212-
)]
213-
class SummitSelectedPresentationListReorderRequest {}
214-
215-
216-
// Summit Speaker Assistance Schemas
217-
218-
#[OA\Schema(
219-
schema: "PresentationSpeakerSummitAssistanceConfirmationRequest",
220-
type: "object",
221-
properties: [
222-
new OA\Property(property: "id", type: "integer", example: 1),
223-
new OA\Property(property: "created", type: "integer", description: "Unix timestamp", example: 1640995200),
224-
new OA\Property(property: "last_edited", type: "integer", description: "Unix timestamp", example: 1640995200),
225-
new OA\Property(property: "on_site_phone", type: "string", nullable: true),
226-
new OA\Property(property: "registered", type: "boolean"),
227-
new OA\Property(property: "is_confirmed", type: "boolean"),
228-
new OA\Property(property: "checked_in", type: "boolean"),
229-
new OA\Property(property: "summit_id", type: "integer"),
230-
new OA\Property(property: "speaker_email", type: "string"),
231-
new OA\Property(property: "speaker_full_name", type: "string"),
232-
new OA\Property(property: "speaker_id", type: "integer", description: "PresentationSpeaker Id, full object available in 'speaker' expand (speaker field)"),
233-
new OA\Property(property: "confirmation_date", type: "integer", nullable: true),
234-
]
235-
)]
236-
class PresentationSpeakerSummitAssistanceConfirmationRequest
237-
{
238-
}
239-
240-
#[OA\Schema(
241-
schema: "PaginatedPresentationSpeakerSummitAssistanceConfirmationRequestsResponse",
242-
allOf: [
243-
new OA\Schema(ref: "#/components/schemas/PaginateDataSchemaResponse"),
244-
new OA\Schema(
245-
properties: [
246-
new OA\Property(
247-
property: "data",
248-
type: "array",
249-
items: new OA\Items(ref: "#/components/schemas/PresentationSpeakerSummitAssistanceConfirmationRequest")
250-
)
251-
]
252-
)
253-
]
254-
)]
255-
class PaginatedPresentationSpeakerSummitAssistanceConfirmationRequestsResponse
256-
{
257-
}
258-
259-
#[OA\Schema(
260-
schema: "PresentationSpeakerSummitAssistanceConfirmationRequestCreateRequest",
261-
type: "object",
262-
required: ["speaker_id"],
263-
properties: [
264-
new OA\Property(property: "speaker_id", type: "integer"),
265-
new OA\Property(property: "on_site_phone", type: "string", maxLength: 50),
266-
new OA\Property(property: "registered", type: "boolean"),
267-
new OA\Property(property: "is_confirmed", type: "boolean"),
268-
new OA\Property(property: "checked_in", type: "boolean")
269-
]
270-
)]
271-
class PresentationSpeakerSummitAssistanceConfirmationRequestCreateRequest
272-
{
273-
}
274-
275-
#[OA\Schema(
276-
schema: "PresentationSpeakerSummitAssistanceConfirmationRequestUpdateRequest",
277-
type: "object",
278-
properties: [
279-
new OA\Property(property: "on_site_phone", type: "string", maxLength: 50),
280-
new OA\Property(property: "registered", type: "boolean"),
281-
new OA\Property(property: "is_confirmed", type: "boolean"),
282-
new OA\Property(property: "checked_in", type: "boolean")
283-
]
284-
)]
285-
class PresentationSpeakerSummitAssistanceConfirmationRequestUpdateRequest
286-
{
287-
}
288-
289-
//
290-
291-
#[OA\Schema(
292-
schema: 'PresentationActionType',
293-
type: 'object',
294-
properties: [
295-
new OA\Property(property: 'id', type: 'integer', example: 1),
296-
new OA\Property(property: 'created', type: 'integer', example: 1630500518),
297-
new OA\Property(property: 'last_edited', type: 'integer', example: 1630500518),
298-
new OA\Property(property: 'label', type: 'string', example: 'Review'),
299-
new OA\Property(property: 'summit_id', type: 'integer', example: 42, description: 'Summit ID, add ?expand=summit to get full summit object'),
300-
new OA\Property(property: 'order', type: 'integer', example: 1, description: 'Order within a selection plan. Only present when filtering by selection_plan_id', ),
301-
]
302-
)]
303-
class PresentationActionTypeSchema
304-
{
305-
}
306-
307-
#[OA\Schema(
308-
schema: 'PaginatedPresentationActionTypesResponse',
309-
allOf: [
310-
new OA\Schema(ref: '#/components/schemas/PaginateDataSchemaResponse'),
311-
new OA\Schema(
312-
type: 'object',
313-
properties: [
314-
new OA\Property(
315-
property: 'data',
316-
type: 'array',
317-
items: new OA\Items(ref: '#/components/schemas/PresentationActionType')
318-
)
319-
]
320-
)
321-
]
322-
)]
323-
class PaginatedPresentationActionTypesResponseSchema
324-
{
325-
}
326-
327-
#[OA\Schema(
328-
schema: 'PresentationActionTypeCreateRequest',
329-
type: 'object',
330-
required: ['label'],
331-
properties: [
332-
new OA\Property(property: 'label', type: 'string', example: 'Review', maxLength: 255),
333-
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'),
334-
]
335-
)]
336-
class PresentationActionTypeCreateRequestSchema
337-
{
338-
}
339-
340-
#[OA\Schema(
341-
schema: 'PresentationActionTypeUpdateRequest',
342-
type: 'object',
343-
properties: [
344-
new OA\Property(property: 'label', type: 'string', example: 'Review', maxLength: 255),
345-
]
346-
)]
347-
class PresentationActionTypeUpdateRequestSchema
348-
{
349-
}
350-
351-
352180
// Summit Speaker Assistance Schemas
353181

354182
#[OA\Schema(

0 commit comments

Comments
 (0)