Skip to content

Schema fixes nov 2022 #15

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

Draft
pieterbos wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Schema fixes nov 2022 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b91276
Changes after updating BMMs to the latest version
pieterbos Nov 23, 2022
a4331c1
Add missing entry points to json schema
pieterbos Nov 23, 2022
e2d3d05
Remove property attribute from DV_QUANTITY
pieterbos Nov 23, 2022
b7ded78
Fix hash-references in json schema
pieterbos Nov 24, 2022
194cc47
Remove two now unused types in BASE
pieterbos Nov 24, 2022
517700d
Make DV_URI/DV_EHR_URI.value required
pieterbos Nov 24, 2022
163ccfc
Replace the URI class with a string formatted as uri-reference
pieterbos Nov 24, 2022
8dae555
Fix EXTRACT_ENTITY_MANIFEST.other_ids to be an array of strings
pieterbos Nov 29, 2022
71ea8db
Remove CARDINALITY and MULTIPLICITY_INTERVAL from RM - they are AOM c…
pieterbos Nov 29, 2022
794e3a0
Remove RESOURCE_DESCRIPTION.parent_resource from json schema
pieterbos Nov 29, 2022
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
50 changes: 0 additions & 50 deletions components/BASE/Release-1.1.0/Base_types/ARCHETYPE_HRID.json
View file
Open in desktop

This file was deleted.

30 changes: 30 additions & 0 deletions components/BASE/Release-1.1.0/Foundation_types/Cardinality.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Cardinality.json",
"definitions": {
"CARDINALITY": {
"type": "object",
"required": [
"is_ordered",
"is_unique",
"interval"
],
"properties": {
"is_ordered": {
"type": "boolean"
},
"is_unique": {
"type": "boolean"
},
"interval": {
"$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json#/definitions/MULTIPLICITY_INTERVAL"
},
"_type": {
"type": "string",
"const": "CARDINALITY"
}
},
"additionalProperties": false
}
}
}
1 change: 1 addition & 0 deletions components/BASE/Release-1.1.0/Foundation_types/Date.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"DATE": {
"type": "object",
"required": [
"value"
],
"properties": {
"value": {
Expand Down
1 change: 1 addition & 0 deletions components/BASE/Release-1.1.0/Foundation_types/Date_time.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"DATE_TIME": {
"type": "object",
"required": [
"value"
],
"properties": {
"value": {
Expand Down
1 change: 1 addition & 0 deletions components/BASE/Release-1.1.0/Foundation_types/Duration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"DURATION": {
"type": "object",
"required": [
"value"
],
"properties": {
"value": {
Expand Down
22 changes: 0 additions & 22 deletions components/BASE/Release-1.1.0/Foundation_types/Iso8601_type.json
View file
Open in desktop

This file was deleted.

40 changes: 40 additions & 0 deletions components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Multiplicity_interval.json",
"definitions": {
"MULTIPLICITY_INTERVAL": {
"type": "object",
"required": [
"lower_unbounded",
"upper_unbounded",
"lower_included",
"upper_included"
],
"properties": {
"lower": {
"type": "object"
},
"upper": {
"type": "object"
},
"lower_unbounded": {
"type": "boolean"
},
"upper_unbounded": {
"type": "boolean"
},
"lower_included": {
"type": "boolean"
},
"upper_included": {
"type": "boolean"
},
"_type": {
"type": "string",
"const": "MULTIPLICITY_INTERVAL"
}
},
"additionalProperties": false
}
}
}
6 changes: 3 additions & 3 deletions components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"type": "object",
"required": [
"terminology_id",
"code_string",
"uri"
"code_string"
],
"properties": {
"terminology_id": {
Expand All @@ -20,7 +19,8 @@
"type": "string"
},
"uri": {
"$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Uri.json#/definitions/URI"
"type": "string",
"format": "uri-reference"
},
"_type": {
"type": "string",
Expand Down
1 change: 1 addition & 0 deletions components/BASE/Release-1.1.0/Foundation_types/Time.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"TIME": {
"type": "object",
"required": [
"value"
],
"properties": {
"value": {
Expand Down
17 changes: 0 additions & 17 deletions components/BASE/Release-1.1.0/Foundation_types/Uri.json
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"$schema": "http://json-schema.org/draft-07/schema",
"$id": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Resource/RESOURCE_ANNOTATIONS.json",
"definitions": {
"RESOURCE_ANNOTATIONS": {
"type": "object",
"required": [
"documentation"
],
"properties": {
"documentation": {
"type": "object",
"additionalProperties": {
"type": "object",
"additionalProperties": {
"type": "object",
"additionalProperties": {
"type": "string"
}
}
}
},
"_type": {
"type": "string",
"const": "RESOURCE_ANNOTATIONS"
}
},
"additionalProperties": false
}
}
}
57 changes: 45 additions & 12 deletions components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,71 @@
"type": "object",
"required": [
"original_author",
"lifecycle_state",
"parent_resource",
"details"
"lifecycle_state"
],
"properties": {
"original_author": {
"type": "object"
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"original_namespace": {
"type": "string"
},
"other_contributors": {
"type": "array",
"items": {
"type": "string"
}
},
"custodian_namespace": {
"type": "string"
},
"custodian_organisation": {
"type": "string"
},
"copyright": {
"type": "string"
},
"licence": {
"type": "string"
},
"lifecycle_state": {
"type": "string"
},
"resource_package_uri": {
"type": "string"
},
"other_details": {
"type": "object"
"ip_acknowledgements": {
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"parent_resource": {
"type": "object"
"references": {
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"conversion_details": {
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"other_details": {
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"details": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": {
"$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json#/definitions/RESOURCE_DESCRIPTION_ITEM"
},
"minItems": 1
}
},
"_type": {
"type": "string",
Expand Down
16 changes: 9 additions & 7 deletions components/BASE/Release-1.1.0/Resource/RESOURCE_DESCRIPTION_ITEM.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"type": "object",
"required": [
"language",
"purpose",
"other_details"
"purpose"
],
"properties": {
"language": {
Expand All @@ -28,17 +27,20 @@
"misuse": {
"type": "string"
},
"copyright": {
"type": "string"
},
"original_resource_uri": {
"type": "array",
"items": {
"type": "object"
"type": "object",
"additionalProperties": {
"type": "string"
}
}
},
"other_details": {
"type": "object"
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"_type": {
"type": "string",
Expand Down
13 changes: 11 additions & 2 deletions components/BASE/Release-1.1.0/Resource/TRANSLATION_DETAILS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,22 @@
"$ref": "https://specifications.openehr.org/releases/ITS-JSON/latest/components/BASE/Release-1.1.0/Foundation_types/Terminology_code.json#/definitions/TERMINOLOGY_CODE"
},
"author": {
"type": "object"
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"accreditation": {
"type": "string"
},
"version_last_translated": {
"type": "string"
},
"other_details": {
"type": "object"
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"_type": {
"type": "string",
Expand Down
Loading