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 7337f2eb427bdce4af5a4fddae2b21b09e38a9b7..74e5ea7e8e5ad0543476f832a2dae144e7d40225 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 @@ -90,6 +90,14 @@ class RkiImport(db.Model): .order_by(cls.landkreis.asc())\ .all() + @classmethod + def get_landkreis_for_bundesland(cls, bundesland:str): + return db.session.query(cls.landkreis) \ + .filter(cls.bundesland == bundesland) \ + .distinct() \ + .order_by(cls.landkreis.asc()) \ + .all() + class RkiFlat(db.Model): __tablename__ = 'rki_import_flat' 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 276a56cd629fdc5d20936d0c5dea018a5a407d37..3c427016093d5a699113269eab1e20d78ce31bb9 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 @@ -70,6 +70,9 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase): app.logger.info("------------------------------------------------------------") RkiLandkreis.remove_all() self.__full_update_bundesland() + for bundesland in RkiBundesland.get_all(): + for landkreis_from_import in RkiImport.get_landkreis_for_bundesland(bundesland=bundesland.location_group): + app.logger.info("landkreis_from_import: "+str(landkreis_from_import)) app.logger.info("------------------------------------------------------------") app.logger.info("") app.logger.info(" RkiServiceUpdateFull.__full_update_landkreis [done]") diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_views.py b/src/flask_covid19/blueprints/data_rki_cases/rki_views.py index 9edfb09571e4f174579ffa0e98f32debe7269878..8bdba2064c8dded3022b3024454d3fa595802164 100644 --- a/src/flask_covid19/blueprints/data_rki_cases/rki_views.py +++ b/src/flask_covid19/blueprints/data_rki_cases/rki_views.py @@ -141,7 +141,7 @@ def task_rki_update_fact_table(self): @celery.task(bind=True) def task_rki_full_update_star_schema(self): self.update_state(state=states.STARTED) - rki_service.update_star_schema() + rki_service.full_update_star_schema() self.update_state(state=states.SUCCESS) result = "OK (task_rki_full_update_starschema)" return result @@ -238,7 +238,7 @@ def url_task_rki_update_fact_table(): return redirect(url_for('rki.url_rki_tasks')) -@app_rki.route('/task/update/full/star_schema') +@app_rki.route('/task/full/update/star_schema') def url_task_rki_full_update_star_schema(): app.logger.info("url_task_rki_full_update_star_schema [start]") task_rki_full_update_star_schema.apply_async() @@ -259,7 +259,7 @@ def url_task_rki_update_star_schema(): return redirect(url_for('rki.url_rki_tasks')) -@app_rki.route('/task/update/full') +@app_rki.route('/task/full/update') def url_task_rki_full_update(): app.logger.info("url_task_rki_full_update [start]") flash("url_task_rki_download [start]")