work

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()

org/woehlke/covid19/common/common_service.py

 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