Skip to content
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

EM-1528: update the JSON-schema to allow an optional 'focus' #254

Merged
merged 5 commits into from
Jan 23, 2025
Merged

EM-1528: update the JSON-schema to allow an optional 'focus' #254

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc9a303
EM-1528: update the JSON-schema to allow an optional 'focus' field wi…
johnmarston-nhs Dec 18, 2024
24ed8ad
EM-1528: fix an schema format - 'items' cannot be a list.
johnmarston-nhs Dec 23, 2024
9741dfe
EM-1528: remove dataref from the required field list in the schema.
johnmarston-nhs Dec 30, 2024
e604cd2
EM-1528: Merge branch 'master' into em-1528-dataref-optional
johnmarston-nhs Jan 9, 2025
c066b55
EM-1528: Merge branch 'master' into em-1528-dataref-optional
johnmarston-nhs Jan 23, 2025
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
61 changes: 30 additions & 31 deletions signal-schemas/fhirsignal.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,8 @@
},
"part": {
"type": "array",
"minItems": 3,
"minItems": 2,
"maxItems": 3,
"items": false,
"prefixItems": [
{
"type": "object",
Expand Down Expand Up @@ -201,36 +200,36 @@
"name",
"valueInstant"
]
},
{
"type": "object",
"description": "Resource on an API of the publishing service to retrieve full details of the event (or subject record)",
"properties": {
"name": {
"const": "focus"
},
"valueReference": {
"type": "object",
"properties": {
"reference": {
"type": "string",
"format": "uri",
"examples": [
"https://api.service.nhs.uk/register-with-a-gp-surgery/applications/bd468854-4cd5-4e57-9dde-e5a482d50605"
]
}
},
"required": [
"reference"
]
}
},
"required": [
"name",
"valueReference"
]
}
]
],
"items": {
"type": "object",
"description": "Resource on an API of the publishing service to retrieve full details of the event (or subject record)",
"properties": {
"name": {
"const": "focus"
},
"valueReference": {
"type": "object",
"properties": {
"reference": {
"type": "string",
"format": "uri",
"examples": [
"https://api.service.nhs.uk/register-with-a-gp-surgery/applications/bd468854-4cd5-4e57-9dde-e5a482d50605"
]
}
},
"required": [
"reference"
]
}
},
"required": [
"name",
"valueReference"
]
}
}
},
"required": [
Expand Down
36 changes: 18 additions & 18 deletions signal-schemas/fhirsignal.schema.json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,8 @@ $defs:
const: notification-event
part:
type: array
minItems: 3
minItems: 2
maxItems: 3
items: false
prefixItems:
- type: object
description: Note this is a fixed value
Expand All @@ -141,24 +140,25 @@ $defs:
required:
- name
- valueInstant
- type: object
description: Resource on an API of the publishing service to retrieve full details of the event (or subject record)
items:
type: object
description: Resource on an API of the publishing service to retrieve full details of the event (or subject record)
properties:
name:
const: focus
valueReference:
type: object
properties:
name:
const: focus
valueReference:
type: object
properties:
reference:
type: string
format: uri
examples:
- 'https://api.service.nhs.uk/register-with-a-gp-surgery/applications/bd468854-4cd5-4e57-9dde-e5a482d50605'
required:
- reference
reference:
type: string
format: uri
examples:
- 'https://api.service.nhs.uk/register-with-a-gp-surgery/applications/bd468854-4cd5-4e57-9dde-e5a482d50605'
required:
- name
- valueReference
- reference
required:
- name
- valueReference
required:
- name
- part
Expand Down
1 change: 0 additions & 1 deletion specification/components/schemas/cloudevents/baseMnsCloudEventSignal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ required:
- specversion
- type
- time
- dataref
example:
specversion: '1.0'
id: 236a1d4a-5d69-4fa9-9c7f-e72bf505aa5b
Expand Down
1 change: 0 additions & 1 deletion specification/components/schemas/cloudevents/gpregChangeGpRequestSignal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ required:
- specversion
- type
- time
- dataref
- subject
definitions:
iddef:
Expand Down
1 change: 0 additions & 1 deletion specification/components/schemas/cloudevents/patientflagsChangeSignal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ required:
- specversion
- type
- time
- dataref
- subject
definitions:
iddef:
Expand Down
Loading