From 28e71af7af297d46fa2b5903816aab935f625c83 Mon Sep 17 00:00:00 2001
From: frankknoll <Knoll_Frank@web.de>
Date: Sun, 22 Jan 2023 23:54:54 +0100
Subject: [PATCH] refactoring

---
 src/SymptomsByBatchcodesTableFactory.py     | 10 +++++-----
 src/SymptomsByBatchcodesTableFactoryTest.py |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/SymptomsByBatchcodesTableFactory.py b/src/SymptomsByBatchcodesTableFactory.py
index 6c15d6da294..82de5b0a6c2 100644
--- a/src/SymptomsByBatchcodesTableFactory.py
+++ b/src/SymptomsByBatchcodesTableFactory.py
@@ -6,11 +6,11 @@ class SymptomsByBatchcodesTableFactory:
     @staticmethod
     def createSymptomsByBatchcodesTable(VAERSVAX, VAERSSYMPTOMS):
         index_columns = SymptomsByBatchcodesTableFactory._getIndexColumns(VAERSVAX)
-        symptomsColumn = 'SYMPTOMS'
+        symptomColumn = 'SYMPTOM'
         return pd.merge(
             SymptomsByBatchcodesTableFactory._get_VAERSVAX_WITH_VAX_LOTS(VAERSVAX, index_columns),
-            SymptomsByBatchcodesTableFactory._getSymptomsTable(VAERSSYMPTOMS, symptomsColumn),
-            on = 'VAERS_ID').set_index(index_columns)[[symptomsColumn]]
+            SymptomsByBatchcodesTableFactory._getSymptomsTable(VAERSSYMPTOMS, symptomColumn),
+            on = 'VAERS_ID').set_index(index_columns)[[symptomColumn]]
     
     @staticmethod
     def _getIndexColumns(VAERSVAX):
@@ -41,7 +41,7 @@ class SymptomsByBatchcodesTableFactory:
             index = VAX_LOT_LIST_Table.index)
 
     @staticmethod
-    def _getSymptomsTable(VAERSSYMPTOMS, symptomsColumn):
+    def _getSymptomsTable(VAERSSYMPTOMS, symptomColumn):
         return pd.concat(
             [
                 VAERSSYMPTOMS['SYMPTOM1'],
@@ -49,7 +49,7 @@ class SymptomsByBatchcodesTableFactory:
                 VAERSSYMPTOMS['SYMPTOM3'],
                 VAERSSYMPTOMS['SYMPTOM4'],
                 VAERSSYMPTOMS['SYMPTOM5']
-            ]).dropna().to_frame(name = symptomsColumn).reset_index()
+            ]).dropna().to_frame(name = symptomColumn).reset_index()
 
 def fillLsts(lsts, desiredLen, fillValue):
     return [fillLst(lst, desiredLen, fillValue) for lst in lsts]
diff --git a/src/SymptomsByBatchcodesTableFactoryTest.py b/src/SymptomsByBatchcodesTableFactoryTest.py
index 860ce55cd8e..1cc6d4b1549 100644
--- a/src/SymptomsByBatchcodesTableFactoryTest.py
+++ b/src/SymptomsByBatchcodesTableFactoryTest.py
@@ -41,7 +41,7 @@ class SymptomsByBatchcodesTableFactoryTest(unittest.TestCase):
         assert_frame_equal(
             symptomsByBatchcodesTable,
             TestHelper.createDataFrame(
-                columns = ['SYMPTOMS'],
+                columns = ['SYMPTOM'],
                 data = [  ['Blood pressure orthostatic abnormal'],
                           ['Head injury'],
                           ['SARS-CoV-2 test positive'],
@@ -90,7 +90,7 @@ class SymptomsByBatchcodesTableFactoryTest(unittest.TestCase):
         assert_frame_equal(
             symptomsByBatchcodesTable,
             TestHelper.createDataFrame(
-                columns = ['SYMPTOMS'],
+                columns = ['SYMPTOM'],
                 data = [  ['Blood pressure orthostatic abnormal'],
                           ['Blood pressure orthostatic abnormal']],
                 index = pd.Index(
@@ -140,7 +140,7 @@ class SymptomsByBatchcodesTableFactoryTest(unittest.TestCase):
         assert_frame_equal(
             symptomsByBatchcodesTable,
             TestHelper.createDataFrame(
-                columns = ['SYMPTOMS'],
+                columns = ['SYMPTOM'],
                 data = [  ['Blood pressure orthostatic abnormal'],
                           ['Head injury'],
                           ['SARS-CoV-2 test positive'],