diff --git a/src/flask_covid19/blueprints/app_all/all_model.py b/src/flask_covid19/blueprints/app_all/all_model.py index 66016b96d87f5b83243de50da07229c3fac607ee..993ac0a92c78473711e92fcb3ad39feda55aae88 100644 --- a/src/flask_covid19/blueprints/app_all/all_model.py +++ b/src/flask_covid19/blueprints/app_all/all_model.py @@ -287,16 +287,16 @@ class BlueprintDateReported(db.Model): @classmethod # @cache.memoize(50) - def get_by_date_reported(cls, s_date_reported: str): + def get_by_date_reported(cls, s_date_reported_import_str: str): return db.session.query(cls)\ - .filter(cls.date_reported_import_str == s_date_reported)\ + .filter(cls.date_reported_import_str == s_date_reported_import_str)\ .one() @classmethod # @cache.memoize(50) - def find_by_date_reported(cls, s_date_reported: str): + def find_by_date_reported(cls, s_date_reported_import_str: str): return db.session.query(cls)\ - .filter(cls.date_reported_import_str == s_date_reported)\ + .filter(cls.date_reported_import_str == s_date_reported_import_str)\ .one_or_none() @classmethod diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_service_import.py b/src/flask_covid19/blueprints/data_rki_cases/rki_service_import.py index c9b6f39c8600833f213ce6b9b6f2765e38d9065f..8f47cff18b4cd820f69f7426633619f086664835 100644 --- a/src/flask_covid19/blueprints/data_rki_cases/rki_service_import.py +++ b/src/flask_covid19/blueprints/data_rki_cases/rki_service_import.py @@ -32,8 +32,8 @@ class RkiServiceImport: for row in file_reader: k = k + 1 meldedatum = row['Meldedatum'] - app.logger.info("RKI meldedatum: "+meldedatum) d = RkiMeldedatum.create_new_object_factory(my_date_rep=meldedatum) + app.logger.info("RKI meldedatum: " + str(d) + " " + meldedatum) o = RkiImport( fid=row['FID'], id_bundesland=row['IdBundesland'], diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_service_update.py b/src/flask_covid19/blueprints/data_rki_cases/rki_service_update.py index 2e65eff5824b621f03896a43c250cb0695b68808..c5759721eb448b3d3ffd18d896761aea8ac65607 100644 --- a/src/flask_covid19/blueprints/data_rki_cases/rki_service_update.py +++ b/src/flask_covid19/blueprints/data_rki_cases/rki_service_update.py @@ -27,7 +27,7 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase): output = " [ " + str(i) + " ] " + aktualisierung c = RkiMeldedatum.find_by_date_reported(aktualisierung) if c is None: - o = RkiMeldedatum.create_new_object_factory(aktualisierung=aktualisierung) + o = RkiMeldedatum.create_new_object_factory(my_date_rep=aktualisierung) db.session.add(o) db.session.commit() output += " added"