Merge pull request #137 from ehn-dcc-development/release/1.3.1

Release 1.3.1

DCC.Types.schema.json

@@ -77,6 +77,7 @@
       "type": "object",
       "properties": {
         "tg": {
+          "description": "disease or agent targeted",
           "$ref": "https://id.uvci.eu/DCC.ValueSets.schema.json#/$defs/disease-agent-targeted"
         },
         "tt": {
@@ -134,6 +135,7 @@
       "type": "object",
       "properties": {
         "tg": {
+          "description": "disease or agent targeted",
           "$ref": "https://id.uvci.eu/DCC.ValueSets.schema.json#/$defs/disease-agent-targeted"
         },
         "fr": {

DCC.combined-schema.json

@@ -3,7 +3,7 @@
   "$id": "https://id.uvci.eu/DCC.combined-schema.json",
   "title": "EU DCC",
   "description": "EU Digital Covid Certificate",
-  "$comment": "Schema version 1.3.0",
+  "$comment": "Schema version 1.3.1",
   "type": "object",
   "oneOf": [
     {
@@ -38,7 +38,9 @@
       "type": "string",
       "pattern": "^\\d+.\\d+.\\d+$",
       "examples": [
-        "1.3.0"
+        "1.0.0",
+        "1.3.0",
+        "1.3.1"
       ]
     },
     "nam": {
@@ -221,6 +223,7 @@
       "type": "object",
       "properties": {
         "tg": {
+          "description": "disease or agent targeted",
           "$ref": "#/$defs/disease-agent-targeted"
         },
         "tt": {
@@ -278,6 +281,7 @@
       "type": "object",
       "properties": {
         "tg": {
+          "description": "disease or agent targeted",
           "$ref": "#/$defs/disease-agent-targeted"
         },
         "fr": {

DCC.schema.json

@@ -3,7 +3,7 @@
   "$id": "https://id.uvci.eu/DCC.schema.json",
   "title": "EU DCC",
   "description": "EU Digital Covid Certificate",
-  "$comment": "Schema version 1.3.0",
+  "$comment": "Schema version 1.3.1",
   "type": "object",
   "oneOf": [
     {
@@ -38,7 +38,9 @@
       "type": "string",
       "pattern": "^\\d+.\\d+.\\d+$",
       "examples": [
-        "1.3.0"
+        "1.0.0",
+        "1.3.0",
+        "1.3.1"
       ]
     },
     "nam": {

Makefile

@@ -14,12 +14,11 @@ JSON_FILES=	*.json \
 		examples/recovery/*.json \
 		test/invalid/*.json \
 		test/valid/*.json \
-		valuesets/*.json
 
 AJV=		./node_modules/.bin/ajv -c ajv-formats --spec=draft2020 --strict=false
 
 
-test:: compile validate-valuesets validate-examples check-formatting $(MERGED_SCHEMA)
+test:: compile validate-examples check-formatting $(MERGED_SCHEMA)
 	$(AJV) test -s $(MERGED_SCHEMA) -d "examples/vaccination/*.json" --valid
 	$(AJV) test -s $(MERGED_SCHEMA) -d "examples/recovery/*.json" --valid
 	$(AJV) test -s $(MERGED_SCHEMA) -d "examples/test/*.json" --valid
@@ -41,20 +40,17 @@ check-formatting::
 		rm $$file.tmp; \
 	done
 
-validate-examples::
+validate-examples:
 	$(AJV) validate -r "DCC.*.schema.json" -s "DCC.schema.json" -d "examples/vaccination/*.json"
 	$(AJV) validate -r "DCC.*.schema.json" -s "DCC.schema.json" -d "examples/recovery/*.json"
 	$(AJV) validate -r "DCC.*.schema.json" -s "DCC.schema.json" -d "examples/test/*.json"
 
-validate-valid-tests::
+validate-valid-tests:
 	$(AJV) validate -r "DCC.*.schema.json" -s "DCC.schema.json" -d "test/valid/*.json"
 
-validate-invalid-tests::
+validate-invalid-tests:
 	$(AJV) test -r "DCC.*.schema.json" -s "DCC.schema.json" -d "test/invalid/*.json" --invalid
 
-validate-valuesets::
-	$(AJV) validate -s "valueset.json" -d "valuesets/*.json"
-
 $(MERGED_SCHEMA): $(SCHEMATA)
 	python3 merge.py --id $(MERGED_ID) $(SCHEMATA) | jq . > $@
 	$(AJV) compile -s $@
@@ -67,3 +63,4 @@ install-ajv:
 
 clean:
 	rm -f $(MERGED_SCHEMA)
+

README.md

@@ -2,8 +2,8 @@
 
 This repository contains a JSON schema for the EU Digital Covid Certificate.
 
-**Schema version:** 1.3.0
-**Release date:** 2020-06-11
+**Schema version:** 1.3.1
+**Release date:** _to be determined_
 
 
 ## Introduction
@@ -33,22 +33,14 @@ For easy testing, they are combined in:
 
 The rule labeled as `$(MERGED_SCHEMA)` in the [Makefile](./Makefile) makes this target by combining the 4 schema files (“schemata”) mentioned above into one schema file, and also reformatting and validating it.
 The [`merge.sh` script](./merge.sh) does the same, but without reformatting and validating the resulting JSON.
-This can be useful for development purposes, but make sure to also run `make` prior to committing.
+This can be useful for development purposes, but make sure to run `make` prior to committing.
 
 _Note:_ the first 4, non-combined schema files are always leading.
 
 
 ### Value sets
 
-The [value set JSON files](./valuesets) MUST validate against the [`valueset.json` schema file](./valueset.json).
-The value set file [`test-manf.json`](./valuesets/test-manf.json) can be generated by running the following CLI command:
-
-    $ source valuesets/source-update/update-rat.sh > valuesets/test-manf.json
-
-The `update-rat.sh` shell script retrieves the required information from https://covid-19-diagnostics.jrc.ec.europa.eu/.
-This is primarily meant as a tool for whoever is managing the governance of the central deployment.
-In particular, this script is _not_ (to be) run by the Makefile, nor the CI.
-
+See https://github.com/ehn-dcc-development/ehn-dcc-valuesets
 
 ## Implementation Notes
 

examples/recovery/simple.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

examples/recovery/transliterated.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "ابو بكر محمد بن زكريا الرازي",
     "fnt": "ABW<BKR<MXHMD<BN<ZKRYA<ALRAZY",

examples/test/simple-naat.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

examples/test/simple-rat.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

examples/test/transliterated.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "ابو بكر محمد بن زكريا الرازي",
     "fnt": "ABW<BKR<MXHMD<BN<ZKRYA<ALRAZY",

examples/vaccination/simple.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

examples/vaccination/transliterated.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "ابو بكر محمد بن زكريا الرازي",
     "fnt": "ABW<BKR<MXHMD<BN<ZKRYA<ALRAZY",

test/invalid/empty.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "d'Arsøns - van Halen",
     "gn": "François-Joan",

test/invalid/invalid_dob.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Jones",
     "fnt": "JONES",

test/invalid/invalid_dob2.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Jones",
     "fnt": "JONES",

test/invalid/invalid_vac.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

test/invalid/missing_dob.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Jones",
     "fnt": "JONES",

test/invalid/missing_fnt.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Jones",
     "gn": "Dave",

test/valid/R-dates1.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

test/valid/R-dates2.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

test/valid/R-min-data.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Li",
     "fnt": "LI"

test/valid/T-naat-min-data.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Li",
     "fnt": "LI"

test/valid/T-rat-dates1.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

test/valid/T-rat-dates2.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

test/valid/T-rat-dates3.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

test/valid/T-rat-min-data.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Li",
     "fnt": "LI"

test/valid/V-dates1.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

test/valid/V-dates2.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Smith-Jones",
     "fnt": "SMITH<JONES",

test/valid/V-min-data.json

@@ -1,5 +1,5 @@
 {
-  "ver": "1.3.0",
+  "ver": "1.3.1",
   "nam": {
     "fn": "Li",
     "fnt": "LI"