From 9d51ef94e76d1aeb1e3add02ab243fce1ba256dc Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Wed, 11 Oct 2023 17:26:13 +0200
Subject: [PATCH] refactoring

---
 src/HowBadIsMyBatch.ipynb                     |  1 -
 .../PrrByVaccineBySymptomFactory.py           |  5 +++
 .../PrrByVaccineBySymptomFactoryTest.py       | 32 +++++++++++++++++++
 .../PrrByVaccineTableFactory.py               | 11 -------
 .../PrrByVaccineTableFactoryTest.py           | 31 ------------------
 5 files changed, 37 insertions(+), 43 deletions(-)
 create mode 100644 src/SymptomsCausedByVaccines/PrrByVaccineBySymptomFactory.py
 create mode 100644 src/SymptomsCausedByVaccines/PrrByVaccineBySymptomFactoryTest.py
 delete mode 100644 src/SymptomsCausedByVaccines/PrrByVaccineTableFactory.py
 delete mode 100644 src/SymptomsCausedByVaccines/PrrByVaccineTableFactoryTest.py

diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb
index 1ff43fbf6f7..51903cb0a4f 100644
--- a/src/HowBadIsMyBatch.ipynb
+++ b/src/HowBadIsMyBatch.ipynb
@@ -433,7 +433,6 @@
    "outputs": [],
    "source": [
     "from SymptomsCausedByVaccines.HtmlUpdater import updateHtmlFile\n",
-    "from SymptomsCausedByVaccines.PrrByVaccineTableFactory import PrrByVaccineTableFactory\n",
     "import pandas as pd"
    ]
   },
diff --git a/src/SymptomsCausedByVaccines/PrrByVaccineBySymptomFactory.py b/src/SymptomsCausedByVaccines/PrrByVaccineBySymptomFactory.py
new file mode 100644
index 00000000000..04f1484f088
--- /dev/null
+++ b/src/SymptomsCausedByVaccines/PrrByVaccineBySymptomFactory.py
@@ -0,0 +1,5 @@
+class PrrByVaccineBySymptomFactory:
+
+    @staticmethod
+    def getPrrByVaccineBySymptom(prrByVaccineAndSymptom):
+        return prrByVaccineAndSymptom.apply(lambda prrByVaccine: prrByVaccine.to_dict())
diff --git a/src/SymptomsCausedByVaccines/PrrByVaccineBySymptomFactoryTest.py b/src/SymptomsCausedByVaccines/PrrByVaccineBySymptomFactoryTest.py
new file mode 100644
index 00000000000..bd81d1f6db5
--- /dev/null
+++ b/src/SymptomsCausedByVaccines/PrrByVaccineBySymptomFactoryTest.py
@@ -0,0 +1,32 @@
+import unittest
+from pandas.testing import assert_series_equal
+from TestHelper import TestHelper
+import pandas as pd
+from SymptomsCausedByVaccines.PrrByVaccineBySymptomFactory import PrrByVaccineBySymptomFactory
+
+class PrrByVaccineBySymptomFactoryTest(unittest.TestCase):
+
+    def test_getPrrByVaccineBySymptom(self):
+        # Given
+        prrByVaccineAndSymptom = TestHelper.createDataFrame(
+                columns = ['11-beta-hydroxylase deficiency', '17-hydroxyprogesterone'],
+                data = [  [0.6,                              1.5],
+                          [0.3,                              3.0]],
+                index = pd.Index(
+                    name = 'VAX_TYPE',
+                    data = [
+                        '6VAX-F',
+                        'ADEN'
+                        ]))
+        
+        # When
+        prrByVaccineBySymptom = PrrByVaccineBySymptomFactory.getPrrByVaccineBySymptom(prrByVaccineAndSymptom)
+        
+        # Then
+        assert_series_equal(
+            prrByVaccineBySymptom,
+            pd.Series(
+                {
+                    '11-beta-hydroxylase deficiency': {'6VAX-F': 0.6, 'ADEN': 0.3},
+                    '17-hydroxyprogesterone': {'6VAX-F': 1.5, 'ADEN': 3.0}
+                }))
diff --git a/src/SymptomsCausedByVaccines/PrrByVaccineTableFactory.py b/src/SymptomsCausedByVaccines/PrrByVaccineTableFactory.py
deleted file mode 100644
index 3ad629f4782..00000000000
--- a/src/SymptomsCausedByVaccines/PrrByVaccineTableFactory.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import pandas as pd
-
-
-class PrrByVaccineTableFactory:
-
-    @staticmethod
-    def getPrrByVaccineTable(prrByVaccineAndSymptom):
-        return pd.DataFrame(
-            columns = ['11-beta-hydroxylase deficiency'],
-            data = [  [prrByVaccineAndSymptom['11-beta-hydroxylase deficiency'].to_dict()]],
-            index = pd.Index(['PrrByVaccine']))
diff --git a/src/SymptomsCausedByVaccines/PrrByVaccineTableFactoryTest.py b/src/SymptomsCausedByVaccines/PrrByVaccineTableFactoryTest.py
deleted file mode 100644
index f9825eca2a9..00000000000
--- a/src/SymptomsCausedByVaccines/PrrByVaccineTableFactoryTest.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import unittest
-from pandas.testing import assert_frame_equal
-from TestHelper import TestHelper
-import pandas as pd
-from SymptomsCausedByVaccines.PrrByVaccineTableFactory import PrrByVaccineTableFactory
-
-class PrrByVaccineTableFactoryTest(unittest.TestCase):
-
-    def test_getPrrByVaccineTable(self):
-        # Given
-        prrByVaccineAndSymptom = TestHelper.createDataFrame(
-                columns = ['11-beta-hydroxylase deficiency'],
-                data = [  [0.6],
-                          [0.3]],
-                index = pd.Index(
-                    name = 'VAX_TYPE',
-                    data = [
-                        '6VAX-F',
-                        'ADEN'
-                        ]))
-        
-        # When
-        prrByVaccineTable = PrrByVaccineTableFactory.getPrrByVaccineTable(prrByVaccineAndSymptom)
-        
-        # Then
-        assert_frame_equal(
-            prrByVaccineTable,
-            TestHelper.createDataFrame(
-                columns = ['11-beta-hydroxylase deficiency'],
-                data = [  [{'6VAX-F': 0.6, 'ADEN': 0.3}]],
-                index = pd.Index(['PrrByVaccine'])))