diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py index 1e6e8c8a9bd598974e4e1d516173e06526d8374c..7a8c007221361b36f008bb80aa1828f2107f025f 100644 --- a/src/covid19/blueprints/admin/admin_views.py +++ b/src/covid19/blueprints/admin/admin_views.py @@ -116,6 +116,27 @@ def task_admin_update_fact_table_initial_only(self): return result +@celery.task(bind=True) +def task_admin_update_fact_table_incremental_only(self): + logger = get_task_logger(__name__) + self.update_state(state=states.STARTED) + logger.info("------------------------------------------------------------") + logger.info(" task_admin_update_all_blueprints [start] ") + logger.info("------------------------------------------------------------") + who_service.update_fact_table_incremental_only() + ecdc_service.update_fact_table_incremental_only() + owid_service.update_fact_table_incremental_only() + rki_vaccination_service.update_fact_table_incremental_only() + rki_service_bundeslaender.update_fact_table_incremental_only() + rki_service_landkreise.update_fact_table_incremental_only() + logger.info("------------------------------------------------------------") + logger.info(" task_admin_update_all_blueprints [done] ") + logger.info("------------------------------------------------------------") + self.update_state(state=states.SUCCESS) + result = "OK (task_admin_update_all_blueprints)" + return result + + @app_admin.route('/') def url_admin_index(): page_info = ApplicationPage('Admin', "Covid19 Admin") @@ -224,7 +245,7 @@ def url_admin_update_dimension_tables_only(): return redirect(url_for('app_admin.url_admin_tasks')) -@app_admin.route('/update/fact_tables/all') +@app_admin.route('/update/fact_tables/initial/all') def url_admin_update_fact_table_initial_only(): app.logger.info("url_admin_update_fact_table_initial_only [start]") task_admin_update_fact_table_initial_only.apply_async() @@ -232,3 +253,13 @@ def url_admin_update_fact_table_initial_only(): app.logger.info("task_admin_update_fact_table_initial_only async started") app.logger.info("url_admin_update_fact_table_initial_only [done]") return redirect(url_for('app_admin.url_admin_tasks')) + + +@app_admin.route('/update/fact_tables/incremental/all') +def url_admin_update_fact_table_incremental_only(): + app.logger.info("url_admin_update_fact_table_incremental_only [start]") + task_admin_update_fact_table_incremental_only.apply_async() + flash("task_admin_update_fact_table_incremental_only async started") + app.logger.info("task_admin_update_fact_table_incremental_only async started") + app.logger.info("url_admin_update_fact_table_incremental_only [done]") + return redirect(url_for('app_admin.url_admin_tasks')) diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html index 41108712c003ff83dad5927c11ce6d1df3863225..7a039a265a8b453cbd1370ad9c01ac64ef0c1685 100644 --- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html +++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html @@ -37,8 +37,11 @@ href="{{ url_for( 'app_admin.url_admin_update_dimension_tables_only') }}" role="button">Admin :: update :: dimension_tables</a> <a class="btn btn-danger btn-lg btn-block text-left" - href="{{ url_for( 'app_admin.url_admin_update_fact_table_initial_only') }}" - role="button">Admin :: update :: fact_table :: initial</a> + href="{{ url_for( 'app_admin.url_admin_update_fact_table_incremental_only') }}" + role="button">Admin :: update :: fact_table :: incremental</a> + <a class="btn btn-danger btn-lg btn-block text-left" + href="{{ url_for( 'app_admin.url_admin_update_fact_table_incremental_only') }}" + role="button">Admin :: update :: fact_table :: incremental</a> </div> </div> </div> diff --git a/src/covid19/blueprints/ecdc/ecdc_service.py b/src/covid19/blueprints/ecdc/ecdc_service.py index 1e1f0411c8a784f6f772669d9eee34cd45bcb583..1cd1b35c4bf231b1a7e47e3c35f5570a63d0e250 100644 --- a/src/covid19/blueprints/ecdc/ecdc_service.py +++ b/src/covid19/blueprints/ecdc/ecdc_service.py @@ -75,3 +75,7 @@ class EcdcService: def update_fact_table_initial_only(self): self.service_update.update_fact_table_initial_only() return self + + def update_fact_table_incremental_only(self): + self.service_update.update_fact_table_incremental_only() + return self diff --git a/src/covid19/blueprints/owid/owid_service.py b/src/covid19/blueprints/owid/owid_service.py index 48ae2c135b08be997773ef76504885e9595ec356..470f77c6a765b478d8134900cf07bb3a630290d9 100644 --- a/src/covid19/blueprints/owid/owid_service.py +++ b/src/covid19/blueprints/owid/owid_service.py @@ -85,3 +85,8 @@ class OwidService: def update_fact_table_initial_only(self): self.service_update.update_fact_table_initial_only() return self + + def update_fact_table_incremental_only(self): + self.service_update.update_fact_table_incremental_only() + return self + diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_bundeslaender_service.py b/src/covid19/blueprints/rki_bundeslaender/rki_bundeslaender_service.py index 39c543df4dcd8fd731b0b6e60ba2ff17e1febd9e..0a0bda951d162c2675009dc76ab8fa6b6aa775cf 100644 --- a/src/covid19/blueprints/rki_bundeslaender/rki_bundeslaender_service.py +++ b/src/covid19/blueprints/rki_bundeslaender/rki_bundeslaender_service.py @@ -76,3 +76,7 @@ class RkiBundeslaenderService: def update_fact_table_initial_only(self): self.service_update.update_fact_table_initial_only() return self + + def update_fact_table_incremental_only(self): + self.service_update.update_fact_table_incremental_only() + return self diff --git a/src/covid19/blueprints/rki_landkreise/rki_landkreise_service.py b/src/covid19/blueprints/rki_landkreise/rki_landkreise_service.py index fccb4687058354b89c21e27b67d8701f0ea4ec7b..d1e1d19d3a6468744c86b2c2da098647a3399888 100644 --- a/src/covid19/blueprints/rki_landkreise/rki_landkreise_service.py +++ b/src/covid19/blueprints/rki_landkreise/rki_landkreise_service.py @@ -75,3 +75,7 @@ class RkiLandkreiseService: def update_fact_table_initial_only(self): self.service_update.update_fact_table_initial_only() return self + + def update_fact_table_incremental_only(self): + self.service_update.update_fact_table_incremental_only() + return self diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py index e802f0fde4529ffb5b409b0891b79daf38271446..0a4e119b9bc63d9c1848b467e6f8e6dec30ab14b 100644 --- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py +++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py @@ -74,3 +74,7 @@ class RkiVaccinationService: def update_fact_table_initial_only(self): self.service_update.update_fact_table_initial_only() return self + + def update_fact_table_incremental_only(self): + self.service_update.update_fact_table_incremental_only() + return self diff --git a/src/covid19/blueprints/who/who_service.py b/src/covid19/blueprints/who/who_service.py index 6300e0ef55502af410da7aba6e67e6da3468ae21..9a9f68827ae69f5026afbde443539359bc4bc82e 100644 --- a/src/covid19/blueprints/who/who_service.py +++ b/src/covid19/blueprints/who/who_service.py @@ -84,3 +84,7 @@ class WhoService: def update_fact_table_initial_only(self): self.service_update.update_fact_table_initial_only() return self + + def update_fact_table_incremental_only(self): + self.service_update.update_fact_table_incremental_only() + return self