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

Commit

Permalink
Merge pull request #79 from admin-ch/feature/tourist-rules
Browse files Browse the repository at this point in the history 
Feature/tourist rules
  • Loading branch information
@gstoehld
gstoehld authored Nov 18, 2021
2 parents 4ae5d5b + fc2472c commit b9335ff
Show file tree
Hide file tree
Showing 11 changed files with 222 additions and 37 deletions.
7 changes: 5 additions & 2 deletions ...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 @@ -7,7 +7,7 @@
"Country": "CH",
"Description": [
{
"desc": "Only vaccines in the allowed valueset that have been approved by the EMA are allowed.",
"desc": "Only vaccines in the allowed valueset that have been approved by the EMA or are otherwise accepted in Switzerland are allowed.",
"lang": "en"
}
],
Expand All @@ -32,7 +32,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
},
Expand Down
5 changes: 4 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 @@ -34,7 +34,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
}
Expand Down
5 changes: 4 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 @@ -34,7 +34,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
}
Expand Down
7 changes: 5 additions & 2 deletions ...vidcertificate-backend-verifier-valuesets/src/main/resources/master-rules/VR-CH-0002.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"country": "CH",
"description": [
{
"desc": "Only vaccines in the allowed valueset that have been approved by the EMA are allowed.",
"desc": "Only vaccines in the allowed valueset that have been approved by the EMA or are otherwise accepted in Switzerland are allowed.",
"lang": "en"
}
],
Expand All @@ -32,7 +32,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
},
Expand Down
5 changes: 4 additions & 1 deletion ...vidcertificate-backend-verifier-valuesets/src/main/resources/master-rules/VR-CH-0004.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
}
Expand Down
5 changes: 4 additions & 1 deletion ...vidcertificate-backend-verifier-valuesets/src/main/resources/master-rules/VR-CH-0006.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
}
Expand Down
17 changes: 13 additions & 4 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 @@ -589,7 +589,7 @@
},
{
"inputParameter": "[\"v.0\",\"v.0.mp\"]",
"description": "Only vaccines in the allowed valueset that have been approved by the EMA are allowed.",
"description": "Only vaccines in the allowed valueset that have been approved by the EMA or are otherwise accepted in Switzerland are allowed.",
"id": "VR-CH-0002",
"logic": {
"if": [
Expand All @@ -609,7 +609,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
},
Expand Down Expand Up @@ -664,7 +667,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
}
Expand Down Expand Up @@ -781,7 +787,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
}
Expand Down
86 changes: 78 additions & 8 deletions ...vidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesMaster.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,47 @@
]
},
{
"plusTime": [
"if": [
{
"var": "payload.v.0.dt"
"in": [
{
"var": "payload.v.0.mp"
},
[
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
},
0,
"day"
{
"if": [
{
"var": "payload.h.iat"
},
{
"plusTime": [
{
"var": "payload.h.iat"
},
0,
"day"
]
},
{
"var": "undefined"
}
]
},
{
"plusTime": [
{
"var": "payload.v.0.dt"
},
0,
"day"
]
}
]
}
]
Expand Down Expand Up @@ -130,12 +165,47 @@
]
},
{
"plusTime": [
"if": [
{
"var": "payload.v.0.dt"
"in": [
{
"var": "payload.v.0.mp"
},
[
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
},
364,
"day"
{
"if": [
{
"var": "payload.h.iat"
},
{
"plusTime": [
{
"var": "payload.h.iat"
},
29,
"day"
]
},
{
"var": "undefined"
}
]
},
{
"plusTime": [
{
"var": "payload.v.0.dt"
},
364,
"day"
]
}
]
}
]
Expand Down
17 changes: 13 additions & 4 deletions ...vidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesUpload.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@
"Country": "CH",
"Description": [
{
"desc": "Only vaccines in the allowed valueset that have been approved by the EMA are allowed.",
"desc": "Only vaccines in the allowed valueset that have been approved by the EMA or are otherwise accepted in Switzerland are allowed.",
"lang": "en"
}
],
Expand All @@ -938,7 +938,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
},
Expand Down Expand Up @@ -1032,7 +1035,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
}
Expand Down Expand Up @@ -1190,7 +1196,10 @@
"CoronaVac",
"BBIBP-CorV",
"Covishield",
"Covaxin"
"Covaxin",
"BBIBP-CorV_T",
"CoronaVac_T",
"Covaxin_T"
]
]
}
Expand Down
Loading

0 comments on commit b9335ff

Please sign in to comment.