Skip to content

Add oneOf to existing fields #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jellejurre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add oneOf to existing fields #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions openapi/components/schemas/NotificationV2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: NotificationV2
type: object
description: ""

Check warning on line 3 in openapi/components/schemas/NotificationV2.yaml

View workflow job for this annotation

GitHub Actions / lint

vrc-description 

Cannot be empty.
properties:
canDelete:
type: boolean
Expand All @@ -10,13 +10,24 @@
type: string
format: date-time
data:
type: object
example:
OneOf:
- {}
- NotificationV2DataBoop
- NotificationV2DataEventAnnouncement
- NotificationV2DataGroupAnnouncement
x-if:
when: jsonschema
then:
oneOf:
- $ref: ./NotificationV2DataBoop.yaml
- $ref: ./NotificationV2DataEventAnnouncement.yaml
- $ref: ./NotificationV2DataGroupAnnouncement.yaml
- type: object
properties: { }
additionalProperties: false

Check warning on line 22 in openapi/components/schemas/NotificationV2.yaml

View workflow job for this annotation

GitHub Actions / lint

vrc-title 

Schema must have a non-empty title.
else:
type: object
example:
OneOf:
- {}
- NotificationV2DataBoop
- NotificationV2DataEventAnnouncement
- NotificationV2DataGroupAnnouncement

Check warning on line 30 in openapi/components/schemas/NotificationV2.yaml

View workflow job for this annotation

GitHub Actions / lint

vrc-title 

Schema must have a non-empty title.
expiresAt:
type: string
format: date-time
Expand Down
9 changes: 8 additions & 1 deletion openapi/components/schemas/ProductListing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,15 @@
products:
type: array
items:
type: object
description: Either a ProductID or a Product, depending on hydration
x-if:
when: jsonschema
then:
oneOf:
- $ref: ./Product.yaml
- $ref: ./ProductID.yaml
else:
type: object

Check warning on line 69 in openapi/components/schemas/ProductListing.yaml

View workflow job for this annotation

GitHub Actions / lint

vrc-title 

Schema must have a non-empty title.
quantifiable:
type: boolean
recurrable:
Expand Down
34 changes: 24 additions & 10 deletions openapi/components/schemas/SentNotification.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,30 @@ properties:
type: string
format: date-time
details:
type: object
example:
OneOf:
- {}
- NotificationDetailBoop
- NotificationDetailInvite
- NotificationDetailInviteResponse
- NotificationDetailRequestInvite
- NotificationDetailRequestInviteResponse
- NotificationDetailVoteToKick
x-if:
when: jsonschema
then:
oneOf:
- $ref: ../schemas/NotificationDetailBoop.yaml
- $ref: ../schemas/NotificationDetailInvite.yaml
- $ref: ../schemas/NotificationDetailInviteResponse.yaml
- $ref: ../schemas/NotificationDetailRequestInvite.yaml
- $ref: ../schemas/NotificationDetailRequestInviteResponse.yaml
- $ref: ../schemas/NotificationDetailVoteToKick.yaml
- type: object
properties: { }
additionalProperties: false
else:
type: object
example:
OneOf:
- {}
- NotificationDetailBoop
- NotificationDetailInvite
- NotificationDetailInviteResponse
- NotificationDetailRequestInvite
- NotificationDetailRequestInviteResponse
- NotificationDetailVoteToKick
id:
type: string
minLength: 1
Expand Down
9 changes: 8 additions & 1 deletion openapi/components/schemas/Transaction.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
title: Transaction
type: object
description: ""

Check warning on line 3 in openapi/components/schemas/Transaction.yaml

View workflow job for this annotation

GitHub Actions / lint

vrc-description 

Cannot be empty.
properties:
agreement:
$ref: ./TransactionAgreement.yaml
x-if:
when: jsonschema
then:
oneOf:
- $ref: ./TransactionAgreement.yaml
- type: string
else:
$ref: ./TransactionAgreement.yaml
created_at:
type: string
format: date-time
Expand Down