From f74f007ffbb9861a0476319fc4278dd26aca3b06 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Mon, 3 Apr 2023 21:45:12 +0200
Subject: [PATCH] refactoring

---
 src/ADRColumnAdder.py                   | 15 ---------------
 src/Column2DataframeAdder.py            | 11 +++++++++++
 src/HowBadIsMyBatch.ipynb               | 11 ++++-------
 src/OVERALL_DOSES_SHIPPEDColumnAdder.py | 16 ----------------
 4 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 src/ADRColumnAdder.py
 create mode 100644 src/Column2DataframeAdder.py
 delete mode 100644 src/OVERALL_DOSES_SHIPPEDColumnAdder.py

diff --git a/src/ADRColumnAdder.py b/src/ADRColumnAdder.py
deleted file mode 100644
index 259980fbbff..00000000000
--- a/src/ADRColumnAdder.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import pandas as pd
-
-class ADRColumnAdder:
-    
-    def __init__(self, ADR_by_Batchcode):
-        self.ADR_by_Batchcode = ADR_by_Batchcode
-
-    def addADRColumn(self, vaccineDistributionByZipcode):
-        return pd.merge(
-            vaccineDistributionByZipcode,
-            self.ADR_by_Batchcode,
-            how = 'left',
-            left_on = 'LOT_NUMBER',
-            right_index = True,
-            validate = 'many_to_one')
diff --git a/src/Column2DataframeAdder.py b/src/Column2DataframeAdder.py
new file mode 100644
index 00000000000..437edaf1d4b
--- /dev/null
+++ b/src/Column2DataframeAdder.py
@@ -0,0 +1,11 @@
+import pandas as pd
+
+
+def addColumn2Dataframe(dataframe, column):
+    return pd.merge(
+        dataframe,
+        column,
+        how = 'left',
+        left_on = 'LOT_NUMBER',
+        right_index = True,
+        validate = 'many_to_one')
diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index e48affa6a11..ad2c9406738 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -21,7 +21,8 @@
     "from BatchCodeTablePersister import createAndSaveGlobalBatchCodeTable\n",
     "from SymptomByBatchcodeTableFactory import SymptomByBatchcodeTableFactory\n",
     "from HistogramFactoryAndPersister import createAndSaveGlobalHistograms\n",
-    "from BatchCodeTableFactory import BatchCodeTableFactory"
+    "from BatchCodeTableFactory import BatchCodeTableFactory\n",
+    "from Column2DataframeAdder import addColumn2Dataframe"
    ]
   },
   {
@@ -208,9 +209,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from OVERALL_DOSES_SHIPPEDColumnAdder import OVERALL_DOSES_SHIPPEDColumnAdder\n",
-    "\n",
-    "vaccineDistributionByZipcode = OVERALL_DOSES_SHIPPEDColumnAdder(OVERALL_DOSES_SHIPPED_by_LOT_NUMBER).addColumn(vaccineDistributionByZipcode)\n",
+    "vaccineDistributionByZipcode = addColumn2Dataframe(dataframe = vaccineDistributionByZipcode, column = OVERALL_DOSES_SHIPPED_by_LOT_NUMBER)\n",
     "vaccineDistributionByZipcode"
    ]
   },
@@ -234,9 +233,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from ADRColumnAdder import ADRColumnAdder\n",
-    "\n",
-    "vaccineDistributionByZipcode = ADRColumnAdder(ADR_by_Batchcode_Table_4USA).addADRColumn(vaccineDistributionByZipcode)\n",
+    "vaccineDistributionByZipcode = addColumn2Dataframe(dataframe = vaccineDistributionByZipcode, column = ADR_by_Batchcode_Table_4USA)\n",
     "vaccineDistributionByZipcode"
    ]
   },
diff --git a/src/OVERALL_DOSES_SHIPPEDColumnAdder.py b/src/OVERALL_DOSES_SHIPPEDColumnAdder.py
deleted file mode 100644
index 57d975f0e2f..00000000000
--- a/src/OVERALL_DOSES_SHIPPEDColumnAdder.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import pandas as pd
-
-# FK-TODO: DRY with ADRColumnAdder
-class OVERALL_DOSES_SHIPPEDColumnAdder:
-    
-    def __init__(self, OVERALL_DOSES_SHIPPED_by_LOT_NUMBER):
-        self.OVERALL_DOSES_SHIPPED_by_LOT_NUMBER = OVERALL_DOSES_SHIPPED_by_LOT_NUMBER
-
-    def addColumn(self, vaccineDistributionByZipcode):
-        return pd.merge(
-            vaccineDistributionByZipcode,
-            self.OVERALL_DOSES_SHIPPED_by_LOT_NUMBER,
-            how = 'left',
-            left_on = 'LOT_NUMBER',
-            right_index = True,
-            validate = 'many_to_one')