francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2023-01-27 09:17:52 +01:00
parent cb2dffcb57
commit d56b17fd17
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/DictByBatchcodeTable2JsonConverter.py → src/DictByBatchcodeTable2DictConverter.py
View File

@@ -1,15 +1,14 @@
import json import json
class DictByBatchcodeTable2JsonConverter: class DictByBatchcodeTable2DictConverter:
@staticmethod @staticmethod
def convertDictByBatchcodeTable2Json(dictByBatchcodeTable, batchcode): def convertDictByBatchcodeTable2Dict(dictByBatchcodeTable, batchcode):
return json.dumps( return {
{
"batchcode": batchcode, "batchcode": batchcode,
"histograms": DictByBatchcodeTable2JsonConverter._getHistograms(dictByBatchcodeTable) "histograms": DictByBatchcodeTable2DictConverter._getHistograms(dictByBatchcodeTable)
}) }
@staticmethod @staticmethod
def _getHistograms(dictByBatchcodeTable): def _getHistograms(dictByBatchcodeTable):
@@ -17,7 +16,7 @@ class DictByBatchcodeTable2JsonConverter:
dictByBatchcodeTable dictByBatchcodeTable
.apply( .apply(
lambda row: { lambda row: {
"batchcodes": DictByBatchcodeTable2JsonConverter._getNaNBatchcodes(row.name), "batchcodes": DictByBatchcodeTable2DictConverter._getNaNBatchcodes(row.name),
"histogram": row['SYMPTOM_COUNT_BY_VAX_LOT'] "histogram": row['SYMPTOM_COUNT_BY_VAX_LOT']
}, },
axis = 'columns') axis = 'columns')

11
src/DictByBatchcodeTable2JsonConverterTest.py → src/DictByBatchcodeTable2DictConverterTest.py
View File

@@ -1,10 +1,10 @@
import unittest import unittest
import json import json
from DictByBatchcodeTable2JsonConverter import DictByBatchcodeTable2JsonConverter from DictByBatchcodeTable2DictConverter import DictByBatchcodeTable2DictConverter
from TestHelper import TestHelper from TestHelper import TestHelper
import pandas as pd import pandas as pd
class DictByBatchcodeTable2JsonConverterTest(unittest.TestCase): class DictByBatchcodeTable2DictConverterTest(unittest.TestCase):
def test_convertDictByBatchcodeTable2Json(self): def test_convertDictByBatchcodeTable2Json(self):
# Given # Given
@@ -28,12 +28,11 @@ class DictByBatchcodeTable2JsonConverterTest(unittest.TestCase):
['015M20A', '1808982', 'nan']])) ['015M20A', '1808982', 'nan']]))
# When # When
jsonActual = DictByBatchcodeTable2JsonConverter.convertDictByBatchcodeTable2Json(dictByBatchcodeTable, '1808982') dict = DictByBatchcodeTable2DictConverter.convertDictByBatchcodeTable2Dict(dictByBatchcodeTable, '1808982')
# Then # Then
self.assertEqual( self.assertEqual(
json.loads(jsonActual), dict,
json.loads('''
{ {
"batchcode": "1808982", "batchcode": "1808982",
"histograms": [ "histograms": [
@@ -51,4 +50,4 @@ class DictByBatchcodeTable2JsonConverterTest(unittest.TestCase):
} }
} }
] ]
}''')) })