diff --git a/BACKLOG.md b/BACKLOG.md
index 9cb91ff249259742540dc29f807596d406e06172..74b5f3d1c5e73e50fc2fa04bbba85d304eac38b7 100644
--- a/BACKLOG.md
+++ b/BACKLOG.md
@@ -219,7 +219,7 @@
* Issue #143 implement RkiBundeslaenderServiceUpdate.update_fact_table_initial_only
* Issue #144 implement RkiBundeslaenderServiceUpdate.update_star_schema_incremental
* Issue #145 implement RkiBundeslaenderServiceUpdate.update_star_schema_initial
-* Issue #147 refactor RkiBundeslaenderServiceUpdate.__update_who_date_reported
+* Fixed #147 refactor RkiBundeslaenderServiceUpdate.__update_who_date_reported
* Issue #148 refactor RkiBundeslaenderServiceUpdate.__update_who_region
* Issue #149 refactor RkiBundeslaenderServiceUpdate.__update_who_country
* Issue #150 refactor RkiBundeslaenderServiceUpdate.__update_who_global_data
diff --git a/src/covid19/blueprints/ecdc/ecdc_service.py b/src/covid19/blueprints/ecdc/ecdc_service.py
index f67525807d3ea55788dbc3f72b47f0c14d1ea143..8a45d8144bbd3cb5ff9ad9ec901180a3c391d16e 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service.py
@@ -1,6 +1,7 @@
from flask import flash
from database import app
+from covid19.blueprints.ecdc.ecdc_service_config import EcdcServiceConfig
from covid19.blueprints.ecdc.ecdc_service_download import EcdcServiceDownload
from covid19.blueprints.ecdc.ecdc_service_import import EcdcServiceImport
from covid19.blueprints.ecdc.ecdc_service_update import EcdcServiceUpdate
@@ -12,9 +13,10 @@ class EcdcService:
app.logger.debug(" ECDC Service [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.service_download = EcdcServiceDownload(database)
- self.service_import = EcdcServiceImport(database)
- self.service_update = EcdcServiceUpdate(database)
+ self.cfg = EcdcServiceConfig()
+ self.service_download = EcdcServiceDownload(database, self.cfg)
+ self.service_import = EcdcServiceImport(database, self.cfg)
+ self.service_update = EcdcServiceUpdate(database, self.cfg)
app.logger.debug("------------------------------------------------------------")
app.logger.info(" ECDC Service [ready] ")
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_download.py b/src/covid19/blueprints/ecdc/ecdc_service_download.py
index 29e74d361eec0182e1e2363d7fd47b2bc2b852a7..f9f5bb2486d930c3085a9dc43ca971356c2da13f 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_download.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_download.py
@@ -6,12 +6,12 @@ from covid19.blueprints.ecdc.ecdc_service_config import EcdcServiceConfig
class EcdcServiceDownload:
- def __init__(self, database):
+ def __init__(self, database, config: EcdcServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" ECDC Service Download [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = EcdcServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" ECDC Service Download [ready] ")
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_import.py b/src/covid19/blueprints/ecdc/ecdc_service_import.py
index a9ed2ea1f1b96062587fe2627c11502d0fb5b5a9..9c80e19f25598808d9c9068ff7efc187acf4464f 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_import.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_import.py
@@ -7,12 +7,12 @@ from covid19.blueprints.ecdc.ecdc_service_config import EcdcServiceConfig
class EcdcServiceImport:
- def __init__(self, database):
+ def __init__(self, database, config: EcdcServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" ECDC Service Import [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = EcdcServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" ECDC Service Import [ready] ")
@@ -60,6 +60,9 @@ class EcdcServiceImport:
app.logger.warning(error)
app.logger.warning("WARN: import ECDC [end]")
finally:
+ app.logger.info("")
+ app.logger.info("------------------------------------------------------------")
+ app.logger.info(" imported into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
app.logger.info(" import ECDC [done]")
return self
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_update.py b/src/covid19/blueprints/ecdc/ecdc_service_update.py
index 3a3570f067da4006d85ea7cff1eeb3156ac8df13..b2079e63a79b0a6918de979824570404741ec802 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_update.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_update.py
@@ -5,12 +5,12 @@ from covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcContinent,
class EcdcServiceUpdate:
- def __init__(self, database):
+ def __init__(self, database, config: EcdcServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" ECDC Service Update [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = EcdcServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" ECDC Service Update [ready] ")
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service.py b/src/covid19/blueprints/rki_bundeslaender/rki_service.py
index 362562be406b6becd04933937b8b9dc3c068da4b..87b0d9792fe228e024b3d7e445499840df6e8fec 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service.py
@@ -1,6 +1,7 @@
from flask import flash
from database import app
+from covid19.blueprints.rki_bundeslaender.rki_service_config import RkiBundeslaenderServiceConfig
from covid19.blueprints.rki_bundeslaender.rki_service_download import RkiBundeslaenderServiceDownload
from covid19.blueprints.rki_bundeslaender.rki_service_import import RkiBundeslaenderServiceImport
from covid19.blueprints.rki_bundeslaender.rki_service_update import RkiBundeslaenderServiceUpdate
@@ -13,9 +14,10 @@ class RkiBundeslaenderService:
app.logger.debug(" RKI Service [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.service_download = RkiBundeslaenderServiceDownload(database)
- self.service_import = RkiBundeslaenderServiceImport(database)
- self.service_update = RkiBundeslaenderServiceUpdate(database)
+ self.cfg = RkiBundeslaenderServiceConfig()
+ self.service_download = RkiBundeslaenderServiceDownload(database, self.cfg)
+ self.service_import = RkiBundeslaenderServiceImport(database, self.cfg)
+ self.service_update = RkiBundeslaenderServiceUpdate(database, self.cfg)
app.logger.debug("------------------------------------------------------------")
app.logger.info(" RKI Service [ready]")
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
index d62586784a58790d03d19c261ed161bb05ce0f38..1558c5635c187bd65e4c639d4a14412f4710e131 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
@@ -7,12 +7,12 @@ from covid19.blueprints.rki_bundeslaender.rki_service_config import RkiBundeslae
class RkiBundeslaenderServiceDownload:
- def __init__(self, database):
+ def __init__(self, database, config: RkiBundeslaenderServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Download [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = RkiBundeslaenderServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Download [ready]")
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
index c8c5d793c4e4e0236339908a37f0cb94b6b3518f..c9ea1c9b6c21a22c98341e3e79b0270c6771837c 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
@@ -1,5 +1,3 @@
-import os
-import sys
import csv
import psycopg2
@@ -9,12 +7,12 @@ from covid19.blueprints.rki_bundeslaender.rki_service_config import RkiBundeslae
class RkiBundeslaenderServiceImport:
- def __init__(self, database):
+ def __init__(self, database, config: RkiBundeslaenderServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Import [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = RkiBundeslaenderServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Import [ready]")
@@ -26,7 +24,7 @@ class RkiBundeslaenderServiceImport:
row = None
try:
RkiBundeslaenderImport.remove_all()
- with open(self.cfg.src_cvsfile_path, newline='\n') as csv_file:
+ with open(self.cfg.cvsfile_path, newline='\n') as csv_file:
file_reader = csv.DictReader(csv_file, delimiter=',', quotechar='"')
k = 0
for row in file_reader:
@@ -71,5 +69,7 @@ class RkiBundeslaenderServiceImport:
finally:
app.logger.info("")
app.logger.info("------------------------------------------------------------")
+ app.logger.info(" imported into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
+ app.logger.info("------------------------------------------------------------")
app.logger.info(" import RKI [done]")
return self
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_update.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_update.py
index e929b94867a37d3da3d842a79f7b64216ac08c7a..990f7709a9770c1d83a1e6b67f4f95464ab0cc18 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_update.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_update.py
@@ -3,22 +3,19 @@ from database import db, app
from covid19.blueprints.application.application_model import RkiRegion, RkiDateReported, RkiCountry
from covid19.blueprints.rki_bundeslaender.rki_model import RkiBundeslaender
from covid19.blueprints.rki_bundeslaender.rki_model_import import RkiBundeslaenderImport
+from covid19.blueprints.rki_bundeslaender.rki_service_config import RkiBundeslaenderServiceConfig
-rki_service_update = None
-
-# TODO: #123 split RkiService into two Services: RkiBundeslaenderService and RkiLandkreiseService
class RkiBundeslaenderServiceUpdate:
- def __init__(self, database):
+ def __init__(self, database, config: RkiBundeslaenderServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Update [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.limit_nr = 20
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Update [ready]")
- # TODO: #147 refactor RkiBundeslaenderServiceUpdate.__update_who_date_reported
def __update_who_date_reported(self):
app.logger.info(" update who_date_reported [begin]")
app.logger.info("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service.py b/src/covid19/blueprints/rki_landkreise/rki_service.py
index 17b11e1ee1ec2305d15e29e348aaa651502f651b..ea3915d7bdb5b11da442b375b5ab3b909a07201c 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service.py
@@ -1,6 +1,7 @@
from flask import flash
from database import app
+from covid19.blueprints.rki_landkreise.rki_service_config import RkiLandkreiseServiceConfig
from covid19.blueprints.rki_landkreise.rki_service_download import RkiLandkreiseServiceDownload
from covid19.blueprints.rki_landkreise.rki_service_import import RkiLandkreiseServiceImport
from covid19.blueprints.rki_landkreise.rki_service_update import RkiLandkreiseServiceUpdate
@@ -13,9 +14,10 @@ class RkiLandkreiseService:
app.logger.debug(" RkiLandkreiseService [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.service_download = RkiLandkreiseServiceDownload(database)
- self.service_import = RkiLandkreiseServiceImport(database)
- self.service_update = RkiLandkreiseServiceUpdate(database)
+ self.cfg = RkiLandkreiseServiceConfig()
+ self.service_download = RkiLandkreiseServiceDownload(database, self.cfg)
+ self.service_import = RkiLandkreiseServiceImport(database, self.cfg)
+ self.service_update = RkiLandkreiseServiceUpdate(database, self.cfg)
app.logger.debug("------------------------------------------------------------")
app.logger.info(" RkiLandkreiseService [ready]")
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_download.py b/src/covid19/blueprints/rki_landkreise/rki_service_download.py
index 964f617eae30a9f02dbf1d24d4dae2984b849146..197478163ab64df3566b6b12829e768319c20eed 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_download.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_download.py
@@ -7,12 +7,12 @@ from covid19.blueprints.rki_landkreise.rki_service_config import RkiLandkreiseSe
class RkiLandkreiseServiceDownload:
- def __init__(self, database):
+ def __init__(self, database, config: RkiLandkreiseServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Landkreise Service Download [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = RkiLandkreiseServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Landkreise Service Download [ready]")
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_import.py b/src/covid19/blueprints/rki_landkreise/rki_service_import.py
index 70025cfc204ec066daab7413008f0fd29ef3a128..815982e8e89275b84ebc66da902069a06ef260ae 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_import.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_import.py
@@ -9,12 +9,12 @@ from covid19.blueprints.rki_landkreise.rki_service_config import RkiLandkreiseSe
class RkiLandkreiseServiceImport:
- def __init__(self, database):
+ def __init__(self, database, config: RkiLandkreiseServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Landkreise Service Import [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = RkiLandkreiseServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Landkreise Service Import [ready]")
@@ -104,5 +104,7 @@ class RkiLandkreiseServiceImport:
finally:
app.logger.info("")
app.logger.info("------------------------------------------------------------")
+ app.logger.info(" imported into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
+ app.logger.info("------------------------------------------------------------")
app.logger.info(" RKI Landkreise Service Import - import_file [done]")
return self
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_update.py b/src/covid19/blueprints/rki_landkreise/rki_service_update.py
index 941573e62e02d0464cdac64e68f5624160455426..e84a2723bf9ca29e501b5f239d51e8f53ccd1cf0 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_update.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_update.py
@@ -3,17 +3,16 @@ from database import db, app
from covid19.blueprints.application.application_model import RkiRegion, RkiDateReported, RkiCountry
from covid19.blueprints.rki_landkreise.rki_model import RkiLandkreise
from covid19.blueprints.rki_landkreise.rki_model_import import RkiLandkreiseImport
-
-rki_service_update = None
+from covid19.blueprints.rki_landkreise.rki_service_config import RkiLandkreiseServiceConfig
class RkiLandkreiseServiceUpdate:
- def __init__(self, database):
+ def __init__(self, database, config: RkiLandkreiseServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Update [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.limit_nr = 20
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Update [ready]")
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py
index a5704f465e97c2ba0d479f4769be95818f3f59ef..7b536c924e91098f75c8c1f91549a60904cc8763 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py
@@ -14,9 +14,9 @@ class RkiVaccinationService:
app.logger.debug("------------------------------------------------------------")
self.__database = database
self.cfg = RkiVaccinationServiceConfig()
- self.service_download = RkiVaccinationServiceDownload(database)
- self.service_import = RkiVaccinationServiceImport(database)
- self.service_update = RkiVaccinationServiceUpdate(database)
+ self.service_download = RkiVaccinationServiceDownload(database, self.cfg)
+ self.service_import = RkiVaccinationServiceImport(database, self.cfg)
+ self.service_update = RkiVaccinationServiceUpdate(database, self.cfg)
app.logger.debug("------------------------------------------------------------")
app.logger.info(" Vaccination Service [ready]")
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
index 7b037368d54ef06d068c9c0a217539c5fd90bc81..88de3c4479d033113ed3d1f9012a137f684ce05b 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
@@ -6,12 +6,12 @@ from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import Rk
class RkiVaccinationServiceDownload:
- def __init__(self, database):
+ def __init__(self, database, config: RkiVaccinationServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Vaccination Service Download [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = RkiVaccinationServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Vaccination Service Download [ready]")
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index 6bf3c175b7f8fb22329a0296d863a6a5596973db..615cdaee49bc8b2347b1fef8d6e00d6a8f7f5140 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -8,12 +8,12 @@ from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import Rk
class RkiVaccinationServiceImport:
- def __init__(self, database):
+ def __init__(self, database, config: RkiVaccinationServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Vaccination Service Import [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = RkiVaccinationServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Vaccination Service Import [ready]")
@@ -78,5 +78,7 @@ class RkiVaccinationServiceImport:
finally:
app.logger.info("")
app.logger.info("------------------------------------------------------------")
+ app.logger.info(" imported into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
+ app.logger.info("------------------------------------------------------------")
app.logger.info(" import Vaccination [done]")
return self
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
index 2d5db2046e2dbc4a9b814baa36d18e554ce74f1e..67319e1bbdb0019ea67d5ae42a6cd9e565fd9576 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
@@ -6,12 +6,12 @@ from covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinat
class RkiVaccinationServiceUpdate:
- def __init__(self, database):
+ def __init__(self, database, config: RkiVaccinationServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Europe Service Update [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = RkiVaccinationServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Europe Service Update [ready] ")
@@ -40,7 +40,6 @@ class RkiVaccinationServiceUpdate:
result_date_rep = RkiVaccinationImport.get_date_rep()
i = 0
for item_date_rep, in result_date_rep:
- #dt = item_date_rep['date_rep']
date_reported = RkiVaccinationDateReported.find_by_date_reported(
p_date_reported=item_date_rep
)
diff --git a/src/covid19/blueprints/who/who_service.py b/src/covid19/blueprints/who/who_service.py
index 420548afeeb2fdd0eeb9ad221e0a43a07ee6156c..d7d6887eecaa7274232f834537e5288066b2c703 100644
--- a/src/covid19/blueprints/who/who_service.py
+++ b/src/covid19/blueprints/who/who_service.py
@@ -1,6 +1,7 @@
from flask import flash
from database import app
+from covid19.blueprints.who.who_service_config import WhoServiceConfig
from covid19.blueprints.who.who_service_download import WhoServiceDownload
from covid19.blueprints.who.who_service_import import WhoServiceImport
from covid19.blueprints.who.who_service_update import WhoServiceUpdate
@@ -12,9 +13,10 @@ class WhoService:
app.logger.debug(" WHO Service [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.service_download = WhoServiceDownload(database)
- self.service_import = WhoServiceImport(database)
- self.service_update = WhoServiceUpdate(database)
+ self.cfg = WhoServiceConfig()
+ self.service_download = WhoServiceDownload(database, self.cfg)
+ self.service_import = WhoServiceImport(database, self.cfg)
+ self.service_update = WhoServiceUpdate(database, self.cfg)
app.logger.debug("------------------------------------------------------------")
app.logger.info(" WHO Service [ready]")
diff --git a/src/covid19/blueprints/who/who_service_download.py b/src/covid19/blueprints/who/who_service_download.py
index 8696bfa24dc87819aee84142b157e5a76ba929fb..cb646d145802458f6be0c064c09ed4d0f2e943f8 100644
--- a/src/covid19/blueprints/who/who_service_download.py
+++ b/src/covid19/blueprints/who/who_service_download.py
@@ -6,12 +6,12 @@ from covid19.blueprints.who.who_service_config import WhoServiceConfig
class WhoServiceDownload:
- def __init__(self, database):
+ def __init__(self, database, config: WhoServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WHO Service Download [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = WhoServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WHO Service Download [ready]")
diff --git a/src/covid19/blueprints/who/who_service_import.py b/src/covid19/blueprints/who/who_service_import.py
index 1c48bdec1ba19ac4d458e2a114b6b6789e5e801b..b6e965ae815e1f0297e19fcd9abf6da686f48542 100644
--- a/src/covid19/blueprints/who/who_service_import.py
+++ b/src/covid19/blueprints/who/who_service_import.py
@@ -7,12 +7,12 @@ from covid19.blueprints.who.who_service_download import WhoServiceConfig
class WhoServiceImport:
- def __init__(self, database):
+ def __init__(self, database, config: WhoServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WHO Service Import [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = WhoServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WHO Service Import [ready]")
@@ -61,7 +61,8 @@ class WhoServiceImport:
app.logger.warning("WARN: import WHO [end]")
finally:
app.logger.info("")
- app.logger.info(" imported into TABLE: " + self.cfg.tablename + " from " + self.cfg.cvsfile_path)
+ app.logger.info("------------------------------------------------------------")
+ app.logger.info(" imported into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
app.logger.info(" import WHO [done]")
return self
diff --git a/src/covid19/blueprints/who/who_service_update.py b/src/covid19/blueprints/who/who_service_update.py
index 4059223c2fec6ebb0728c84944a495a31b55f335..7cfc02b07ab5cf1ddc3eda4c1e338da8425fadef 100644
--- a/src/covid19/blueprints/who/who_service_update.py
+++ b/src/covid19/blueprints/who/who_service_update.py
@@ -5,12 +5,12 @@ from covid19.blueprints.who.who_service_download import WhoServiceConfig
class WhoServiceUpdate:
- def __init__(self, database):
+ def __init__(self, database, config: WhoServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WHO Service Update [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.cfg = WhoServiceConfig()
+ self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WHO Service Update [ready]")