refactoring

src/HowBadIsMyBatch.ipynb

@@ -15,9 +15,10 @@
     "from SymptomByBatchcodeTableFactory import SymptomByBatchcodeTableFactory\n",
     "from BatchCodeTablePersister import createGlobalBatchCodeTable\n",
     "from BatchCodeTableHtmlUpdater import updateBatchCodeTableHtmlFile, saveLastUpdatedBatchCodeTable\n",
-    "from InternationalVaersCovid19Provider import getInternationalVaersCovid19, get_international_VAERSVAX_VAERSSYMPTOMS_Covid19\n",
+    "from InternationalVaersCovid19Provider import getInternationalVaersCovid19, getInternationalVaersCovid19BeforeDeletion, get_international_VAERSVAX_VAERSSYMPTOMS_Covid19\n",
     "from DateProvider import DateProvider\n",
     "from BarChartDescriptionTable2DictionaryConverter import BarChartDescriptionTable2DictionaryConverter\n",
+    "from CountryColumnsMerger import CountryColumnsMerger\n",
     "from datetime import datetime\n",
     "from VAERSFileDownloader import updateVAERSFiles\n",
     "from IOUtils import IOUtils\n",
@@ -115,6 +116,19 @@
     "internationalVaersCovid19"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "29366235",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "internationalVaersCovid19 = CountryColumnsMerger.mergeCountryColumnOfSrcIntoDst(\n",
+    "    src = getInternationalVaersCovid19BeforeDeletion(),\n",
+    "    dst = internationalVaersCovid19)\n",
+    "internationalVaersCovid19"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -139,7 +153,7 @@
     "IOUtils.saveDataFrameAsJson(batchCodeTable, '../docs/data/batchCodeTables/Global.json')\n",
     "saveLastUpdatedBatchCodeTable(\n",
     "    DateProvider().getLastUpdatedDataSource(),\n",
-    "    batchCodeTableHtmlFile=\"../docs/batchCodes.html\")"
+    "    batchCodeTableHtmlFile = \"../docs/batchCodes.html\")"
    ]
   },
   {
@@ -205,7 +219,7 @@
    "outputs": [],
    "source": [
     "IOUtils.saveDictAsJson(\n",
-    "    BarChartDescriptionTable2DictionaryConverter.convert2Dictionary(barChartDescriptionTable),\n",
+    "    BarChartDescriptionTable2DictionaryConverter.convert2Dictionary(barChartDescriptionTable, internationalVaersCovid19),\n",
     "    '../docs/data/barChartDescriptionTable.json')\n"
    ]
   },