From badb4060cc75bfac77a9134bb0fc653bf3eb11e5 Mon Sep 17 00:00:00 2001
From: "thomas.woehlke" <thomas.woehlke@rub.de>
Date: Sun, 14 Mar 2021 21:26:33 +0100
Subject: [PATCH] uml
---
docs/blueprints/admin_use_cases.txt | 66 ++++++++++++---------
src/covid19/blueprints/admin/admin_views.py | 64 +++++++++++---------
2 files changed, 75 insertions(+), 55 deletions(-)
diff --git a/docs/blueprints/admin_use_cases.txt b/docs/blueprints/admin_use_cases.txt
index e2df275a..05bb8a49 100644
--- a/docs/blueprints/admin_use_cases.txt
+++ b/docs/blueprints/admin_use_cases.txt
@@ -6,47 +6,59 @@ package user {
actor Admin as au
}
package admin {
- usecase "Eat Food" as UC1
- usecase "Pay for Food" as UC2
- usecase "Drink" as UC3
- usecase "Review" as UC4
+ usecase url_admin_index as UC1
+ usecase url_admin_tasks as UC2
+ usecase url_admin_info as UC3
}
package admin_admin_web {
- usecase "Eat Food" as UC1
- usecase "Pay for Food" as UC2
- usecase "Drink" as UC3
- usecase "Review" as UC4
+ usecase url_admin_database_dump as UC51
+ usecase url_admin_database_dump_reimport as UC52
+ usecase url_admin_database_drop as UC53
+ usecase url_admin_download_all_files as UC54
+
+ usecase url_alive_message_start as UC55
+ usecase url_admin_database_dropcreate_only as UC56
+
+ usecase url_admin_import_all_files as UC57
+ usecase url_admin_update_dimension_tables_only as UC58
+
+ usecase url_admin_update_fact_table_initial_only as UC59
+ usecase url_admin_update_fact_table_incremental_only as UC60
+
+ usecase url_admin_update_star_schema_initial as UC61
+ usecase run_update_star_schema_incremental as UC62
}
package admin_tasks {
- usecase "Eat Food" as UC1
- usecase "Pay for Food" as UC2
- usecase "Drink" as UC3
- usecase "Review" as UC4
+ usecase task_admin_alive_message as UC105
+ usecase task_admin_database_drop_create as UC106
+ usecase task_admin_import_all_files as UC107
+ usecase task_admin_update_dimension_tables_only as UC108
+ usecase task_admin_update_fact_table_initial_only as UC109
+ usecase task_admin_update_fact_table_incremental_only as UC110
+ usecase task_admin_update_star_schema_initial as UC111
+ usecase task_admin_update_star_schema_incremental as UC112
}
vu --> UC1
vu --> UC2
vu --> UC3
-vu --> UC4
-vu --> UC5
-vu --> UC6
-vu --> UC7
-vu --> UC8
-vu --> UC9
-vu --> UC10
-vu --> UC11
-vu --> UC12
-au --> UC50
au --> UC51
au --> UC52
au --> UC53
au --> UC54
au --> UC55
au --> UC56
-UC50 --> UC100
-UC51 --> UC101
-UC52 --> UC102
-UC53 --> UC103
-UC54 --> UC104
+au --> UC57
+au --> UC58
+au --> UC59
+au --> UC60
+au --> UC61
+au --> UC62
UC55 --> UC105
UC56 --> UC106
+UC57 --> UC107
+UC58 --> UC108
+UC59 --> UC109
+UC60 --> UC110
+UC61 --> UC111
+UC62 --> UC112
@enduml
\ No newline at end of file
diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index d121407c..02d9caee 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -14,11 +14,39 @@ drop_and_create_data_again = True
app_admin = Blueprint('app_admin', __name__, template_folder='templates', url_prefix='/admin')
-#################################################################################################################
-#
-# Admin
-#
-#################################################################################################################
+
+
+# ---------------------------------------------------------------------------------------------------------------
+# Url Routes Frontend
+# ---------------------------------------------------------------------------------------------------------------
+
+@app_admin.route('/')
+def url_admin_index():
+ page_info = ApplicationPage('Admin', "Covid19 Admin")
+ return render_template(
+ 'admin/index.html',
+ page_info=page_info)
+
+
+@app_admin.route('/tasks')
+def url_admin_tasks():
+ page_info = ApplicationPage('Admin', "Tasks")
+ return render_template(
+ 'admin/admin_tasks.html',
+ page_info=page_info)
+
+
+@app_admin.route('/info')
+def url_admin_info():
+ page_info = ApplicationPage('Admin', "Info")
+ return render_template(
+ 'admin/admin_info.html',
+ page_info=page_info)
+
+
+# ----------------------------------------------------------------------------------------------------------------
+# Celery TASKS
+# ----------------------------------------------------------------------------------------------------------------
@celery.task(bind=True)
@@ -178,29 +206,9 @@ def task_admin_update_star_schema_incremental(self):
result = "OK (task_admin_update_star_schema_incremental)"
return result
-
-@app_admin.route('/')
-def url_admin_index():
- page_info = ApplicationPage('Admin', "Covid19 Admin")
- return render_template(
- 'admin/index.html',
- page_info=page_info)
-
-
-@app_admin.route('/tasks')
-def url_admin_tasks():
- page_info = ApplicationPage('Admin', "Tasks")
- return render_template(
- 'admin/admin_tasks.html',
- page_info=page_info)
-
-
-@app_admin.route('/info')
-def url_admin_info():
- page_info = ApplicationPage('Admin', "Info")
- return render_template(
- 'admin/admin_info.html',
- page_info=page_info)
+# ----------------------------------------------------------------------------------------------------------------
+# URL Routes for Celery TASKS
+# ----------------------------------------------------------------------------------------------------------------
@app_admin.route('/alive_message')
--
GitLab