From d56b17fd174ac2838c7241000fb05212143e8b36 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Fri, 27 Jan 2023 09:17:52 +0100
Subject: [PATCH] refactoring

---
 ...ter.py => DictByBatchcodeTable2DictConverter.py} | 13 ++++++-------
 ...py => DictByBatchcodeTable2DictConverterTest.py} | 11 +++++------
 2 files changed, 11 insertions(+), 13 deletions(-)
 rename src/{DictByBatchcodeTable2JsonConverter.py => DictByBatchcodeTable2DictConverter.py} (70%)
 rename src/{DictByBatchcodeTable2JsonConverterTest.py => DictByBatchcodeTable2DictConverterTest.py} (82%)

diff --git a/src/DictByBatchcodeTable2JsonConverter.py b/src/DictByBatchcodeTable2DictConverter.py
similarity index 70%
rename from src/DictByBatchcodeTable2JsonConverter.py
rename to src/DictByBatchcodeTable2DictConverter.py
index 11a9625efe5..95d7cc11a45 100644
--- a/src/DictByBatchcodeTable2JsonConverter.py
+++ b/src/DictByBatchcodeTable2DictConverter.py
@@ -1,15 +1,14 @@
 import json
 
 
-class DictByBatchcodeTable2JsonConverter:
+class DictByBatchcodeTable2DictConverter:
 
     @staticmethod
-    def convertDictByBatchcodeTable2Json(dictByBatchcodeTable, batchcode):
-        return json.dumps(
-            {
+    def convertDictByBatchcodeTable2Dict(dictByBatchcodeTable, batchcode):
+        return {
                 "batchcode": batchcode,
-                "histograms": DictByBatchcodeTable2JsonConverter._getHistograms(dictByBatchcodeTable)
-            })
+                "histograms": DictByBatchcodeTable2DictConverter._getHistograms(dictByBatchcodeTable)
+            }
 
     @staticmethod
     def _getHistograms(dictByBatchcodeTable):
@@ -17,7 +16,7 @@ class DictByBatchcodeTable2JsonConverter:
             dictByBatchcodeTable
                 .apply(
                     lambda row: {
-                        "batchcodes": DictByBatchcodeTable2JsonConverter._getNaNBatchcodes(row.name),
+                        "batchcodes": DictByBatchcodeTable2DictConverter._getNaNBatchcodes(row.name),
                         "histogram": row['SYMPTOM_COUNT_BY_VAX_LOT']
                     },
                     axis = 'columns')
diff --git a/src/DictByBatchcodeTable2JsonConverterTest.py b/src/DictByBatchcodeTable2DictConverterTest.py
similarity index 82%
rename from src/DictByBatchcodeTable2JsonConverterTest.py
rename to src/DictByBatchcodeTable2DictConverterTest.py
index 885a5ce5a05..a63279df731 100644
--- a/src/DictByBatchcodeTable2JsonConverterTest.py
+++ b/src/DictByBatchcodeTable2DictConverterTest.py
@@ -1,10 +1,10 @@
 import unittest
 import json
-from DictByBatchcodeTable2JsonConverter import DictByBatchcodeTable2JsonConverter
+from DictByBatchcodeTable2DictConverter import DictByBatchcodeTable2DictConverter
 from TestHelper import TestHelper
 import pandas as pd
 
-class DictByBatchcodeTable2JsonConverterTest(unittest.TestCase):
+class DictByBatchcodeTable2DictConverterTest(unittest.TestCase):
 
     def test_convertDictByBatchcodeTable2Json(self):
         # Given
@@ -28,12 +28,11 @@ class DictByBatchcodeTable2JsonConverterTest(unittest.TestCase):
                               ['015M20A',  '1808982',  'nan']]))
 
         # When
-        jsonActual = DictByBatchcodeTable2JsonConverter.convertDictByBatchcodeTable2Json(dictByBatchcodeTable, '1808982')
+        dict = DictByBatchcodeTable2DictConverter.convertDictByBatchcodeTable2Dict(dictByBatchcodeTable, '1808982')
 
         # Then
         self.assertEqual(
-            json.loads(jsonActual),
-            json.loads('''
+            dict,
                 {
                     "batchcode": "1808982",
                     "histograms": [
@@ -51,4 +50,4 @@ class DictByBatchcodeTable2JsonConverterTest(unittest.TestCase):
                             }
                         }
                     ]
-                }'''))
+                })