Merge pull request #69 from admin-ch/feature/covaxin

fix TR-CH-0002
admin-ch · Nov 4, 2021 · 5206fc1 · 5206fc1
2 parents 83df066 + 57c461e
commit 5206fc1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/...ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0002/rule.json b/...ch-covidcertificate-backend-verifier-valuesets/src/main/resources/CH/TR-CH-0002/rule.json
@@ -26,7 +26,8 @@
           },
           [
             "LP217198-3",
-            "LP6464-4"
+            "LP6464-4",
+            "94504-8"
           ]
         ]
       },

diff --git a/...vidcertificate-backend-verifier-valuesets/src/main/resources/master-rules/TR-CH-0002.json b/...vidcertificate-backend-verifier-valuesets/src/main/resources/master-rules/TR-CH-0002.json
@@ -26,7 +26,8 @@
           },
           [
             "LP217198-3",
-            "LP6464-4"
+            "LP6464-4",
+            "94504-8"
           ]
         ]
       },

diff --git a/.../ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRules.json b/.../ch-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRules.json
@@ -297,7 +297,8 @@
               },
               [
                 "LP217198-3",
-                "LP6464-4"
+                "LP6464-4",
+                "94504-8"
               ]
             ]
           },

diff --git a/...vidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesUpload.json b/...vidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesUpload.json
@@ -451,7 +451,8 @@
               },
               [
                 "LP217198-3",
-                "LP6464-4"
+                "LP6464-4",
+                "94504-8"
               ]
             ]
           },

diff --git a/...h-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesV2.json b/...h-covidcertificate-backend-verifier-valuesets/src/main/resources/verificationRulesV2.json
@@ -712,7 +712,8 @@
               },
               [
                 "LP217198-3",
-                "LP6464-4"
+                "LP6464-4",
+                "94504-8"
               ]
             ]
           },

diff --git a/...fier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/ws/EtagUtilTest.java b/...fier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/verifier/ws/EtagUtilTest.java
@@ -41,7 +41,7 @@ public void testUnsortedListEtag() {
 
     @Test
     public void testFileHash() throws Exception {
-        String expected = "W/\"bce3ac58ce97118fe99eb356886d54f4465af9b2\"";
+        String expected = "W/\"5d696fd11a5809c9c6d65bf3f4b80bfaba26cefc\"";
         String sha1 = EtagUtil.getSha1HashForFiles(true, PATH_TO_VERIFICATION_RULES);
         assertEquals(expected, sha1);
         assertNotEquals(