From 56a903ebbe133f24c4e21ca4ca6f9f2bf73857c5 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Thu, 26 Jan 2023 23:31:34 +0100 Subject: [PATCH] refining DictByBatchcodeTable2JsonConverterTest --- src/DictByBatchcodeTable2JsonConverter.py | 6 +++++- src/DictByBatchcodeTable2JsonConverterTest.py | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/DictByBatchcodeTable2JsonConverter.py b/src/DictByBatchcodeTable2JsonConverter.py index d9292736548..e7340e24537 100644 --- a/src/DictByBatchcodeTable2JsonConverter.py +++ b/src/DictByBatchcodeTable2JsonConverter.py @@ -17,9 +17,13 @@ class DictByBatchcodeTable2JsonConverter: dictByBatchcodeTable .apply( lambda row: { - "batchcodes": list(row.name), + "batchcodes": DictByBatchcodeTable2JsonConverter._getNaNBatchcodes(row.name), "histogram": row['SYMPTOM_COUNT_BY_VAX_LOT'] }, axis = 'columns') .to_list() ) + + @staticmethod + def _getNaNBatchcodes(batchcodes): + return [batchcode for batchcode in batchcodes if batchcode != 'nan'] diff --git a/src/DictByBatchcodeTable2JsonConverterTest.py b/src/DictByBatchcodeTable2JsonConverterTest.py index 4e64c5507d0..885a5ce5a05 100644 --- a/src/DictByBatchcodeTable2JsonConverterTest.py +++ b/src/DictByBatchcodeTable2JsonConverterTest.py @@ -23,9 +23,9 @@ class DictByBatchcodeTable2JsonConverterTest(unittest.TestCase): ] ], index = pd.MultiIndex.from_tuples( - names = ['VAX_LOT1', 'VAX_LOT2'], - tuples = [['1808982', 'EW0175'], - ['015M20A', '1808982']])) + names = ['VAX_LOT1', 'VAX_LOT2', 'VAX_LOT3'], + tuples = [['1808982', 'EW0175', 'FD1921'], + ['015M20A', '1808982', 'nan']])) # When jsonActual = DictByBatchcodeTable2JsonConverter.convertDictByBatchcodeTable2Json(dictByBatchcodeTable, '1808982') @@ -38,7 +38,7 @@ class DictByBatchcodeTable2JsonConverterTest(unittest.TestCase): "batchcode": "1808982", "histograms": [ { - "batchcodes": ["1808982", "EW0175"], + "batchcodes": ["1808982", "EW0175", "FD1921"], "histogram": { "Blood pressure orthostatic abnormal": 5, "Chest discomfort": 1