From 0c97a365c57b0492a805f421191b3c54ae7f74ae Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 24 May 2021 08:27:00 +0200
Subject: [PATCH] Refactoring: rename covid19 to flask_covid19ssaas
---
.../blueprints/data_rki_cases/rki_model_import.py | 8 ++++++++
.../blueprints/data_rki_cases/rki_service_update.py | 3 +++
src/flask_covid19/blueprints/data_rki_cases/rki_views.py | 6 +++---
3 files changed, 14 insertions(+), 3 deletions(-)
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 7337f2eb..74e5ea7e 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 276a56cd..3c427016 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 9edfb095..8bdba206 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]")
--
GitLab