diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py b/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py index 1354293f5a98de5be1de3f101c5148460d555902..c74a6a7707ed60bf4f8271f7b693b6dff52221e2 100644 --- a/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py +++ b/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py @@ -100,7 +100,7 @@ class RkiImport(db.Model): @classmethod def find_by_datum(cls, my_datum: date): - db.session.query(cls) \ + return db.session.query(cls) \ .filter(cls.datum == my_datum) \ .order_by(cls.landkreis.asc()) \ .all() 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 78dec8c5b8db0a142e9dc08eff06b25672b58fdd..668acbb3a1f4d930c7fa57059b63de97446e43f4 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 @@ -101,12 +101,23 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase): RkiData.remove_all() i = 0 locations = RkiLandkreis.get_all_as_dict() - for l_key in locations.keys(): - app.logger.info(" location: " + str(l_key) + " -> " + str(locations[l_key])) + # for l_key in locations.keys(): + # app.logger.info(" location: " + str(l_key) + " -> " + str(locations[l_key])) + # app.logger.info("------------------------------------------------------------") for d_meldedatum in RkiMeldedatum.get_all(): - app.logger.info(" d_meldedatum: " + str(d_meldedatum) + " " + d_meldedatum.datum.isoformat()) - l_imports = RkiImport.find_by_datum(my_datum=d_meldedatum.datum) + d = d_meldedatum.datum + # app.logger.info(" d_meldedatum: " + str(d_meldedatum) + " " + d.isoformat()) + # app.logger.info("------------------------------------------------------------") + l_imports = RkiImport.find_by_datum(my_datum=d) + # if l_imports is None: + # app.logger.info("l_imports is None ") + # else: + # nr = len(l_imports) + # app.logger.info("len(l_imports): " + str(nr)) + # app.logger.info("------------------------------------------------------------") for o_import in l_imports: + i += 1 + # app.logger.info("o_import.landkreis " + o_import.landkreis) o = RkiData( meldedatum=d_meldedatum, landkreis=locations[o_import.landkreis], @@ -128,7 +139,7 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase): ) db.session.add(o) i += 1 - if i % 500 == 0: + if i % 2000 == 0: app.logger.info(" update WHO initial ... "+str(i)+" rows") db.session.commit() db.session.commit()