diff --git a/org/woehlke/covid19/common/common_model.py b/org/woehlke/covid19/common/common_model.py index 1b92a315d144d4b3be2c4848d3cda972de58b375..8f05215c01094162dddf991c41755cd50b4a5760 100644 --- a/org/woehlke/covid19/common/common_model.py +++ b/org/woehlke/covid19/common/common_model.py @@ -19,7 +19,7 @@ class CommonDatum(db.Model): week_of_year = db.Column(db.Integer, nullable=True) @classmethod - def create_rw_datum_factory(cls, date_string): + def create_new_datum_factory(cls, date_string): # check date_string syntax # load if already exists old = db.session.query(cls).filter(cls.date_string == date_string).one_or_none() diff --git a/org/woehlke/covid19/common/common_service.py b/org/woehlke/covid19/common/common_service.py index 52d798c643f031c29ab2238f53bd42c1d7f1fc1f..071a3722373c90a188957719bacf17612f5d05bd 100644 --- a/org/woehlke/covid19/common/common_service.py +++ b/org/woehlke/covid19/common/common_service.py @@ -1,7 +1,6 @@ import os -from database import app -from org.woehlke.covid19.vaccination.vaccination_service_download import VaccinationServiceDownload -from org.woehlke.covid19.vaccination.vaccination_service_import import VaccinationServiceImport +from database import app, db +from org.woehlke.covid19.common.common_model import CommonDatum common_service = None @@ -13,10 +12,5 @@ class CommonService: app.logger.info("------------------------------------------------------------") self.__database = database self.limit_nr = 20 - self.vaccination_service_download = VaccinationServiceDownload(database) - self.vaccination_service_import = VaccinationServiceImport(database) app.logger.info("------------------------------------------------------------") app.logger.info(" Common Service [ready]") - - def add_new_datum(self, date_string): - return self \ No newline at end of file