Skip to content

Commit eaf0757

Browse files
authored
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
1 parent 46a84f1 commit eaf0757

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

cepimose/parser.py

+10-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,16 @@ def get_manufacturer(num):
221221
date = parse_date(C[0])
222222
manufacturer = get_manufacturer((C[1]))
223223
setattr(manu_row, "date", date)
224-
setattr(manu_row, manufacturer, value) # reuse value from previous iteration
224+
setattr(
225+
manu_row, manufacturer, value
226+
) # reuse value from previous iteration
227+
228+
if R == 5:
229+
# same value, same date, but different manufacturer
230+
manufacturer = get_manufacturer((C[0]))
231+
setattr(
232+
parsed_data[-1], manufacturer, value
233+
) # reuse value from previous iteration
225234

226235
if R == 6:
227236
# same manufacturer and value as previous

test/test.py

+3
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ def assertRow(row, expected_date, expected):
104104
assertRow(
105105
data[65], datetime.datetime(2021, 7, 12), [72540, None, -250000, None]
106106
) # Negative
107+
assertRow(
108+
data[73], datetime.datetime(2021, 7, 30), [None, 12000, None, 12000]
109+
) # R = 5, combined: two response data items with same, date, same value, different manufacturer
107110

108111
self.assertDatesIncreaseSince(data, datetime.datetime(2020, 12, 26))
109112

0 commit comments

Comments
 (0)