refining HistogramTable2DictTableConverterTest

This commit is contained in:
frankknoll
2023-02-08 16:33:04 +01:00
parent 197321b2da
commit 16e6c2a729
2 changed files with 13 additions and 11 deletions

View File

@@ -3,11 +3,11 @@ class HistogramTable2DictTableConverter:
@staticmethod
def convertHistogramTable2DictTable(symptomHistogramByBatchcodeTable):
vax_lot_columns = symptomHistogramByBatchcodeTable.index.names.difference(['SYMPTOM'])
return (
symptomHistogramByBatchcodeTable
.groupby(vax_lot_columns)
return (symptomHistogramByBatchcodeTable
.groupby(vax_lot_columns + ['COUNTRY'])
.agg(lambda histogram_with_vax_lots: HistogramTable2DictTableConverter._histogram_to_json(histogram_with_vax_lots, vax_lot_columns))
)
.reset_index(level = 'COUNTRY')
[['SYMPTOM_COUNT_BY_VAX_LOT', 'COUNTRY']])
@staticmethod
def _histogram_to_json(histogram_with_vax_lots, vax_lot_columns):

View File

@@ -9,10 +9,10 @@ class HistogramTable2DictTableConverterTest(unittest.TestCase):
def test_convertHistogramTable2DictTable(self):
# Given
histogramTable = TestHelper.createDataFrame(
columns = ['SYMPTOM_COUNT_BY_VAX_LOT'],
data = [ [5],
[1],
[2]],
columns = ['SYMPTOM_COUNT_BY_VAX_LOT', 'COUNTRY'],
data = [ [5, 'Germany'],
[1, 'Germany'],
[2, 'Russian Federation']],
index = pd.MultiIndex.from_tuples(
names = ['VAX_LOT1', 'SYMPTOM'],
tuples = [['1808982', 'Blood pressure orthostatic abnormal'],
@@ -26,17 +26,19 @@ class HistogramTable2DictTableConverterTest(unittest.TestCase):
assert_frame_equal(
dictTable,
TestHelper.createDataFrame(
columns = ['SYMPTOM_COUNT_BY_VAX_LOT'],
columns = ['SYMPTOM_COUNT_BY_VAX_LOT', 'COUNTRY'],
data = [ [
{
"Blood pressure orthostatic abnormal": 5,
"Chest discomfort": 1
}
},
'Germany'
],
[
{
"Chest discomfort": 2
}
},
'Russian Federation'
]],
index = pd.Index(
name = 'VAX_LOT1',