From 49bed257b452207089bec47b673519c9f305ca63 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 5 May 2021 10:27:30 +0200
Subject: [PATCH] working on: 0.0.33 Release
---
.gitignore | 2 +-
src/covid19/blueprints/admin/admin_views.py | 6 +-
.../application/application_services.py | 2 +-
src/covid19/blueprints/rki/rki_views.py | 116 +++++++++++-------
.../blueprints/rki_test/rki_test_views.py | 6 +-
5 files changed, 78 insertions(+), 54 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5c6b938c..6402ceac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1146,4 +1146,4 @@ dump.rdb
/logfile5.txt
/logfile*.txt
/src/covid19/static/vendor/
-/.checkmate/
+/.checkmate
diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index c0bf37dc..60fb8f20 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
from database import app
from covid19.blueprints.application.application_services import who_service, ecdc_service, rki_vaccination_service
-from covid19.blueprints.application.application_services import rki_service_bundeslaender
+from covid19.blueprints.application.application_services import rki_service
from covid19.blueprints.application.application_services import admin_service, owid_service, divi_service
from covid19.blueprints.application.application_workers import celery
from covid19.blueprints.application.application_model_transient import ApplicationPage
@@ -314,7 +314,7 @@ def url_task_admin_download_all_files():
ecdc_service.download_all_files()
owid_service.download_all_files()
rki_vaccination_service.download_all_files()
- rki_service_bundeslaender.download_all_files()
+ rki_service.download_all_files()
app.logger.info("url_task_admin_download_all_files [done]")
return redirect(url_for('app_admin.url_admin_tasks'))
@@ -402,7 +402,7 @@ def url_task_admin_full_update_do_all():
flash("owid_service.download_all_files() [done]")
rki_vaccination_service.download_all_files()
flash("rki_vaccination_service.download_all_files() [done]")
- rki_service_bundeslaender.download_all_files()
+ rki_service.download_all_files()
flash("rki_service_bundeslaender.download_all_files() [done]")
task_admin_full_update_star_schema.apply_async()
flash(message="async task_admin_full_update_star_schema [start]", category="warning")
diff --git a/src/covid19/blueprints/application/application_services.py b/src/covid19/blueprints/application/application_services.py
index 913f5749..1a0743d4 100644
--- a/src/covid19/blueprints/application/application_services.py
+++ b/src/covid19/blueprints/application/application_services.py
@@ -16,7 +16,7 @@ from covid19.blueprints.rki.rki_service import RkiService
admin_service = AdminService(db)
ecdc_service = EcdcService(db)
owid_service = OwidService(db)
-rki_service_bundeslaender = RkiService(db)
+rki_service = RkiService(db)
rki_vaccination_service = RkiVaccinationService(db)
who_service = WhoService(db)
user_service = UserService(db)
diff --git a/src/covid19/blueprints/rki/rki_views.py b/src/covid19/blueprints/rki/rki_views.py
index df8fddeb..ddd23e85 100644
--- a/src/covid19/blueprints/rki/rki_views.py
+++ b/src/covid19/blueprints/rki/rki_views.py
@@ -5,7 +5,7 @@ from celery import states
from database import app, admin, db
from covid19.blueprints.application.application_workers import celery
-from covid19.blueprints.application.application_services import rki_service_bundeslaender
+from covid19.blueprints.application.application_services import rki_service
from covid19.blueprints.rki.rki_model import RkiData
from covid19.blueprints.rki.rki_model_import import RkiImport
from covid19.blueprints.application.application_model_transient import ApplicationPage
@@ -75,49 +75,66 @@ def url_rki_test(page=1):
# Celery TASKS
# ------------------------------------------------------------------------
+@celery.task(bind=True)
+def task_rki_import(self):
+ self.update_state(state=states.STARTED)
+ rki_service.run_import_only()
+ self.update_state(state=states.SUCCESS)
+ result = "OK (task_rki_import_only)"
+ return result
+
+
+@celery.task(bind=True)
+def task_rki_full_update_dimensiontables(self):
+ self.update_state(state=states.STARTED)
+ rki_service.task_full_update_dimensiontables()
+ self.update_state(state=states.SUCCESS)
+ result = "OK (task_rki_full_update_dimensiontables)"
+ return result
+
@celery.task(bind=True)
-def task_rki_task_update_starschema_initial(self):
+def task_rki_update_dimensiontables(self):
self.update_state(state=states.STARTED)
- rki_service_bundeslaender.run_update_star_schema_incremental()
+ rki_service.task_update_dimensiontables()
self.update_state(state=states.SUCCESS)
- result = "OK (task_rki_task_update_starschema_initial)"
+ result = "OK (task_rki_update_dimensiontables)"
return result
@celery.task(bind=True)
-def task_rki_task_update_starschema_incremental(self):
+def task_rki_full_update_facttable(self):
self.update_state(state=states.STARTED)
- rki_service_bundeslaender.run_update_star_schema_incremental()
+ rki_service.full_update_fact_table()
self.update_state(state=states.SUCCESS)
- result = "OK (task_rki_task_update_starschema_incremental)"
+ result = "OK (task_rki_full_update_facttable)"
return result
@celery.task(bind=True)
-def task_rki_task_import_only(self):
+def task_rki_update_facttable(self):
self.update_state(state=states.STARTED)
- rki_service_bundeslaender.run_import_only()
+ rki_service.run_update_fact_table_incremental_only()
self.update_state(state=states.SUCCESS)
- result = "OK (task_rki_task_import_only)"
+ result = "OK (task_rki_update_facttable)"
return result
@celery.task(bind=True)
-def task_rki_task_update_facttable_incremental_only(self):
+def task_rki_full_update_starschema(self):
self.update_state(state=states.STARTED)
- rki_service_bundeslaender.run_update_fact_table_incremental_only()
+ rki_service.run_update_star_schema_incremental()
self.update_state(state=states.SUCCESS)
- result = "OK (task_rki_task_update_facttable_incremental_only)"
+ result = "OK (task_rki_full_update_starschema)"
return result
@celery.task(bind=True)
-def task_rki_task_update_facttable_initial_only(self):
+def task_rki_update_starschema(self):
self.update_state(state=states.STARTED)
- rki_service_bundeslaender.full_update_fact_table()
+ rki_service.run_update_star_schema_incremental()
self.update_state(state=states.SUCCESS)
- result = "OK (task_rki_task_update_facttable_initial_only)"
+ result = "OK (task_rki_update_starschema)"
return result
# ------------------------------------------------------------------------
@@ -125,52 +142,59 @@ def task_rki_task_update_facttable_initial_only(self):
# ------------------------------------------------------------------------
-@app_rki.route('/task/update/star_schema/initial')
-def url_rki_task_update_starschema_initial():
- app.logger.info("url_rki_task_update_starschema_initial [start]")
- rki_service_bundeslaender.run_download_only()
- task_rki_task_update_starschema_initial.apply_async()
+@app_rki.route('/task/download')
+def url_task_rki_download():
+ app.logger.info("url_task_rki_download [start]")
+ rki_service.run_download_only()
+ return redirect(url_for('rki.url_rki_tasks'))
+
+
+@app_rki.route('/task/import')
+def url_task_rki_import():
+ app.logger.info("url_task_rki_import [start]")
+ task_rki_import.apply_async()
return redirect(url_for('rki.url_rki_tasks'))
-@app_rki.route('/task/update/star_schema/incremental')
-def url_rki_task_update_starschema_incremental():
- app.logger.info("url_rki_task_update_starschema_incremental [start]")
- rki_service_bundeslaender.run_download_only()
- task_rki_task_update_starschema_incremental.apply_async()
+@app_rki.route('/task/update/full/dimension-tables')
+def url_task_rki_full_update_dimensiontables():
+ app.logger.info("url_task_rki_full_update_dimensiontables [start]")
+ task_rki_full_update_dimensiontables.apply_async()
return redirect(url_for('rki.url_rki_tasks'))
-@app_rki.route('/task/download/only')
-def url_rki_task_download_only():
- app.logger.info("url_rki_task_download_only [start]")
- rki_service_bundeslaender.run_download_only()
+@app_rki.route('/task/update/dimension-tables')
+def url_task_rki_update_dimensiontables():
+ app.logger.info("url_task_rki_update_dimensiontables [start]")
+ task_rki_update_dimensiontables.apply_async()
return redirect(url_for('rki.url_rki_tasks'))
-@app_rki.route('/task/import/only')
-def url_rki_task_import_only():
- app.logger.info("url_rki_task_import_only [start]")
- task_rki_task_import_only.apply_async()
+@app_rki.route('/task/update/full/fact-table')
+def url_task_rki_full_update_facttable():
+ app.logger.info("url_rki_task_update_facttable_incremental_only [start]")
+ task_rki_full_update_facttable.apply_async()
return redirect(url_for('rki.url_rki_tasks'))
-@app_rki.route('/task/update/dimension-tables/only')
-def url_rki_task_update_dimensiontables_only():
- app.logger.info("url_rki_task_update_dimensiontables_only [start]")
- task_rki_task_import_only.apply_async()
+@app_rki.route('/task/update/fact-table')
+def url_task_rki_update_facttable():
+ app.logger.info("url_task_rki_update_facttable [start]")
+ task_rki_update_facttable.apply_async()
return redirect(url_for('rki.url_rki_tasks'))
-@app_rki.route('/task/update/fact-table/incremental/only')
-def url_rki_task_update_facttable_incremental_only():
- app.logger.info("url_rki_task_update_facttable_incremental_only [start]")
- task_rki_task_update_facttable_incremental_only.apply_async()
+@app_rki.route('/task/update/full/star_schema')
+def url_task_rki_full_update_starschema():
+ app.logger.info("url_task_rki_full_update_starschema [start]")
+ rki_service.run_download_only()
+ task_rki_full_update_starschema.apply_async()
return redirect(url_for('rki.url_rki_tasks'))
-@app_rki.route('/task/update/fact-table/initial/only')
-def url_rki_task_update_facttable_initial_only():
- app.logger.info("url_rki_task_update_facttable_initial_only [start]")
- task_rki_task_update_facttable_initial_only.apply_async()
+@app_rki.route('/task/update/star_schema')
+def url_task_rki_update_starschema():
+ app.logger.info("url_task_rki_update_starschema [start]")
+ rki_service.run_download_only()
+ task_rki_update_starschema.apply_async()
return redirect(url_for('rki.url_rki_tasks'))
diff --git a/src/covid19/blueprints/rki_test/rki_test_views.py b/src/covid19/blueprints/rki_test/rki_test_views.py
index 621de199..808de53d 100644
--- a/src/covid19/blueprints/rki_test/rki_test_views.py
+++ b/src/covid19/blueprints/rki_test/rki_test_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from covid19.blueprints.application.application_services import rki_service_bundeslaender
+from covid19.blueprints.application.application_services import rki_service
from covid19.blueprints.application.application_workers import celery
from covid19.blueprints.rki.rki_model import RkiData
from covid19.blueprints.rki.rki_model_import import RkiImport
@@ -12,7 +12,7 @@ from covid19.blueprints.application.application_model_transient import Applicati
from covid19.blueprints.owid_test.owid_test_service import OwidTestService
-rki_test_service = OwidTestService(db, rki_service_bundeslaender)
+rki_test_service = OwidTestService(db, rki_service)
rki_owid_test = Blueprint('rki_test', __name__, template_folder='templates', url_prefix='/rki/test')
@@ -128,7 +128,7 @@ def url_owid_test_owid_data_get_datum_of_all_owid_import():
def url_owid_test_owid_service_owid_import_get_new_dates_as_array():
app.logger.info("url_owid_test_owid_service_owid_import_get_new_dates_as_array - START")
flash("url_owid_test_owid_service_owid_import_get_new_dates_as_array - START")
- for datum in rki_service_bundeslaender.service_update.who_import_get_new_dates_as_array():
+ for datum in rki_service.service_update.who_import_get_new_dates_as_array():
app.logger.info(str(datum))
app.logger.info("url_owid_test_owid_service_owid_import_get_new_dates_as_array - DONE")
flash("url_owid_test_owid_service_owid_import_get_new_dates_as_array - DONE")
--
GitLab