From 0bb22c2c2cc2616413287c7455f9a14610cf8756 Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Mon, 10 May 2021 13:10:21 +0200 Subject: [PATCH] working on: 0.0.34 Release --- .../uml/app_admin_use_cases.txt | 35 ------ .../uml/app_admin_use_cases_impl.txt | 48 -------- .../uml/app_application_domain_model.txt | 103 ++++++++---------- .../uml/app_application_use_cases.txt | 32 +++--- .../uml/app_application_use_cases_impl.txt | 41 +++++-- 5 files changed, 100 insertions(+), 159 deletions(-) delete mode 100644 docs/blueprints/app_application/uml/app_admin_use_cases.txt delete mode 100644 docs/blueprints/app_application/uml/app_admin_use_cases_impl.txt diff --git a/docs/blueprints/app_application/uml/app_admin_use_cases.txt b/docs/blueprints/app_application/uml/app_admin_use_cases.txt deleted file mode 100644 index 995826a7..00000000 --- a/docs/blueprints/app_application/uml/app_admin_use_cases.txt +++ /dev/null @@ -1,35 +0,0 @@ -@startuml -package covid19.blueprints.app_user { - actor AnonymousVisitor as vu - actor AppManager as au - actor SysAdmin as su - actor AppDevTester as du -} -package covid19.blueprints.app_user { - vu <|-- au - vu <|-- su - su <|-- du - au <|-- du -} -left to right direction -package covid19.blueprints.app_admin.admin_views_frontend { - usecase page_root as UC1 - usecase page_home as UC2 -} -vu --> UC1 -vu --> UC2 -package covid19.blueprints.app_admin.admin_views_for_tasks { - usecase page_admin_crud as UC3 - usecase alive_message as UC200 - usecase database_drop_create as UC201 - usecase database_drop as UC202 - usecase database_create as UC203 - usecase page_tasks as UC220 -} -su --> UC3 -su --> UC200 -su --> UC201 -su --> UC202 -su --> UC203 -su --> UC220 -@enduml \ No newline at end of file diff --git a/docs/blueprints/app_application/uml/app_admin_use_cases_impl.txt b/docs/blueprints/app_application/uml/app_admin_use_cases_impl.txt deleted file mode 100644 index ed81d9b8..00000000 --- a/docs/blueprints/app_application/uml/app_admin_use_cases_impl.txt +++ /dev/null @@ -1,48 +0,0 @@ -@startuml -package covid19.blueprints.app_user { - actor AnonymousVisitor as vu - actor AppManager as au - actor SysAdmin as su - actor AppDevTester as du -} -package covid19.blueprints.app_user { - vu <|-- au - vu <|-- su - su <|-- du - au <|-- du -} -left to right direction -package covid19.blueprints.app_admin.admin_views_frontend { - usecase url_page_info as UC1 - usecase url_database_dump as UC50 - usecase url_database_dump_reimport as UC51 - usecase url_page_admin_crud as UC70 -} -vu --> UC1 -su --> UC1 -su --> UC50 -su --> UC51 -su --> UC70 -package covid19.blueprints.app_admin.admin_views_for_tasks { - usecase url_alive_message as UC200 - usecase url_database_drop_create as UC201 - usecase url_database_drop as UC202 - usecase url_database_create as UC203 - usecase url_page_tasks as UC220 -} -su --> UC200 -su --> UC201 -su --> UC202 -su --> UC203 -su --> UC220 -package covid19.blueprints.app_admin.admin_celery_tasks { - usecase task_alive_message as UC300 - usecase task_database_drop_create as UC301 - usecase task_database_drop as UC302 - usecase task_database_create as UC303 -} -UC200 --> UC300 -UC201 --> UC301 -UC202 --> UC302 -UC203 --> UC303 -@enduml \ No newline at end of file diff --git a/docs/blueprints/app_application/uml/app_application_domain_model.txt b/docs/blueprints/app_application/uml/app_application_domain_model.txt index 99d3544a..1a9de7b0 100644 --- a/docs/blueprints/app_application/uml/app_application_domain_model.txt +++ b/docs/blueprints/app_application/uml/app_application_domain_model.txt @@ -1,49 +1,12 @@ @startuml -entity ApplicationDateReported { - id: Integer - date_reported: String - year_week: String - datum: Date - year: Integer - month: Integer - day_of_month: Integer - day_of_week: Integer - week_of_year: Integer - get_name_for_weekday() - {classifier} get_names_for_weekday() - {classifier} get_datum_parts(my_date_rep: String) - {classifier} get_datum(my_year: Integer, my_month: Integer, my_day: Integer) - {classifier} get_datum_as_str(my_year: Integer, my_month: Integer, my_day: Integer) - {classifier} my_year_week(my_iso_year: Integer, week_number: Integer) - {classifier} create_new_object_factory(my_date_rep: String) -} -entity ApplicationRegion { - id: Integer - continent: String - {classifier} remove_all() - {classifier} get_all_as_page(page: Integer) - {classifier} get_all() - {classifier} get_all_as_dict() - {classifier} get_by_id(other_id: Integer) - {classifier} find_by_id(other_id: Integer) -} -entity RkiDateReported { - id: Integer - date_reported: String - year_week: String - datum: Date - year: Integer - month: Integer - day_of_month: Integer - day_of_week: Integer - week_of_year: Integer - get_name_for_weekday() - {classifier} get_names_for_weekday() - {classifier} get_datum_parts(my_date_rep: String) - {classifier} get_datum(my_year: Integer, my_month: Integer, my_day: Integer) - {classifier} get_datum_as_str(my_year: Integer, my_month: Integer, my_day: Integer) - {classifier} my_year_week(my_iso_year: Integer, week_number: Integer) - {classifier} create_new_object_factory(my_date_rep: String) +class AdminService << (S,red) Service >> { + database: String + limit_nr: Integer + task_database_drop_create() + run_admin_database_dump() + {classifier} -run_ome_shell_command(cmd) + {classifier} run_admin_database_dump_reimport() + {classifier} run_admin_database_drop() } class ApplicationPage << (T,#FF7700) Transient >> { title: String @@ -93,22 +56,44 @@ class database << (S,#FF7700) Singleton >> { create_celery(my_app) create_admin(my_app) } +class admin_views_frontend << (B,orchid) Boundary >> { + url_admin_index() + url_admin_tasks() + url_admin_info() +} +class admin_celery_tasks << (B,orchid) Boundary >> { + task_admin_alive_message() + task_admin_database_drop_create() + task_admin_import_all_files() + task_admin_update_dimension_tables_only() + task_admin_update_fact_table_initial_only() + task_admin_update_fact_table_incremental_only() + task_admin_update_star_schema_initial() + task_admin_update_star_schema_incremental() +} +class admin_views_for_tasks << (B,orchid) Boundary >> { + url_alive_message_start() + url_admin_database_dump() + url_admin_database_dump_reimport() + url_admin_database_dropcreate_only() + url_admin_database_drop() + url_admin_download_all_files() + url_admin_import_all_files() + url_admin_update_dimension_tables_only() + url_admin_update_fact_table_initial_only() + url_admin_update_fact_table_incremental_only() + url_admin_update_star_schema_initial() + run_update_star_schema_incremental() +} class application_workers << (B,orchid) Boundary >> { run_mq(my_app, my_celery) run_app(my_app) } -class application_views << (B,orchid) Boundary >> { - url_home() - url_root() -} class application_services << (P,yellow) Proxy >> { } class ApplicationService << (S,red) Service >> { -} -class AdminService << (S,red) Service >> { - } class WhoService << (S,red) Service >> { @@ -128,11 +113,16 @@ class RkiLandkreiseService << (S,red) Service >> { class OwidService << (S,red) Service >> { } -ApplicationDateReported <|-- RkiDateReported +class UserService << (S,red) Service >> { + +} ApplicationServiceDownload "*" --> "1" ApplicationServiceConfig: cfg application_workers "1" --> "1" application_services: application_services -application_views "1" --> "1" application_services: application_services -application_views "*" --> "1" ApplicationPage: page_info +admin_views_frontend "1" --> "1" application_services: application_services +admin_views_frontend "*" --> "1" ApplicationPage: page_info +admin_celery_tasks "1" --> "1" application_services: application_services +admin_views_for_tasks "1" --> "1" application_services: application_services +admin_views_for_tasks "*" --> "1" ApplicationPage: page_info application_services "*" --> "1" ApplicationService: application_service application_services "*" --> "1" AdminService: admin_service application_services "*" --> "1" WhoService: who_service @@ -141,6 +131,7 @@ application_services "*" --> "1" RkiVaccinationService: rki_vaccination_service application_services "*" --> "1" RkiBundeslaenderService: rki_service_bundeslaender application_services "*" --> "1" RkiLandkreiseService: rki_service_landkreise application_services "*" --> "1" OwidService: owid_service +application_services "*" --> "1" UserService: user_service ApplicationService "*" --> "1" database ApplicationServiceDownload "*" --> "1" database AdminService "*" --> "1" database @@ -150,6 +141,7 @@ RkiBundeslaenderService "*" --> "1" database RkiLandkreiseService "*" --> "1" database RkiVaccinationService "*" --> "1" database OwidService "*" --> "1" database +UserService "*" --> "1" database ApplicationService : SQLAlchemy database ApplicationServiceDownload : SQLAlchemy database AdminService : SQLAlchemy database @@ -159,4 +151,5 @@ RkiBundeslaenderService : SQLAlchemy database RkiLandkreiseService : SQLAlchemy database RkiVaccinationService : SQLAlchemy database OwidService : SQLAlchemy database +UserService : SQLAlchemy database @enduml diff --git a/docs/blueprints/app_application/uml/app_application_use_cases.txt b/docs/blueprints/app_application/uml/app_application_use_cases.txt index 11102696..995826a7 100644 --- a/docs/blueprints/app_application/uml/app_application_use_cases.txt +++ b/docs/blueprints/app_application/uml/app_application_use_cases.txt @@ -1,31 +1,35 @@ @startuml package covid19.blueprints.app_user { actor AnonymousVisitor as vu - actor AppManager as ou + actor AppManager as au actor SysAdmin as su actor AppDevTester as du } package covid19.blueprints.app_user { - vu <|-- ou + vu <|-- au vu <|-- su su <|-- du - ou <|-- du + au <|-- du } left to right direction -package covid19.blueprints.app_application.application_views_task { - usecase dump_database as UC50 - usecase reimport_database as UC51 - usecase drop_database as UC52 - usecase create_database as UC53 -} -package covid19.blueprints.app_application.application_views_frontend { +package covid19.blueprints.app_admin.admin_views_frontend { usecase page_root as UC1 usecase page_home as UC2 } vu --> UC1 vu --> UC2 -su --> UC50 -su --> UC51 -su --> UC52 -su --> UC53 +package covid19.blueprints.app_admin.admin_views_for_tasks { + usecase page_admin_crud as UC3 + usecase alive_message as UC200 + usecase database_drop_create as UC201 + usecase database_drop as UC202 + usecase database_create as UC203 + usecase page_tasks as UC220 +} +su --> UC3 +su --> UC200 +su --> UC201 +su --> UC202 +su --> UC203 +su --> UC220 @enduml \ No newline at end of file diff --git a/docs/blueprints/app_application/uml/app_application_use_cases_impl.txt b/docs/blueprints/app_application/uml/app_application_use_cases_impl.txt index 1e29b31b..ed81d9b8 100644 --- a/docs/blueprints/app_application/uml/app_application_use_cases_impl.txt +++ b/docs/blueprints/app_application/uml/app_application_use_cases_impl.txt @@ -1,21 +1,48 @@ @startuml package covid19.blueprints.app_user { actor AnonymousVisitor as vu - actor AppManager as ou + actor AppManager as au actor SysAdmin as su actor AppDevTester as du } package covid19.blueprints.app_user { - vu <|-- ou + vu <|-- au vu <|-- su su <|-- du - ou <|-- du + au <|-- du } left to right direction -package application_views_frontend { - usecase url_home as UC1 - usecase url_root as UC2 +package covid19.blueprints.app_admin.admin_views_frontend { + usecase url_page_info as UC1 + usecase url_database_dump as UC50 + usecase url_database_dump_reimport as UC51 + usecase url_page_admin_crud as UC70 } vu --> UC1 -vu --> UC2 +su --> UC1 +su --> UC50 +su --> UC51 +su --> UC70 +package covid19.blueprints.app_admin.admin_views_for_tasks { + usecase url_alive_message as UC200 + usecase url_database_drop_create as UC201 + usecase url_database_drop as UC202 + usecase url_database_create as UC203 + usecase url_page_tasks as UC220 +} +su --> UC200 +su --> UC201 +su --> UC202 +su --> UC203 +su --> UC220 +package covid19.blueprints.app_admin.admin_celery_tasks { + usecase task_alive_message as UC300 + usecase task_database_drop_create as UC301 + usecase task_database_drop as UC302 + usecase task_database_create as UC303 +} +UC200 --> UC300 +UC201 --> UC301 +UC202 --> UC302 +UC203 --> UC303 @enduml \ No newline at end of file -- GitLab