diff --git a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesMaster.json b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesMaster.json index aca3699d..828beddd 100644 --- a/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesMaster.json +++ b/ch-covidcertificate-backend-verifier/ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesMaster.json @@ -261,9 +261,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -324,9 +324,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -365,9 +365,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -411,9 +411,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -444,9 +444,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -513,9 +513,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -594,9 +594,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -646,9 +646,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -727,9 +727,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -790,9 +790,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -828,9 +828,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -869,9 +869,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -902,9 +902,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -954,9 +954,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -1011,9 +1011,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -1068,9 +1068,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -1131,9 +1131,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -1164,9 +1164,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -1216,9 +1216,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" }, { "affectedFields": [ @@ -1268,9 +1268,9 @@ }, "schemaVersion": "1.0.0", "type": "Acceptance", - "validFrom": "2020-01-01T00:00:00Z", + "validFrom": "2021-09-30T12:00:00Z", "validTo": "2031-01-01T00:00:00Z", - "version": "1.0.0" + "version": "1.0.2" } ], "validDuration": 172800000, 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 index 6eee8382..932c1e2f 100644 --- 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 @@ -17,7 +17,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "GR-CH-0001", "Logic": { @@ -80,9 +80,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "VR-CH-0000": [ @@ -101,7 +101,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "VR-CH-0000", "Logic": { @@ -145,9 +145,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "VR-CH-0001": [ @@ -165,7 +165,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "VR-CH-0001", "Logic": { @@ -188,9 +188,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "VR-CH-0002": [ @@ -207,7 +207,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "VR-CH-0002", "Logic": { @@ -236,9 +236,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "VR-CH-0003": [ @@ -255,7 +255,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "VR-CH-0003", "Logic": { @@ -271,9 +271,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "VR-CH-0004": [ @@ -291,7 +291,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "VR-CH-0004", "Logic": { @@ -342,9 +342,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "VR-CH-0005": [ @@ -363,7 +363,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "VR-CH-0005", "Logic": { @@ -425,9 +425,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "VR-CH-0006": [ @@ -444,7 +444,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "VR-CH-0006", "Logic": { @@ -479,9 +479,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "VR-CH-0007": [ @@ -500,7 +500,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "VR-CH-0007", "Logic": { @@ -562,9 +562,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "TR-CH-0000": [ @@ -583,7 +583,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "TR-CH-0000", "Logic": { @@ -627,9 +627,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "TR-CH-0001": [ @@ -646,7 +646,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "TR-CH-0001", "Logic": { @@ -667,9 +667,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "TR-CH-0002": [ @@ -686,7 +686,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "TR-CH-0002", "Logic": { @@ -710,9 +710,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "TR-CH-0004": [ @@ -729,7 +729,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "TR-CH-0004", "Logic": { @@ -745,9 +745,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "TR-CH-0005": [ @@ -764,7 +764,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "TR-CH-0005", "Logic": { @@ -799,9 +799,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "TR-CH-0006": [ @@ -818,7 +818,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "TR-CH-0006", "Logic": { @@ -858,9 +858,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "TR-CH-0007": [ @@ -877,7 +877,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "TR-CH-0007", "Logic": { @@ -917,9 +917,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "RR-CH-0000": [ @@ -938,7 +938,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "RR-CH-0000", "Logic": { @@ -982,9 +982,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "RR-CH-0001": [ @@ -1001,7 +1001,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "RR-CH-0001", "Logic": { @@ -1017,9 +1017,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "RR-CH-0002": [ @@ -1036,7 +1036,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "RR-CH-0002", "Logic": { @@ -1071,9 +1071,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ], "RR-CH-0003": [ @@ -1090,7 +1090,7 @@ "lang": "en" } ], - "Engine": "CertLogic", + "Engine": "CERTLOGIC", "EngineVersion": "0.7.5", "Identifier": "RR-CH-0003", "Logic": { @@ -1125,9 +1125,9 @@ }, "SchemaVersion": "1.0.0", "Type": "Acceptance", - "ValidFrom": "2020-01-01T00:00:00Z", + "ValidFrom": "2021-09-30T12:00:00Z", "ValidTo": "2031-01-01T00:00:00Z", - "Version": "1.0.0" + "Version": "1.0.2" } ] } \ No newline at end of file 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 index 0750f7d8..9ebdbb41 100644 --- 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 @@ -1275,446 +1275,40 @@ ], "validDuration": 172800000, "valueSets": { - "country-2-codes": [ - "AD", - "AE", - "AF", - "AG", - "AI", - "AL", - "AM", - "AO", - "AQ", - "AR", - "AS", - "AT", - "AU", - "AW", - "AX", - "AZ", - "BA", - "BB", - "BD", - "BE", - "BF", - "BG", - "BH", - "BI", - "BJ", - "BL", - "BM", - "BN", - "BO", - "BQ", - "BR", - "BS", - "BT", - "BV", - "BW", - "BY", - "BZ", - "CA", - "CC", - "CD", - "CF", - "CG", - "CH", - "CI", - "CK", - "CL", - "CM", - "CN", - "CO", - "CR", - "CU", - "CV", - "CW", - "CX", - "CY", - "CZ", - "DE", - "DJ", - "DK", - "DM", - "DO", - "DZ", - "EC", - "EE", - "EG", - "EH", - "ER", - "ES", - "ET", - "FI", - "FJ", - "FK", - "FM", - "FO", - "FR", - "GA", - "GB", - "GD", - "GE", - "GF", - "GG", - "GH", - "GI", - "GL", - "GM", - "GN", - "GP", - "GQ", - "GR", - "GS", - "GT", - "GU", - "GW", - "GY", - "HK", - "HM", - "HN", - "HR", - "HT", - "HU", - "ID", - "IE", - "IL", - "IM", - "IN", - "IO", - "IQ", - "IR", - "IS", - "IT", - "JE", - "JM", - "JO", - "JP", - "KE", - "KG", - "KH", - "KI", - "KM", - "KN", - "KP", - "KR", - "KW", - "KY", - "KZ", - "LA", - "LB", - "LC", - "LI", - "LK", - "LR", - "LS", - "LT", - "LU", - "LV", - "LY", - "MA", - "MC", - "MD", - "ME", - "MF", - "MG", - "MH", - "MK", - "ML", - "MM", - "MN", - "MO", - "MP", - "MQ", - "MR", - "MS", - "MT", - "MU", - "MV", - "MW", - "MX", - "MY", - "MZ", - "NA", - "NC", - "NE", - "NF", - "NG", - "NI", - "NL", - "NO", - "NP", - "NR", - "NU", - "NZ", - "OM", - "PA", - "PE", - "PF", - "PG", - "PH", - "PK", - "PL", - "PM", - "PN", - "PR", - "PS", - "PT", - "PW", - "PY", - "QA", - "RE", - "RO", - "RS", - "RU", - "RW", - "SA", - "SB", - "SC", - "SD", - "SE", - "SG", - "SH", - "SI", - "SJ", - "SK", - "SL", - "SM", - "SN", - "SO", - "SR", - "SS", - "ST", - "SV", - "SX", - "SY", - "SZ", - "TC", - "TD", - "TF", - "TG", - "TH", - "TJ", - "TK", - "TL", - "TM", - "TN", - "TO", - "TR", - "TT", - "TV", - "TW", - "TZ", - "UA", - "UG", - "UM", - "US", - "UY", - "UZ", - "VA", - "VC", - "VE", - "VG", - "VI", - "VN", - "VU", - "WF", - "WS", - "YE", - "YT", - "ZA", - "ZM", - "ZW" - ], - "vaccines-covid-19-auth-holders": [ - "ORG-100001699", - "ORG-100030215", - "ORG-100001417", - "ORG-100031184", - "ORG-100006270", - "ORG-100013793", - "ORG-100020693", - "ORG-100010771", - "ORG-100024420", - "ORG-100032020", - "Gamaleya-Research-Institute", - "Vector-Institute", - "Sinovac-Biotech", - "Bharat-Biotech", - "ORG-100001981" - ], "disease-agent-targeted": [ "840539006" ], - "covid-19-lab-result": [ - "260415000", - "260373001" - ], - "sct-vaccines-covid-19": [ - "1119349007", - "1119305005", - "J07BX03" - ], - "vaccines-covid-19-names": [ + "accepted-vaccines": [ "EU/1/20/1528", "EU/1/20/1507", "EU/1/21/1529", "EU/1/20/1525", - "CVnCoV", - "Sputnik-V", - "Convidecia", - "EpiVacCorona", + "CoronaVac", "BBIBP-CorV", - "Inactivated-SARS-CoV-2-Vero-Cell", + "Covishield" + ], + "two-dose-vaccines": [ + "EU/1/20/1528", + "EU/1/20/1507", + "EU/1/21/1529", "CoronaVac", - "Covaxin", + "BBIBP-CorV", "Covishield" ], + "one-dose-vaccines-with-offset": [ + "EU/1/20/1525" + ], "covid-19-lab-test-type": [ - "LP6464-4", - "LP217198-3" + "LP217198-3", + "LP6464-4" ], - "covid-19-lab-test-manufacturer-and-name": [ - "1341", - "1065", - "1581", - "2031", - "1180", - "1216", - "2029", - "1215", - "1457", - "1456", - "1610", - "1333", - "2147", - "1574", - "1331", - "1739", - "1618", - "1736", - "1218", - "1190", - "1197", - "1501", - "1468", - "1225", - "1466", - "1465", - "1223", - "1343", - "1906", - "768", - "1747", - "1919", - "1363", - "1242", - "1484", - "1481", - "1360", - "2052", - "770", - "1357", - "1236", - "1599", - "1114", - "1199", - "2200", - "1870", - "1232", - "1495", - "1253", - "2067", - "1494", - "1097", - "1490", - "2183", - "1767", - "1800", - "1920", - "1489", - "1764", - "1884", - "1763", - "1365", - "1244", - "1243", - "1485", - "308", - "1769", - "1768", - "2078", - "1263", - "2074", - "2072", - "2108", - "2228", - "2107", - "1775", - "1654", - "2104", - "1257", - "1773", - "2103", - "1375", - "2101", - "1815", - "1934", - "2109", - "2243", - "1271", - "1392", - "1822", - "1304", - "1820", - "2116", - "1268", - "1267", - "1420", - "1266", - "1144", - "2079", - "2090", - "2012", - "2098", - "2010", - "1162", - "2130", - "1437", - "1833", - "2128", - "2006", - "1278", - "1957", - "1319", - "1296", - "1295", - "1173", - "1844", - "2139", - "2017", - "344", - "1324", - "345", - "1443", - "1201", - "1606", - "1967", - "1604", - "2350", - "2247", - "1286", - "2035", - "2013", - "1989", - "2242", - "1855", - "2317", - "1759", - "2241", - "1762", - "2290", - "1178" - ] + "acceptance-criteria": { + "single-vaccine-validity-offset": 21, + "vaccine-immunity": 364, + "rat-test-validity": 48, + "pcr-test-validity": 72, + "recovery-offset-valid-from": 10, + "recovery-offset-valid-until": 179 + } } } \ No newline at end of file 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 index ac235d68..c0d6e9ba 100644 --- 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 @@ -110,7 +110,9 @@ private void mapV2RulesToUpload(JsonNode v2) throws Exception { Map uploadRules = new LinkedHashMap(); for (var rule : v2.get("rules")) { ArrayNode rulesNode = mapper.createArrayNode(); - rulesNode.add(getJsonNodeWithCapitalizedTopLevelKeys(rule)); + JsonNode pascaleCase = getJsonNodeWithCapitalizedTopLevelKeys(rule); + JsonNode v2Rule = getJsonNodeWithFixedCertLogic(pascaleCase); + rulesNode.add(v2Rule); uploadRules.put(rule.get("identifier").asText(), rulesNode); } mapper.writerWithDefaultPrettyPrinter() @@ -126,6 +128,22 @@ private JsonNode getJsonNodeWithCapitalizedTopLevelKeys(JsonNode jsonNode) { return mapper.convertValue(capitalized, JsonNode.class); } + private JsonNode getJsonNodeWithFixedCertLogic(JsonNode jsonNode) { + Map map = mapper.convertValue(jsonNode, Map.class); + Map fixed = new LinkedHashMap<>(); + for (Entry entry : map.entrySet()) { + String key = entry.getKey(); + if (key.equalsIgnoreCase("engine") + && entry.getValue() instanceof String + && "CertLogic".equalsIgnoreCase((String) entry.getValue())) { + fixed.put(key, ((String) entry.getValue()).toUpperCase()); + } else { + fixed.put(entry.getKey(), entry.getValue()); + } + } + return mapper.convertValue(fixed, JsonNode.class); + } + private void mapV2RulesToV1(JsonNode v2) throws Exception { ArrayList rules = new ArrayList<>(); for (var rule : v2.get("rules")) {