Merge pull request #67 from admin-ch/feature/update-vacc-valuesets

Feature: update vaccine valuesets
admin-ch · Nov 4, 2021 · 83df066 · 83df066
2 parents 217cb5b + e48c64f
commit 83df066
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/...h-covidcertificate-backend-verifier-ws/src/main/resources/valuesets/vaccine-mah-manf.json b/...h-covidcertificate-backend-verifier-ws/src/main/resources/valuesets/vaccine-mah-manf.json
@@ -1,6 +1,6 @@
 {
   "valueSetId": "vaccines-covid-19-auth-holders",
-  "valueSetDate": "2021-05-07",
+  "valueSetDate": "2021-09-29",
   "valueSetValues": {
     "ORG-100001699": {
       "display": "AstraZeneca AB",
@@ -106,6 +106,20 @@
       "active": true,
       "system": "https://spor.ema.europa.eu/v1/organisations",
       "version": ""
+    },
+    "Fiocruz": {
+      "display": "Fiocruz",
+      "lang": "en",
+      "active": true,
+      "system": "http://ec.europa.eu/temp/vaccinemanufacturer",
+      "version": "1.3"
+    },
+    "ORG-100007893": {
+      "display": "R-Pharm CJSC",
+      "lang": "en",
+      "active": true,
+      "system": "https://spor.ema.europa.eu/v1/organisations",
+      "version": ""
     }
   }
 }
diff --git a/...rtificate-backend-verifier-ws/src/main/resources/valuesets/vaccine-medicinal-product.json b/...rtificate-backend-verifier-ws/src/main/resources/valuesets/vaccine-medicinal-product.json
@@ -1,6 +1,6 @@
 {
   "valueSetId": "vaccines-covid-19-names",
-  "valueSetDate": "2021-05-07",
+  "valueSetDate": "2021-09-29",
   "valueSetValues": {
     "EU/1/20/1528": {
       "display": "Comirnaty",
@@ -91,7 +91,21 @@
       "lang": "en",
       "active": true,
       "system": "http://ec.europa.eu/temp/vaccineproductname",
-      "version": "1.0"
+      "version": "1.2"
+    },
+    "Covid-19-recombinant": {
+      "display": "Covid-19 (recombinant)",
+      "lang": "en",
+      "active": true,
+      "system": "http://ec.europa.eu/temp/vaccineproductname",
+      "version": "1.3"
+    },
+    "R-COVI": {
+      "display": "R-COVI",
+      "lang": "en",
+      "active": true,
+      "system": "http://ec.europa.eu/temp/vaccineproductname",
+      "version": "1.3"
     }
   }
-}
+}
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
@@ -50,7 +50,7 @@ public void testFileHash() throws Exception {
 
     @Test
     public void testFileHashMultiple() throws Exception {
-        String expected = "W/\"b5d6378f8e394515f1cef6802f36c8ff86f2c425\"";
+        String expected = "W/\"f47e636a2d68e29a3bdd5e702dc2942eff29628d\"";
         List<String> pathsToValueSets =
                 ValueSetsController.PATHS_TO_VALUE_SETS.stream()
                         .map(p -> "classpath:" + p)