diff --git a/src/covid19/blueprints/rki_cases/rki_model.py b/src/covid19/blueprints/rki_cases/rki_model.py
index de7a9fdae12c5e1f76927f58f6761fb5459d506a..f15cc90b9329efb9bd5bd1a31920ddfaeea74c78 100644
--- a/src/covid19/blueprints/rki_cases/rki_model.py
+++ b/src/covid19/blueprints/rki_cases/rki_model.py
@@ -7,10 +7,10 @@ from covid19.blueprints.app_all.all_model import ApplicationDateReported, Applic
class RkiDateReported(ApplicationDateReported):
- __tablename__ = 'rki_datereported'
+ __tablename__ = 'rki_cases_datereported'
__mapper_args__ = {'concrete': True}
__table_args__ = (
- db.UniqueConstraint('date_reported_import_str', 'datum', name="uix_rki_datereported"),
+ db.UniqueConstraint('date_reported_import_str', 'datum', name="uix_rki_cases_datereported"),
)
id = db.Column(db.Integer, primary_key=True)
@@ -46,10 +46,10 @@ class RkiDateReported(ApplicationDateReported):
class RkiCountryRegion(ApplicationRegion):
- __tablename__ = 'rki_country_region'
+ __tablename__ = 'rki_cases_country_region'
__mapper_args__ = {'concrete': True}
__table_args__ = (
- db.UniqueConstraint('region', name="uix_rki_country_region"),
+ db.UniqueConstraint('region', name="uix_rki_cases_country_region"),
)
id = db.Column(db.Integer, primary_key=True)
@@ -57,15 +57,15 @@ class RkiCountryRegion(ApplicationRegion):
class RkiCountry(db.Model):
- __tablename__ = 'rki_country'
+ __tablename__ = 'rki_cases_country'
__table_args__ = (
- db.UniqueConstraint('country_code', 'country', name="uix_rki_country"),
+ db.UniqueConstraint('country_code', 'country', name="uix_rki_cases_country"),
)
id = db.Column(db.Integer, primary_key=True)
country_code = db.Column(db.String(255), unique=True, nullable=False)
country = db.Column(db.String(255), unique=True, nullable=False)
- region_id = db.Column(db.Integer, db.ForeignKey('rki_country_region.id'), nullable=False)
+ region_id = db.Column(db.Integer, db.ForeignKey('rki_cases_country_region.id'), nullable=False)
region = db.relationship(
'RkiCountryRegion',
lazy='joined',
@@ -171,7 +171,7 @@ class RkiCountry(db.Model):
class RkiData(db.Model):
- __tablename__ = 'rki'
+ __tablename__ = 'rki_cases'
id = db.Column(db.Integer, primary_key=True)
object_id_1 = db.Column(db.Integer, nullable=False)
@@ -195,14 +195,14 @@ class RkiData(db.Model):
shape_area = db.Column(db.Float, nullable=False)
date_reported_id = db.Column(db.Integer,
- db.ForeignKey('rki_datereported.id'), nullable=False)
+ db.ForeignKey('rki_cases_datereported.id'), nullable=False)
date_reported = db.relationship(
'RkiDateReported',
lazy='joined',
cascade='save-update',
order_by='desc(RkiDateReported.date_reported_import_str)')
country_id = db.Column(db.Integer,
- db.ForeignKey('rki_country.id'), nullable=False)
+ db.ForeignKey('rki_cases_country.id'), nullable=False)
country = db.relationship(
'RkiCountry',
lazy='joined',
diff --git a/src/covid19/blueprints/rki_cases/rki_model_import.py b/src/covid19/blueprints/rki_cases/rki_model_import.py
index dc605d4f4e3c4c891394ef2a763da257758dd622..127f564a6e2679a51bff2ae953a8ad81d472de08 100644
--- a/src/covid19/blueprints/rki_cases/rki_model_import.py
+++ b/src/covid19/blueprints/rki_cases/rki_model_import.py
@@ -2,7 +2,7 @@ from database import db, ITEMS_PER_PAGE
class RkiImport(db.Model):
- __tablename__ = 'application__import__rki'
+ __tablename__ = 'application__import__rki_cases'
id = db.Column(db.Integer, primary_key=True)
OBJECTID_1 = db.Column(db.String(255), nullable=False)
diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/covid19/blueprints/who/templates/who/who_tasks.html
index 28e08208d99157d1293799aed52779f1178a3fcd..3be00b9f58497f47a5f8cd1900cc486836b411ee 100644
--- a/src/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/src/covid19/blueprints/who/templates/who/who_tasks.html
@@ -28,7 +28,7 @@
<h4>Full Update</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_download_files') }}"
+ href="{{ url_for( 'who.url_download_files') }}"
role="button">WHO :: Task :: download :: files</a>
<a class="btn btn-info btn-lg btn-block text-left"
href="{{ url_for( 'who.url_task_who_import_files') }}"
@@ -45,7 +45,7 @@
<h4>Update</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_download_files') }}"
+ href="{{ url_for( 'who.url_download_files') }}"
role="button">WHO :: Task :: download :: files</a>
<a class="btn btn-info btn-lg btn-block text-left"
href="{{ url_for( 'who.url_task_who_import_files') }}"
diff --git a/src/covid19/blueprints/who/who_views.py b/src/covid19/blueprints/who/who_views.py
index 5247c253632178075284def967185fec8f6108dd..1ab55345ef2867fffe189a8b87fdfef5437215ab 100644
--- a/src/covid19/blueprints/who/who_views.py
+++ b/src/covid19/blueprints/who/who_views.py
@@ -6,10 +6,7 @@ from flask_admin.contrib.sqla import ModelView
from flask_login import login_required
from database import app, admin, db
-from covid19.blueprints.app_all.all_services import who_service, owid_service
-from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service
-from covid19.blueprints.app_all.all_services import ecdc_service, divi_service
-from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service
+from covid19.blueprints.app_all.all_services import who_service
from covid19.blueprints.app_mq.application_workers import celery
from covid19.blueprints.app_application.application_model_transient import ApplicationPage
@@ -465,17 +462,6 @@ def url_download_files():
return redirect(url_for('who.url_who_tasks'))
-@app_who.route('/task/files/download')
-@login_required
-def url_task_download_files():
- app.logger.info("url_task_download_files [start]")
- task_download_files.apply_async()
- flash(message="async task_download_files [start]", category="warning")
- app.logger.warn("async task_download_files [start]")
- app.logger.info("url_task_download_files [done]")
- return redirect(url_for('who.url_who_tasks'))
-
-
@app_who.route('/task/files/import')
@login_required
def url_task_who_import_files():
@@ -487,17 +473,6 @@ def url_task_who_import_files():
return redirect(url_for('who.url_who_tasks'))
-@app_who.route('/task/update/dimension_tables')
-@login_required
-def url_task_who_update_dimension_tables():
- app.logger.info("url_task_who_update_dimension_tables [start]")
- task_who_update_dimension_tables.apply_async()
- flash(message="async task_who_update_dimension_tables [start]", category="warning")
- app.logger.warn("async task_who_update_dimension_tables [start]")
- app.logger.info("url_task_who_update_dimension_tables [done]")
- return redirect(url_for('who.url_who_tasks'))
-
-
@app_who.route('/task/update/full/dimension_tables')
@login_required
def url_task_who_full_update_dimension_tables():
@@ -509,6 +484,17 @@ def url_task_who_full_update_dimension_tables():
return redirect(url_for('who.url_who_tasks'))
+@app_who.route('/task/update/dimension_tables')
+@login_required
+def url_task_who_update_dimension_tables():
+ app.logger.info("url_task_who_update_dimension_tables [start]")
+ task_who_update_dimension_tables.apply_async()
+ flash(message="async task_who_update_dimension_tables [start]", category="warning")
+ app.logger.warn("async task_who_update_dimension_tables [start]")
+ app.logger.info("url_task_who_update_dimension_tables [done]")
+ return redirect(url_for('who.url_who_tasks'))
+
+
@app_who.route('/task/update/full/fact-table')
@login_required
def url_task_who_full_update_fact_table():
@@ -531,6 +517,19 @@ def url_task_who_update_fact_table():
return redirect(url_for('who.url_who_tasks'))
+@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]")
+ who_service.download_files()
+ flash("who_service.run_download_only() [done]")
+ task_who_full_update_star_schema.apply_async()
+ flash(message="async task_who_full_update_star_schema [start]", category="warning")
+ app.logger.warn("async task_who_full_update_star_schema [start]")
+ app.logger.info("url_task_who_full_update_star_schema [done]")
+ return redirect(url_for('who.url_who_tasks'))
+
+
@app_who.route('/task/update/star_schema')
@login_required
def url_task_who_update_star_schema():
@@ -543,15 +542,3 @@ def url_task_who_update_star_schema():
app.logger.info("url_task_who_update_star_schema [done]")
return redirect(url_for('who.url_who_tasks'))
-
-@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]")
- who_service.download_files()
- flash("who_service.run_download_only() [done]")
- task_who_full_update_star_schema.apply_async()
- flash(message="async task_who_full_update_star_schema [start]", category="warning")
- app.logger.warn("async task_who_full_update_star_schema [start]")
- app.logger.info("url_task_who_full_update_star_schema [done]")
- return redirect(url_for('who.url_who_tasks'))
diff --git a/src/covid19/blueprints/who_test/who_test_views.py b/src/covid19/blueprints/who_test/who_test_views.py
index 39794a8ed488390271dd56068d16046e5984117e..c04cba9bcef9de5c4867d7d07ce2f8286c3f73a9 100644
--- a/src/covid19/blueprints/who_test/who_test_views.py
+++ b/src/covid19/blueprints/who_test/who_test_views.py
@@ -4,10 +4,7 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from covid19.blueprints.app_all.all_services import who_service, owid_service
-from covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service
-from covid19.blueprints.app_all.all_services import ecdc_service, divi_service
-from covid19.blueprints.app_all.all_services import app_admin_service, app_user_service
+from covid19.blueprints.app_all.all_services import who_service
from covid19.blueprints.app_mq.application_workers import celery
from covid19.blueprints.app_application.application_model_transient import ApplicationPage