From 61ef2ad318400ec702bfd1d9f9fc099e5e7dc1bb Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sun, 2 May 2021 13:25:23 +0200
Subject: [PATCH] working on: 0.0.32 Release
---
src/covid19/blueprints/admin/admin_views.py | 44 ++++++++++-----------
src/covid19/blueprints/who/who_views.py | 6 +--
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index 5a70309e..fccacaf4 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -209,7 +209,7 @@ def task_admin_update_star_schema_incremental(self):
# ----------------------------------------------------------------------------------------------------------------
-@app_admin.route('/alive_message')
+@app_admin.route('/task/alive_message')
def url_alive_message_start():
app.logger.info("url_alive_message_start [start]")
task_admin_alive_message.apply_async()
@@ -218,7 +218,7 @@ def url_alive_message_start():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/database/dump')
+@app_admin.route('/task/database/dump')
def url_admin_database_dump():
app.logger.info("url_admin_database_dump [start]")
admin_service.run_admin_database_dump()
@@ -227,7 +227,7 @@ def url_admin_database_dump():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/database/reimport')
+@app_admin.route('/task/database/reimport')
def url_admin_database_dump_reimport():
app.logger.info("url_admin_database_dump_reimport [start]")
admin_service.run_admin_database_dump_reimport()
@@ -236,7 +236,7 @@ def url_admin_database_dump_reimport():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/database/dropcreate/only')
+@app_admin.route('/task/database/dropcreate/only')
def url_admin_database_dropcreate_only():
app.logger.info("url_admin_database_drop [start]")
flash("admin_service.run_admin_database_drop started")
@@ -245,7 +245,7 @@ def url_admin_database_dropcreate_only():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/database/drop')
+@app_admin.route('/task/database/drop')
def url_admin_database_drop():
flash("url_admin_database_drop [start]")
app.logger.info("admin_service.run_admin_database_drop_and_create [start]")
@@ -263,7 +263,7 @@ def url_admin_database_drop():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/download/all')
+@app_admin.route('/task/files/download')
def url_admin_download_all_files():
who_service.download_all_files()
ecdc_service.download_all_files()
@@ -275,7 +275,7 @@ def url_admin_download_all_files():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/import/all')
+@app_admin.route('/task/files/import')
def url_admin_import_all_files():
app.logger.info("url_admin_import_all_files [start]")
task_admin_import_all_files.apply_async()
@@ -285,7 +285,7 @@ def url_admin_import_all_files():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/update/dimension_tables/all')
+@app_admin.route('/task/update/dimension_tables/all')
def url_admin_update_dimension_tables_only():
app.logger.info("url_admin_update_all_groups [start]")
task_admin_update_dimension_tables_only.apply_async()
@@ -295,7 +295,7 @@ def url_admin_update_dimension_tables_only():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/update/fact_tables/initial/all')
+@app_admin.route('/task/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()
@@ -305,7 +305,7 @@ def url_admin_update_fact_table_initial_only():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/update/fact_tables/incremental/all')
+@app_admin.route('/task/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()
@@ -315,7 +315,7 @@ def url_admin_update_fact_table_incremental_only():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/update/star_schema/initial/all')
+@app_admin.route('/task/update/full/star_schema')
def url_admin_update_star_schema_initial():
app.logger.info("url_admin_update_star_schema_initial [start]")
task_admin_update_star_schema_initial.apply_async()
@@ -325,7 +325,7 @@ def url_admin_update_star_schema_initial():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/update/star_schema/incremental/all')
+@app_admin.route('/task/update/star_schema')
def run_update_star_schema_incremental():
app.logger.info("run_update_star_schema_incremental [start]")
task_admin_update_star_schema_incremental.apply_async()
@@ -335,23 +335,23 @@ def run_update_star_schema_incremental():
return redirect(url_for('app_admin.url_admin_tasks'))
-@app_admin.route('/update/do/all/initial')
+@app_admin.route('/task/update/do/all/initial')
def url_admin_update_do_all_initial():
app.logger.info("url_admin_update_do_all_initial [start]")
- flash("who_service.download_all_files() started")
- who_service.download_all_files()
- flash("ecdc_service.download_all_files() started")
+ who_service.download_files()
+ flash("who_service.download_files() [done]")
ecdc_service.download_all_files()
- flash("task_admin_update_fact_table_incremental_only async started")
+ flash("ecdc_service.download_all_files() [done]")
owid_service.download_all_files()
- flash("task_admin_update_fact_table_incremental_only async started")
+ flash("owid_service.download_all_files() [done]")
rki_vaccination_service.download_all_files()
- flash("task_admin_update_fact_table_incremental_only async started")
+ flash("rki_vaccination_service.download_all_files() [done]")
rki_service_bundeslaender.download_all_files()
- flash("task_admin_update_fact_table_incremental_only async started")
+ flash("rki_service_bundeslaender.download_all_files() [done]")
rki_service_landkreise.download_all_files()
+ flash("rki_service_landkreise.download_all_files() [done]")
task_admin_update_star_schema_initial.apply_async()
- flash("task_admin_update_fact_table_incremental_only async started")
- app.logger.info("task_admin_update_fact_table_incremental_only async started")
+ flash(message="async task_admin_update_star_schema_initial [start]", category="warning")
+ app.logger.warn("async task_admin_update_star_schema_initial [start]")
app.logger.info("url_admin_update_do_all_initial [done]")
return redirect(url_for('app_admin.url_admin_tasks'))
diff --git a/src/covid19/blueprints/who/who_views.py b/src/covid19/blueprints/who/who_views.py
index 7c360ab2..64bfcb48 100644
--- a/src/covid19/blueprints/who/who_views.py
+++ b/src/covid19/blueprints/who/who_views.py
@@ -508,7 +508,7 @@ def url_task_who_update_dimension_tables():
return redirect(url_for('who.url_who_tasks'))
-@app_who.route('/task/update/dimension_tables/full')
+@app_who.route('/task/update/full/dimension_tables')
@login_required
def url_task_who_full_update_dimension_tables():
app.logger.info("url_task_who_full_update_dimension_tables [start]")
@@ -519,7 +519,7 @@ def url_task_who_full_update_dimension_tables():
return redirect(url_for('who.url_who_tasks'))
-@app_who.route('/task/update/fact-table/full')
+@app_who.route('/task/update/full/fact-table')
@login_required
def url_task_who_full_update_fact_table():
app.logger.info("url_task_who_full_update_fact_table [start]")
@@ -554,7 +554,7 @@ def url_task_who_update_star_schema():
return redirect(url_for('who.url_who_tasks'))
-@app_who.route('/task/update/star_schema/full')
+@app_who.route('/task/update/full/star_schema')
@login_required
def url_task_who_full_update_star_schema():
app.logger.info("url_task_who_full_update_star_schema [start]")
--
GitLab