From 11df7a0a4d95bbb6203bb80f2f04dc36ee041693 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Tue, 14 Feb 2023 23:39:14 +0100
Subject: [PATCH] refactoring

---
 src/DictByBatchcodeTable2DictConverter.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/DictByBatchcodeTable2DictConverter.py b/src/DictByBatchcodeTable2DictConverter.py
index 2c69451f295..510c072409f 100644
--- a/src/DictByBatchcodeTable2DictConverter.py
+++ b/src/DictByBatchcodeTable2DictConverter.py
@@ -6,20 +6,19 @@ class DictByBatchcodeTable2DictConverter:
                 "batchcode": batchcode,
                 "histograms": DictByBatchcodeTable2DictConverter._getHistograms(dictByBatchcodeTable)
             }
-
+    
     @staticmethod
     def _getHistograms(dictByBatchcodeTable):
-        return (
-            dictByBatchcodeTable
-                .apply(
-                    lambda row: {
-                        "batchcodes": DictByBatchcodeTable2DictConverter._getNaNBatchcodes(row.name),
-                        "histogram": row['SYMPTOM_COUNT_BY_VAX_LOT']
-                    },
-                    axis = 'columns')
-                .to_list()
-        )
+        dictByBatchcodeTable = dictByBatchcodeTable.rename(columns = { "SYMPTOM_COUNT_BY_VAX_LOT": "histogram" })
+        DictByBatchcodeTable2DictConverter._addBatchcodesColumn(dictByBatchcodeTable)
+        return dictByBatchcodeTable.to_dict('records')
     
+    @staticmethod
+    def _addBatchcodesColumn(dictByBatchcodeTable):
+        batchcodeColumns = dictByBatchcodeTable.index.names
+        dictByBatchcodeTable['batchcodes'] = dictByBatchcodeTable.reset_index()[batchcodeColumns].values.tolist()
+        dictByBatchcodeTable['batchcodes'] = dictByBatchcodeTable['batchcodes'].map(DictByBatchcodeTable2DictConverter._getNaNBatchcodes)
+
     @staticmethod
     def _getNaNBatchcodes(batchcodes):
         # FK-TODO: handle 'nan' everywhere correctly