vaccines_supplied_by_manufacturer: get also negative values (#38)

sledilnik · Jul 23, 2021 · d77c74c · d77c74c
1 parent f1c3b92
commit d77c74c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/cepimose/data.py b/cepimose/data.py
@@ -1630,7 +1630,7 @@ def _create_vaccinations_by_manufacturer_requests():
                                     "Function": 0,
                                 }
                             },
-                            "Right": {"Literal": {"Value": "1L"}},
+                            "Right": {"Literal": {"Value": "-100000000000L"}},
                         }
                     },
                     "Target": [

diff --git a/cepimose/parser.py b/cepimose/parser.py
@@ -177,7 +177,7 @@ def get_manufacturer(num):
             raise Exception("Missing manufacturer!")
         return manu_keys[num]
 
-    r_list = [None, 1, 2, 4, 6]
+    r_list = [None, 1, 2, 4, 5, 6]
 
     date = None
     manufacturer = None
@@ -229,7 +229,7 @@ def get_manufacturer(num):
             setattr(manu_row, "date", date)
             setattr(manu_row, manufacturer, value)
 
-        if R != 1:
+        if R != 1 and R != 5:
             parsed_data.append(manu_row)
     return parsed_data
 

diff --git a/test/test.py b/test/test.py
@@ -101,6 +101,7 @@ def assertRow(row, expected_date, expected):
             data[16], datetime.datetime(2021, 2, 25), [None, 8400, 16800, None]
         )  # combined: two response data items with same date; second has R = 1
         assertRow(data[32], datetime.datetime(2021, 4, 14), [None, None, None, 7200])
+        assertRow(data[65], datetime.datetime(2021, 7, 12), [72540, None, -250000, None]) #Negative
 
         self.assertDatesIncreaseSince(data, datetime.datetime(2020, 12, 26))