Merge pull request #31 from ehn-digital-green-development/next

ehn-dcc-development · Apr 27, 2021 · 3c671d4 · 3c671d4
2 parents 093f95a + 2a73725
commit 3c671d4
Show file tree

Hide file tree

Showing 22 changed files with 917 additions and 2,413 deletions.
diff --git a/DGC.Core.Types.schema.json b/DGC.Core.Types.schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json",
+  "$id": "https://id.uvci.eu/DGC.Core.Types.schema.json",
   "title": "EU DGC",
   "description": "EU Digital Green Certificate Core Data Types",
   "$defs": {

diff --git a/DGC.Types.schema.json b/DGC.Types.schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://ec.europa.eu/dgc/DGC.Types.schema.json",
+  "$id": "https://id.uvci.eu/DGC.Types.schema.json",
   "title": "EU DGC",
   "description": "EU Digital Green Certificate Composite Data Types",
   "$defs": {
@@ -22,27 +22,27 @@
       "properties": {
         "tg": {
           "description": "disease or agent targeted",
-          "$ref": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json#/$defs/disease-agent-targeted"
+          "$ref": "https://id.uvci.eu/DGC.ValueSets.schema.json#/$defs/disease-agent-targeted"
         },
         "vp": {
           "description": "vaccine or prophylaxis",
-          "$ref": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json#/$defs/vaccine-prophylaxis"
+          "$ref": "https://id.uvci.eu/DGC.ValueSets.schema.json#/$defs/vaccine-prophylaxis"
         },
         "mp": {
           "description": "vaccine medicinal product",
-          "$ref": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json#/$defs/vaccine-medicinal-product"
+          "$ref": "https://id.uvci.eu/DGC.ValueSets.schema.json#/$defs/vaccine-medicinal-product"
         },
         "ma": {
           "description": "Marketing Authorization Holder - if no MAH present, then manufacturer",
-          "$ref": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json#/$defs/vaccine-mah-manf"
+          "$ref": "https://id.uvci.eu/DGC.ValueSets.schema.json#/$defs/vaccine-mah-manf"
         },
         "dn": {
           "description": "Dose Number",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/dose_posint"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/dose_posint"
         },
         "sd": {
           "description": "Total Series of Doses",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/dose_posint"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/dose_posint"
         },
         "dt": {
           "description": "Date of Vaccination",
@@ -52,15 +52,15 @@
         },
         "co": {
           "description": "Country of Vaccination",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/country_vt"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/country_vt"
         },
         "is": {
           "description": "Certificate Issuer",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/issuer"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/issuer"
         },
         "ci": {
           "description": "Unique Certificate Identifier: UVCI",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/certificate_id"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/certificate_id"
         }
       }
     },
@@ -79,7 +79,7 @@
       "type": "object",
       "properties": {
         "tg": {
-          "$ref": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json#/$defs/disease-agent-targeted"
+          "$ref": "https://id.uvci.eu/DGC.ValueSets.schema.json#/$defs/disease-agent-targeted"
         },
         "tt": {
           "description": "Type of Test",
@@ -91,7 +91,7 @@
         },
         "ma": {
           "description": "RAT Test name and manufacturer",
-          "$ref": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json#/$defs/test-manf"
+          "$ref": "https://id.uvci.eu/DGC.ValueSets.schema.json#/$defs/test-manf"
         },
         "sc": {
           "description": "Date/Time of Sample Collection",
@@ -105,7 +105,7 @@
         },
         "tr": {
           "description": "Test Result",
-          "$ref": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json#/$defs/test-result"
+          "$ref": "https://id.uvci.eu/DGC.ValueSets.schema.json#/$defs/test-result"
         },
         "tc": {
           "description": "Testing Centre",
@@ -114,15 +114,15 @@
         },
         "co": {
           "description": "Country of Test",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/country_vt"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/country_vt"
         },
         "is": {
           "description": "Certificate Issuer",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/issuer"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/issuer"
         },
         "ci": {
           "description": "Unique Certificate Identifier, UVCI",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/certificate_id"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/certificate_id"
         }
       }
     },
@@ -140,7 +140,7 @@
       "type": "object",
       "properties": {
         "tg": {
-          "$ref": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json#/$defs/disease-agent-targeted"
+          "$ref": "https://id.uvci.eu/DGC.ValueSets.schema.json#/$defs/disease-agent-targeted"
         },
         "fr": {
           "description": "ISO 8601 Date of First Positive Test Result",
@@ -149,11 +149,11 @@
         },
         "co": {
           "description": "Country of Test",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/country_vt"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/country_vt"
         },
         "is": {
           "description": "Certificate Issuer",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/issuer"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/issuer"
         },
         "df": {
           "description": "ISO 8601 Date: Certificate Valid From",
@@ -167,7 +167,7 @@
         },
         "ci": {
           "description": "Unique Certificate Identifier, UVCI",
-          "$ref": "https://ec.europa.eu/dgc/DGC.Core.Types.schema.json#/$defs/certificate_id"
+          "$ref": "https://id.uvci.eu/DGC.Core.Types.schema.json#/$defs/certificate_id"
         }
       }
     }

diff --git a/DGC.ValueSets.schema.json b/DGC.ValueSets.schema.json
@@ -1,102 +1,38 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://ec.europa.eu/dgc/DGC.ValueSets.schema.json",
+  "$id": "https://id.uvci.eu/DGC.ValueSets.schema.json",
   "title": "EU DGC",
   "description": "EU Digital Green Certificate Value Set Data Types",
   "$defs": {
     "disease-agent-targeted": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.1",
       "type": "string",
-      "enum": [
-        "840539006"
-      ]
+      "valueset-uri": "valuesets/disease-agent-targeted.json"
     },
     "vaccine-prophylaxis": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.2",
       "type": "string",
