Skip to content
This repository has been archived by the owner on Sep 15, 2023. It is now read-only.

Commit

Permalink
fix rules
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Gstoehl committed Jan 20, 2023
1 parent 0884212 commit d894f3a
Show file tree
Hide file tree
Showing 11 changed files with 123 additions and 91 deletions.
4 changes: 3 additions & 1 deletion ...ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0002/rule.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"Covaxin_T",
"EU/1/21/1624",
"VLA2001",
"Convidecia"
"Convidecia",
"EU/1/21/1580",
"Vidprevtyn"
]
]
},
Expand Down
4 changes: 3 additions & 1 deletion ...ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0004/rule.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
}
Expand Down
4 changes: 3 additions & 1 deletion ...ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/VR-CH-0006/rule.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
}
Expand Down
4 changes: 3 additions & 1 deletion ...erifier-valuesets/src/main/resources/generated/display-rules/display-until-date.aifc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
},
Expand Down
4 changes: 3 additions & 1 deletion ...d-verifier-valuesets/src/main/resources/generated/verification-rules/VR-CH-0002.aifc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"Covaxin_T",
"EU/1/21/1624",
"VLA2001",
"Convidecia"
"Convidecia",
"EU/1/21/1580",
"Vidprevtyn"
]
]
},
Expand Down
4 changes: 3 additions & 1 deletion ...d-verifier-valuesets/src/main/resources/generated/verification-rules/VR-CH-0004.aifc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
}
Expand Down
4 changes: 3 additions & 1 deletion ...d-verifier-valuesets/src/main/resources/generated/verification-rules/VR-CH-0006.aifc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
}
Expand Down
8 changes: 6 additions & 2 deletions ...ovidcertificate-backend-verifier-valuesets/src/main/resources/rule-constants/vaccine.aifc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ let ALL_VACCINES = [
COVAXIN_T,
VALNEVA,
VALNEVA_LEGACY,
CONVIDECIA
CONVIDECIA,
VIDPREVTYN_LEGACY,
VIDPREVTYN
];


Expand All @@ -60,7 +62,9 @@ let TWO_DOSE_VACCINES = [
CORONAVAC_T,
COVAXIN_T,
VALNEVA_LEGACY,
VALNEVA
VALNEVA,
VIDPREVTYN_LEGACY,
VIDPREVTYN
];

let SINGLE_DOSE_VACCINES = [
Expand Down
12 changes: 9 additions & 3 deletions .../ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRules.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,9 @@
"Covaxin_T",
"EU/1/21/1624",
"VLA2001",
"Convidecia"
"Convidecia",
"EU/1/21/1580",
"Vidprevtyn"
]
]
},
Expand Down Expand Up @@ -842,7 +844,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
}
Expand Down Expand Up @@ -970,7 +974,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
}
Expand Down
164 changes: 86 additions & 78 deletions ...h-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesV2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,9 @@
"Covaxin_T",
"EU/1/21/1624",
"VLA2001",
"Convidecia"
"Convidecia",
"EU/1/21/1580",
"Vidprevtyn"
]
]
},
Expand Down Expand Up @@ -1222,7 +1224,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
}
Expand Down Expand Up @@ -1387,7 +1391,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
}
Expand Down Expand Up @@ -2256,12 +2262,6 @@
}
},
"displayRules": [
{
"id": "eol-banner",
"logic": {
"var": "undefined"
}
},
{
"id": "display-until-date",
"logic": {
Expand Down Expand Up @@ -2472,7 +2472,9 @@
"CoronaVac_T",
"Covaxin_T",
"VLA2001",
"EU/1/21/1624"
"EU/1/21/1624",
"EU/1/21/1580",
"Vidprevtyn"
]
]
},
Expand Down Expand Up @@ -2645,6 +2647,80 @@
]
}
},
{
"id": "eol-banner",
"logic": {
"var": "undefined"
}
},
{
"id": "renew-banner",
"logic": {
"if": [
{
"and": [
{
"var": "payload.h.exp"
},
{
"var": "payload.v.0"
},
{
"var": "payload.h.iss"
}
]
},
{
"if": [
{
"and": [
{
"before": [
{
"plusTime": [
{
"var": "payload.h.exp"
},
0,
"day"
]
},
{
"plusTime": [
{
"var": "external.validationClock"
},
90,
"day"
]
}
]
},
{
"in": [
{
"var": "payload.h.iss"
},
[
"CH",
"CH BAG"
]
]
}
]
},
"showRenewBanner",
{
"var": "undefined"
}
]
},
{
"var": "undefined"
}
]
}
},
{
"id": "display-from-date",
"logic": {
Expand Down Expand Up @@ -2809,74 +2885,6 @@
]
}
},
{
"id": "renew-banner",
"logic": {
"if": [
{
"and": [
{
"var": "payload.h.exp"
},
{
"var": "payload.v.0"
},
{
"var": "payload.h.iss"
}
]
},
{
"if": [
{
"and": [
{
"before": [
{
"plusTime": [
{
"var": "payload.h.exp"
},
0,
"day"
]
},
{
"plusTime": [
{
"var": "external.validationClock"
},
90,
"day"
]
}
]
},
{
"in": [
{
"var": "payload.h.iss"
},
[
"CH",
"CH BAG"
]
]
}
]
},
"showRenewBanner",
{
"var": "undefined"
}
]
},
{
"var": "undefined"
}
]
}
},
{
"id": "is-only-valid-in-ch",
"logic": {
Expand Down
2 changes: 1 addition & 1 deletion ...fier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/ws/EtagUtilTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void testUnsortedListEtag() {

@Test
public void testFileHash() throws Exception {
String expected = "W/\"efafab6552384bc2e12194c9456af0b4cdc0e208\"";
String expected = "W/\"069063cd74d16b3d60dcb858c759f3aadea8f582\"";
String sha1 = EtagUtil.getSha1HashForFiles(true, PATH_TO_VERIFICATION_RULES);
assertEquals(expected, sha1);
assertNotEquals(
Expand Down

0 comments on commit d894f3a

Please sign in to comment.