Merge pull request #13 from sledilnik/janssen

Add support for Janssen manufacturer
sledilnik · May 1, 2021 · 88a455a · 88a455a
2 parents 8591ccb + 2d4a17f
commit 88a455a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/cepimose/parser.py b/cepimose/parser.py
@@ -135,13 +135,13 @@ def _parse_vaccines_supplied_by_manufacturer(
     ]
     parsed_data = []
 
-    if len(manufacturers) > 3:
+    if len(manufacturers) > 4:
         print(manufacturers)
         raise Exception("New manufacturer!")
 
     def get_manufacturer(num):
-        manu_keys = ["pfizer", "moderna", "az"]
-        if num > 2 or num == None:
+        manu_keys = ["pfizer", "moderna", "az", "janssen"]
+        if num > 3 or num == None:
             print(num)
             raise Exception("Missing manufacturer!")
         return manu_keys[num]
@@ -161,7 +161,7 @@ def get_manufacturer(num):
             raise Exception("Unknown R value!")
 
         manu_row = VaccinationByManufacturerRow(
-            date=None, pfizer=None, moderna=None, az=None
+            date=None, pfizer=None, moderna=None, az=None, janssen=None
         )
 
         if R == None:
@@ -209,6 +209,7 @@ def _parse_vaccines_supplied_by_manufacturer_cum(
         moderna = None
         pfizer = None
         az = None
+        janssen = None
 
         if len(elements) == 1:
             el = elements[0]
@@ -235,6 +236,7 @@ def _parse_vaccines_supplied_by_manufacturer_cum(
                 pfizer=pfizer,
                 moderna=moderna,
                 az=az,
+                janssen=janssen,
             )
         )
 

diff --git a/cepimose/types.py b/cepimose/types.py
@@ -43,6 +43,7 @@ class VaccinationByManufacturerRow:
     pfizer: Optional[int]
     moderna: Optional[int]
     az: Optional[int]
+    janssen: Optional[int]
 
 
 @dataclass

diff --git a/test/test.py b/test/test.py
@@ -116,11 +116,12 @@ def assertRow(row, expected_date, expected):
             self.assertEqual(row.pfizer, expected[0])
             self.assertEqual(row.moderna, expected[1])
             self.assertEqual(row.az, expected[2])
+            self.assertEqual(row.janssen, expected[3])
 
-        assertRow(data[1], datetime.datetime(2020, 12, 30), [8190, None, None])  # R = 2
-        assertRow(data[3], datetime.datetime(2021, 1, 11), [19890, None, None])  # R = 6
+        assertRow(data[1], datetime.datetime(2020, 12, 30), [8190, None, None, None])  # R = 2
+        assertRow(data[3], datetime.datetime(2021, 1, 11), [19890, None, None, None])  # R = 6
         assertRow(
-            data[16], datetime.datetime(2021, 2, 25), [None, 8400, 16800]
+            data[16], datetime.datetime(2021, 2, 25), [None, 8400, 16800, None]
         )  # combined: two response data items with same date; second has R = 1
 
         self.assertDatesIncreaseSince(data, datetime.datetime(2020, 12, 26))
@@ -134,11 +135,12 @@ def assertRow(row, expected_date, expected):
             self.assertEqual(row.pfizer, expected[0])
             self.assertEqual(row.moderna, expected[1])
             self.assertEqual(row.az, expected[2])
+            self.assertEqual(row.janssen, expected[3])
 
-        assertRow(data[3], datetime.datetime(2021, 1, 11), [59670, None, None])
-        assertRow(data[7], datetime.datetime(2021, 1, 31), [None, 3600, None])
-        assertRow(data[10], datetime.datetime(2021, 2, 6), [None, None, 9600])
-        assertRow(data[16], datetime.datetime(2021, 2, 25), [None, 16800, 52800])
+        assertRow(data[3], datetime.datetime(2021, 1, 11), [59670, None, None, None])
+        assertRow(data[7], datetime.datetime(2021, 1, 31), [None, 3600, None, None])
+        assertRow(data[10], datetime.datetime(2021, 2, 6), [None, None, 9600, None])
+        assertRow(data[16], datetime.datetime(2021, 2, 25), [None, 16800, 52800, None])
         # assertRow(
         #     data[len(data) - 1], datetime.datetime(2021, 4, 2), [285480, 46800, 144000]
         # )  # this test will fail in the future