diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py index 192df9e960a61cfc25877d958ecb9b323c3e66f5..38911c463f494bbc43152db9d2bb4f7efaa023bf 100644 --- a/src/covid19/blueprints/admin/admin_views.py +++ b/src/covid19/blueprints/admin/admin_views.py @@ -5,7 +5,8 @@ from flask_admin.contrib.sqla import ModelView from database import app, admin, db from covid19.blueprints.application.application_services import who_service, ecdc_service, rki_vaccination_service -from covid19.blueprints.application.application_services import rki_service_bundeslaender, admin_service +from covid19.blueprints.application.application_services import rki_service_bundeslaender, rki_service_landkreise +from covid19.blueprints.application.application_services import admin_service from covid19.blueprints.application.application_workers import celery from covid19.blueprints.application.application_model_transient import ApplicationPage @@ -98,6 +99,7 @@ def url_admin_database_import(): app.logger.info("url_admin_database_import [done]") return redirect(url_for('app_admin.url_admin_tasks')) + @app_admin.route('/database/dropcreate/only') def url_admin_database_dropcreate_only(): app.logger.info("url_admin_database_drop [start]") @@ -106,6 +108,7 @@ def url_admin_database_dropcreate_only(): app.logger.info("url_admin_database_drop [done]") return redirect(url_for('app_admin.url_admin_tasks')) + @app_admin.route('/database/drop') def url_admin_database_drop(): app.logger.info("url_admin_database_drop [start]") @@ -120,3 +123,19 @@ def url_admin_database_drop(): task_admin_database_drop_create.apply_async() app.logger.info("url_admin_database_drop [done]") return redirect(url_for('app_admin.url_admin_tasks')) + + +@app_admin.route('/download/all') +def url_admin_download_all_files(): + who_service.download_all_files() + flash("who_service.download_all_files Done") + ecdc_service.download_all_files() + flash("who_service.download_all_files Done") + rki_vaccination_service.download_all_files() + flash("who_service.download_all_files Done") + rki_service_bundeslaender.download_all_files() + flash("who_service.download_all_files Done") + rki_service_landkreise.download_all_files() + flash("who_service.download_all_files Done") + app.logger.info("url_admin_download_all_files [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 af6258ce246551df96a69ac6948115de94afe681..930a7cbe2c2350365a8b7011ddcf15e97f21189d 100644 --- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html +++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html @@ -23,6 +23,9 @@ <a class="btn btn-primary btn-lg btn-block text-left" href="{{ url_for( 'app_admin.url_admin_database_dump') }}" role="button">Admin :: database :: dump</a> + <a class="btn btn-primary btn-lg btn-block text-left" + href="{{ url_for( 'app_admin.url_admin_download_all_files') }}" + role="button">Admin :: url_admin_download_all_files </a> </div> </div> </div> diff --git a/src/covid19/blueprints/ecdc/ecdc_service.py b/src/covid19/blueprints/ecdc/ecdc_service.py index 036a91eb8f17d418ac190b5d392fb1f2d872e5e8..beac35bd265d63e7b1f674697bb577f9bec792e1 100644 --- a/src/covid19/blueprints/ecdc/ecdc_service.py +++ b/src/covid19/blueprints/ecdc/ecdc_service.py @@ -67,3 +67,7 @@ class EcdcService: self.ecdc_service_import.import_datafile_to_db() self.ecdc_service_update.update_star_schema_initial() return self + + def download_all_files(self): + self.service_download.download_file() + return self \ No newline at end of file diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service.py b/src/covid19/blueprints/rki_bundeslaender/rki_service.py index de4e788ace0e291278f09a07505991dbb4c000a6..3a7b9e9f24a902b53c886a4a03bfd29a606dd838 100644 --- a/src/covid19/blueprints/rki_bundeslaender/rki_service.py +++ b/src/covid19/blueprints/rki_bundeslaender/rki_service.py @@ -108,3 +108,7 @@ class RkiBundeslaenderService: app.logger.info(" run update initial [done]") app.logger.info("------------------------------------------------------------") return self + + def download_all_files(self): + self.service_download.download_file() + return self \ No newline at end of file diff --git a/src/covid19/blueprints/rki_landkreise/rki_service.py b/src/covid19/blueprints/rki_landkreise/rki_service.py index 904e5436c43b4aa134c294ecfe969bfbe4fd8ce6..4a1558be34c95c4f3b89bf1689a47477b182f8d1 100644 --- a/src/covid19/blueprints/rki_landkreise/rki_service.py +++ b/src/covid19/blueprints/rki_landkreise/rki_service.py @@ -108,3 +108,7 @@ class RkiLandkreiseService: app.logger.info("------------------------------------------------------------") return self + def download_all_files(self): + self.service_download.download_file() + 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 1596bbd61deac5099ac13811eaec65a55d103082..52a3fbb7730f42ac291be47ebf6166d19c4620e7 100644 --- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py +++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py @@ -57,4 +57,8 @@ class RkiVaccinationService: def run_update_star_schema_initial(self): self.run_import_only() self.vaccination_service_udpate.update_star_schema_initial() + return self + + def download_all_files(self): + self.vaccination_service_download.download_file() return self \ No newline at end of file diff --git a/src/covid19/blueprints/who/who_service.py b/src/covid19/blueprints/who/who_service.py index 1bffff7ccea968e9731f3f8605d958d8dd71ad99..821607367ebabcd25f60df095fc7c591c7c0e5bf 100644 --- a/src/covid19/blueprints/who/who_service.py +++ b/src/covid19/blueprints/who/who_service.py @@ -102,3 +102,7 @@ class WhoService: app.logger.info("------------------------------------------------------------") return self + def download_all_files(self): + self.who_service_download.download_file() + return self +