From eaf075759ec780197d92d04cc5da914207248300 Mon Sep 17 00:00:00 2001 From: Jaka Daneu <44704999+jalezi@users.noreply.github.com> Date: Mon, 6 Sep 2021 13:25:21 +0200 Subject: [PATCH] Vaccines supplied by manufacturer: add support for R = 5 (#43) * test: adjust vaccination by day assertion data * test: adjust vacs date range assertion data * feat(vaccines_supplied_by_manufacturer): handle ... ...response data item if R == 5 same date, same value, different manufacturer --- cepimose/parser.py | 11 ++++++++++- test/test.py | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cepimose/parser.py b/cepimose/parser.py index 8e1cd7f..fe35628 100644 --- a/cepimose/parser.py +++ b/cepimose/parser.py @@ -221,7 +221,16 @@ def get_manufacturer(num): date = parse_date(C[0]) manufacturer = get_manufacturer((C[1])) setattr(manu_row, "date", date) - setattr(manu_row, manufacturer, value) # reuse value from previous iteration + setattr( + manu_row, manufacturer, value + ) # reuse value from previous iteration + + if R == 5: + # same value, same date, but different manufacturer + manufacturer = get_manufacturer((C[0])) + setattr( + parsed_data[-1], manufacturer, value + ) # reuse value from previous iteration if R == 6: # same manufacturer and value as previous diff --git a/test/test.py b/test/test.py index eb4d652..88f7a98 100644 --- a/test/test.py +++ b/test/test.py @@ -104,6 +104,9 @@ def assertRow(row, expected_date, expected): assertRow( data[65], datetime.datetime(2021, 7, 12), [72540, None, -250000, None] ) # Negative + assertRow( + data[73], datetime.datetime(2021, 7, 30), [None, 12000, None, 12000] + ) # R = 5, combined: two response data items with same, date, same value, different manufacturer self.assertDatesIncreaseSince(data, datetime.datetime(2020, 12, 26))