add vidprevtyn vaccine to valuesets and rules

Daniel Gstoehl · Daniel Gstoehl · commit a5567ab80809 · 2023-01-18T13:52:07.000Z
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/GR-CH-0001/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/GR-CH-0001/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "GR-CH-0001",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "General",
   "Logic": {
     "and": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/RR-CH-0000/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/RR-CH-0000/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "RR-CH-0000",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Recovery",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/RR-CH-0001/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/RR-CH-0001/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "RR-CH-0001",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Recovery",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/RR-CH-0002/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/RR-CH-0002/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "RR-CH-0002",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Recovery",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/RR-CH-0003/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/RR-CH-0003/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "RR-CH-0003",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Recovery",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0000/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0000/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0000",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0001/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0001/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0001",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0002/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0002/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0002",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0004/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0004/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0004",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0005/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0005/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0005",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0006/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0006/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0006",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0007/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0007/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0007",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0008/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0008/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0008",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0009/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0009/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0009",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0010/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0010/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0010",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0011/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0011/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0011",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0012/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0012/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "TR-CH-0012",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Test",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0000/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0000/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0000",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0001/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0001/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0001",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0002/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0002/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0002",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0003/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0003/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0003",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0004/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0004/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0004",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0005/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0005/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0005",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0006/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0006/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0006",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0007/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0007/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0007",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0008/rule.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0008/rule.json
@@ -7,7 +7,7 @@
   "ValidTo": "2031-01-01T00:00:00Z",
   "Identifier": "VR-CH-0008",
   "Version": "1.0.12",
-  "ValidFrom": "2022-09-08T00:00:00Z",
+  "ValidFrom": "2023-02-02T00:00:00Z",
   "CertificateType": "Vaccination",
   "Logic": {
     "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/rule-constants/vaccine.aifc b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/rule-constants/vaccine.aifc
@@ -1,22 +1,24 @@
-let PFIZER          = "EU/1/20/1528";
-let MODERNA         = "EU/1/20/1507";
-let ASTRAZENECA     = "EU/1/21/1529";
-let JANSSEN         = "EU/1/20/1525";
-let NUVOVAXOVID     = "EU/1/21/1618";
-let NUVOVAXOVID_OLD = "NVX-CoV2373";
-let CORONAVAC       = "CoronaVac";
-let CORV            = "BBIBP-CorV";
-let COVISHIELD      = "Covishield";
-let COVAXIN         = "Covaxin";
-let R_COVI          = "R-COVI";
-let RECOMBINANT   = "Covid-19-recombinant";
-let COVOVAX         = "Covovax";
-let CORV_T          = "BBIBP-CorV_T";
-let CORONAVAC_T     = "CoronaVac_T";
-let COVAXIN_T       = "Covaxin_T";
-let VALNEVA_LEGACY  = "VLA2001";
-let VALNEVA         = "EU/1/21/1624";
-let CONVIDECIA      = "Convidecia";
+let PFIZER            = "EU/1/20/1528";
+let MODERNA           = "EU/1/20/1507";
+let ASTRAZENECA       = "EU/1/21/1529";
+let JANSSEN           = "EU/1/20/1525";
+let NUVOVAXOVID       = "EU/1/21/1618";
+let NUVOVAXOVID_OLD   = "NVX-CoV2373";
+let CORONAVAC         = "CoronaVac";
+let CORV              = "BBIBP-CorV";
+let COVISHIELD        = "Covishield";
+let COVAXIN           = "Covaxin";
+let R_COVI            = "R-COVI";
+let RECOMBINANT       = "Covid-19-recombinant";
+let COVOVAX           = "Covovax";
+let CORV_T            = "BBIBP-CorV_T";
+let CORONAVAC_T       = "CoronaVac_T";
+let COVAXIN_T         = "Covaxin_T";
+let VALNEVA_LEGACY    = "VLA2001";
+let VALNEVA           = "EU/1/21/1624";
+let CONVIDECIA        = "Convidecia";
+let VIDPREVTYN        = "Vidprevtyn";
+let VIDPREVTYN_LEGACY = "EU/1/21/1580";
 
 let ALL_VACCINES = [
     PFIZER,
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesUpload.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesUpload.json
@@ -9,7 +9,7 @@
       "ValidTo": "2031-01-01T00:00:00Z",
       "Identifier": "GR-CH-0002",
       "Version": "1.0.12",
-      "ValidFrom": "2022-09-08T00:00:00Z",
+      "ValidFrom": "2023-02-02T00:00:00Z",
       "CertificateType": "General",
       "Logic": {
         "if": [
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesV2.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesV2.json
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/valuesets/VerificationRulesTest.java b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/valuesets/VerificationRulesTest.java
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/resources/valuesets/vaccine-medicinal-product.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/main/resources/valuesets/vaccine-medicinal-product.json
diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/ws/EtagUtilTest.java b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/ws/EtagUtilTest.java