-      "enum": [
-        "1119305005",
-        "1119349007",
-        "J07BX03"
-      ]
+      "valueset-uri": "valuesets/vaccine-prophylaxis.json"
     },
     "vaccine-medicinal-product": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.3",
       "type": "string",
-      "enum": [
-        "EU/1/20/1528",
-        "EU/1/20/1507",
-        "EU/1/21/1529",
-        "EU/1/20/1525",
-        "CVnCoV",
-        "NVX-CoV2373",
-        "Sputnik-V",
-        "Convidecia",
-        "EpiVacCorona",
-        "BBIBP-CorV",
-        "Inactivated-SARS-CoV-2-Vero-Cell",
-        "CoronaVac",
-        "Covaxin"
-      ]
+      "valueset-uri": "valuesets/vaccine-medicinal-product.json"
     },
     "vaccine-mah-manf": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.4",
       "type": "string",
-      "enum": [
-        "ORG-100001699",
-        "ORG-100030215",
-        "ORG-100001417",
-        "ORG-100031184",
-        "ORG-100006270",
-        "ORG-100013793",
-        "ORG-100020693",
-        "ORG-100020693",
-        "ORG-100010771",
-        "ORG-100024420",
-        "ORG-100032020",
-        "Gamaleya-Research-Institute",
-        "Vector-Institute",
-        "Sinovac-Biotech",
-        "Bharat-Biotech"
-      ]
+      "valueset-uri": "valuesets/vaccine-mah-manf.json"
     },
     "test-manf": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.8",
       "type": "string",
-      "enum": [
-        "1232",
-        "1304",
-        "1065",
-        "1331",
-        "1484",
-        "1242",
-        "1223",
-        "1173",
-        "1244",
-        "1360",
-        "1363",
-        "1767",
-        "1333",
-        "1268",
-        "1180",
-        "1481",
-        "1162",
-        "1271",
-        "1097",
-        "1489",
-        "344",
-        "345",
-        "1218",
-        "1343"
-      ]
+      "valueset-uri": "valuesets/test-manf.json"
     },
     "test-result": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.9",
       "type": "string",
-      "enum": [
-        "260415000",
-        "260373001"
-      ]
+      "valueset-uri": "valuesets/test-results.json"
     }
   }
 }
diff --git a/DGC-all-schemas-combined.json → DGC.combined-schema.json b/DGC-all-schemas-combined.json → DGC.combined-schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://ec.europa.eu/dgc/DGC.schema.json",
+  "$id": "https://id.uvci.eu/DGC.combined-schema.json",
   "title": "EU DGC",
   "description": "EU Digital Green Certificate",
   "required": [
@@ -298,96 +298,32 @@
     "disease-agent-targeted": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.1",
       "type": "string",
-      "enum": [
-        "840539006"
-      ]
+      "valueset-uri": "valuesets/disease-agent-targeted.json"
     },
     "vaccine-prophylaxis": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.2",
       "type": "string",
-      "enum": [
-        "1119305005",
-        "1119349007",
-        "J07BX03"
-      ]
+      "valueset-uri": "valuesets/vaccine-prophylaxis.json"
     },
     "vaccine-medicinal-product": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.3",
       "type": "string",
-      "enum": [
-        "EU/1/20/1528",
-        "EU/1/20/1507",
-        "EU/1/21/1529",
-        "EU/1/20/1525",
-        "CVnCoV",
-        "NVX-CoV2373",
-        "Sputnik-V",
-        "Convidecia",
-        "EpiVacCorona",
-        "BBIBP-CorV",
-        "Inactivated-SARS-CoV-2-Vero-Cell",
-        "CoronaVac",
-        "Covaxin"
-      ]
+      "valueset-uri": "valuesets/vaccine-medicinal-product.json"
     },
     "vaccine-mah-manf": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.4",
       "type": "string",
-      "enum": [
-        "ORG-100001699",
-        "ORG-100030215",
-        "ORG-100001417",
-        "ORG-100031184",
-        "ORG-100006270",
-        "ORG-100013793",
-        "ORG-100020693",
-        "ORG-100020693",
-        "ORG-100010771",
-        "ORG-100024420",
-        "ORG-100032020",
-        "Gamaleya-Research-Institute",
-        "Vector-Institute",
-        "Sinovac-Biotech",
-        "Bharat-Biotech"
-      ]
+      "valueset-uri": "valuesets/vaccine-mah-manf.json"
     },
     "test-manf": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.8",
       "type": "string",
-      "enum": [
-        "1232",
-        "1304",
-        "1065",
-        "1331",
-        "1484",
-        "1242",
-        "1223",
-        "1173",
-        "1244",
-        "1360",
-        "1363",
-        "1767",
-        "1333",
-        "1268",
-        "1180",
-        "1481",
-        "1162",
-        "1271",
-        "1097",
-        "1489",
-        "344",
-        "345",
-        "1218",
-        "1343"
-      ]
+      "valueset-uri": "valuesets/test-manf.json"
     },
     "test-result": {
       "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.9",
       "type": "string",
-      "enum": [
-        "260415000",
-        "260373001"
-      ]
+      "valueset-uri": "valuesets/test-results.json"
     }
   }
 }