diff --git a/.gitignore b/.gitignore
index fb153107e203cc0a9c931a270baaf0482a507cda..26187957eb08685605f63ed70b61d9b412772aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -413,9 +413,6 @@ resources/.arch-internal-preview.css
# Web P
*.webp
-# Portable Network Graphics
-*.png
-
# Animated Portable Network Graphics
*.apng
diff --git a/docs/blueprints/admin/admin_use_cases.png b/docs/blueprints/admin/admin_use_cases.png
new file mode 100644
index 0000000000000000000000000000000000000000..4095eaca6783c71b786de4c5f865114a5271033c
Binary files /dev/null and b/docs/blueprints/admin/admin_use_cases.png differ
diff --git a/docs/blueprints/admin/admin_use_cases.txt b/docs/blueprints/admin/admin_use_cases.txt
index 05bb8a494909fc91be3fc339cfc15beaf234fe45..d55867113cdb097a33a084623e29dab8a4983083 100644
--- a/docs/blueprints/admin/admin_use_cases.txt
+++ b/docs/blueprints/admin/admin_use_cases.txt
@@ -5,30 +5,26 @@ package user {
actor SysAdmin as su
actor Admin as au
}
-package admin {
+package admin_views_frontend {
usecase url_admin_index as UC1
usecase url_admin_tasks as UC2
usecase url_admin_info as UC3
}
-package admin_admin_web {
+package admin_views_for_tasks {
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
+ usecase run_update_star_schema_incremental as UC62
}
-package admin_tasks {
+package admin_celery_tasks {
usecase task_admin_alive_message as UC105
usecase task_admin_database_drop_create as UC106
usecase task_admin_import_all_files as UC107
diff --git a/docs/blueprints/admin/application_domain_model.png b/docs/blueprints/admin/application_domain_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..95efcdf711a0536dbbaf8444eb457ecc9273cdc2
Binary files /dev/null and b/docs/blueprints/admin/application_domain_model.png differ
diff --git a/docs/blueprints/admin/application_domain_model.txt b/docs/blueprints/admin/application_domain_model.txt
new file mode 100644
index 0000000000000000000000000000000000000000..77b3677d22c546dd3d139077487658b3c33f514d
--- /dev/null
+++ b/docs/blueprints/admin/application_domain_model.txt
@@ -0,0 +1,62 @@
+@startuml
+class AdminService {
+ 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()
+}
+AdminService : SQLAlchemy database
+class admin_views_frontend {
+ url_admin_index()
+ url_admin_tasks()
+ url_admin_info()
+}
+class admin_celery_tasks {
+ 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 {
+ 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()
+}
+admin_views_frontend "*" --> "1" AdminService: admin_service
+admin_views_for_tasks "1" *--> "*" AdminService: admin_service
+admin_celery_tasks "*" *--> "1" AdminService: admin_service
+admin_views_frontend "*" --> "1" WhoService: who_service
+admin_views_for_tasks "*" --> "1" WhoService: who_service
+admin_celery_tasks "*" --> "1" WhoService: who_service
+admin_views_frontend "*" --> "1" EcdcService: ecdc_service
+admin_views_for_tasks "*" --> "1" EcdcService: ecdc_service
+admin_celery_tasks "*" --> "1" EcdcService: ecdc_service
+admin_views_frontend "*" --> "1" RkiVaccinationService: rki_vaccination_service
+admin_views_for_tasks "*" --> "1" RkiVaccinationService: rki_vaccination_service
+admin_celery_tasks "*" --> "1" RkiVaccinationService: rki_vaccination_service
+admin_views_frontend "*" --> "1" RkiBundeslaenderService: rki_service_bundeslaender
+admin_views_for_tasks "*" --> "1" RkiBundeslaenderService: rki_service_bundeslaender
+admin_celery_tasks "*" --> "1" RkiBundeslaenderService: rki_service_bundeslaender
+admin_views_frontend "*" --> "1" RkiLandkreiseService: rki_service_landkreise
+admin_views_for_tasks "*" --> "1" RkiLandkreiseService: rki_service_landkreise
+admin_celery_tasks "*" --> "1" RkiLandkreiseService: rki_service_landkreise
+admin_views_frontend "*" --> "1" OwidService: owid_service
+admin_views_for_tasks "*" --> "1" OwidService: owid_service
+admin_celery_tasks "*" --> "1" OwidService: owid_service
+@enduml
diff --git a/docs/blueprints/application/application_domain_model.png b/docs/blueprints/application/application_domain_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..591f4964bf1ae9c1adfd667ef39a9c40daa90065
Binary files /dev/null and b/docs/blueprints/application/application_domain_model.png differ
diff --git a/docs/blueprints/application/application_use_cases.png b/docs/blueprints/application/application_use_cases.png
new file mode 100644
index 0000000000000000000000000000000000000000..b58eaaebcd65ab5fbb52c03918d11a11b1604f80
Binary files /dev/null and b/docs/blueprints/application/application_use_cases.png differ
diff --git a/docs/blueprints/application/application_use_cases.txt b/docs/blueprints/application/application_use_cases.txt
index 42827c0d131dacc09c85305e95a226f41a5f97fb..9c44c3b2daf5642ae33e9a1bcf709065e860c5d4 100644
--- a/docs/blueprints/application/application_use_cases.txt
+++ b/docs/blueprints/application/application_use_cases.txt
@@ -6,9 +6,15 @@ package user {
actor SysAdmin as su
actor Admin as au
}
-package application {
+package application_views_frontend {
usecase url_home as UC1
usecase url_root as UC2
+}
+package application_views_for_tasks {
+
+}
+package application_celery_tasks {
+
}
vu --> UC1
vu --> UC2
diff --git a/docs/blueprints/ecdc/ecdc_domain_model.png b/docs/blueprints/ecdc/ecdc_domain_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..591f4964bf1ae9c1adfd667ef39a9c40daa90065
Binary files /dev/null and b/docs/blueprints/ecdc/ecdc_domain_model.png differ
diff --git a/docs/blueprints/ecdc/ecdc_use_cases.png b/docs/blueprints/ecdc/ecdc_use_cases.png
new file mode 100644
index 0000000000000000000000000000000000000000..c97a68e608919506bcd5eb503b9f0e6669a78ed8
Binary files /dev/null and b/docs/blueprints/ecdc/ecdc_use_cases.png differ
diff --git a/docs/blueprints/ecdc/ecdc_use_cases.txt b/docs/blueprints/ecdc/ecdc_use_cases.txt
index f903f1d33c19c93cd20802b4c19069a9861759b3..43bab7e817b563e5684616e8bdd6d04884c40be7 100644
--- a/docs/blueprints/ecdc/ecdc_use_cases.txt
+++ b/docs/blueprints/ecdc/ecdc_use_cases.txt
@@ -5,7 +5,7 @@ package user {
actor SysAdmin as su
actor Admin as au
}
-package ecdc {
+package ecdc_views_frontend {
usecase url_ecdc_info as UC1
usecase url_ecdc_tasks as UC2
usecase url_ecdc_data_imported as UC3
@@ -19,7 +19,7 @@ package ecdc {
usecase url_ecdc_country_one as UC11
usecase url_ecdc_country_germany as UC12
}
-package ecdc_admin_web {
+package ecdc_views_for_tasks {
usecase task_ecdc_download_only as UC50
usecase task_who_import_only as UC51
usecase task_who_update_dimension_tables_only as UC52
@@ -28,7 +28,7 @@ package ecdc_admin_web {
usecase task_who_update_star_schema_initial as UC55
usecase task_who_update_star_schema_incremental as UC56
}
-package ecdc_tasks {
+package ecdc_celery_tasks {
usecase task_ecdc_download_only as UC100
usecase task_ecdc_import_only as UC101
usecase task_ecdc_update_dimension_tables_only as UC102
diff --git a/docs/blueprints/owid/owid_domain_model.png b/docs/blueprints/owid/owid_domain_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..afc8ed5253ec4d97a2581b95b18b900bdda38698
Binary files /dev/null and b/docs/blueprints/owid/owid_domain_model.png differ
diff --git a/docs/blueprints/owid/owid_use_cases.png b/docs/blueprints/owid/owid_use_cases.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e1a1820251949e339656bbcde4c1535be09f427
Binary files /dev/null and b/docs/blueprints/owid/owid_use_cases.png differ
diff --git a/docs/blueprints/owid/owid_use_cases.txt b/docs/blueprints/owid/owid_use_cases.txt
index 4546487532d758703d5dbcc6b23e68fcf9bd0d5d..ab001f8f7f8e3e5fd48e36a345887d83a74663d0 100644
--- a/docs/blueprints/owid/owid_use_cases.txt
+++ b/docs/blueprints/owid/owid_use_cases.txt
@@ -5,7 +5,7 @@ package user {
actor SysAdmin as su
actor Admin as au
}
-package owid {
+package owid_views_frontend {
usecase owid_info as UC1
usecase owid_imported as UC2
usecase owid_date_reported as UC3
@@ -13,7 +13,7 @@ package owid {
usecase owid_date_country as UC5
usecase owid_date_country_germany as UC6
}
-package owid_admin_web {
+package owid_views_for_tasks {
usecase owid_tasks as UC57
usecase task_owid_download_only as UC50
usecase task_owid_import_only as UC51
@@ -23,7 +23,7 @@ package owid_admin_web {
usecase task_owid_update_star_schema_initial as UC55
usecase task_owid_update_star_schema_incremental as UC56
}
-package owid_tasks {
+package owid_celery_tasks {
usecase owid_task_download_only as UC100
usecase owid_task_import_only as UC101
usecase owid_task_update_dimensiontables_only as UC102
diff --git a/docs/blueprints/rki_vaccination/rki_vaccination_domain_model.png b/docs/blueprints/rki_vaccination/rki_vaccination_domain_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..591f4964bf1ae9c1adfd667ef39a9c40daa90065
Binary files /dev/null and b/docs/blueprints/rki_vaccination/rki_vaccination_domain_model.png differ
diff --git a/docs/blueprints/rki_vaccination/rki_vaccination_use_cases.png b/docs/blueprints/rki_vaccination/rki_vaccination_use_cases.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a569f6fbde3b8e732236ae48ff6dd9948e548c0
Binary files /dev/null and b/docs/blueprints/rki_vaccination/rki_vaccination_use_cases.png differ
diff --git a/docs/blueprints/rki_vaccination/rki_vaccination_use_cases.txt b/docs/blueprints/rki_vaccination/rki_vaccination_use_cases.txt
index 20b950e7e31d6459ca8be59d8b6be1a2ffe585ac..705cc8ede47b6d64eac52caf8842f984732202c2 100644
--- a/docs/blueprints/rki_vaccination/rki_vaccination_use_cases.txt
+++ b/docs/blueprints/rki_vaccination/rki_vaccination_use_cases.txt
@@ -5,13 +5,13 @@ package user {
actor SysAdmin as su
actor Admin as au
}
-package rki_vaccination {
+package rki_views_frontend {
usecase url_vaccination_info as UC1
usecase url_vaccination_tasks as UC2
usecase url_vaccination_imported as UC3
usecase url_vaccination_data as UC4
}
-package rki_vaccination_admin_web {
+package rki_vaccination_views_for_tasks {
usecase task_who_download_only as UC50
usecase task_who_import_only as UC51
usecase task_who_update_dimension_tables_only as UC52
@@ -20,7 +20,7 @@ package rki_vaccination_admin_web {
usecase task_who_update_star_schema_initial as UC55
usecase task_who_update_star_schema_incremental as UC56
}
-package rki_vaccination_tasks {
+package rki_vaccination_celery_tasks {
usecase url_vaccination_task_download_only as UC100
usecase url_vaccination_task_import_only as UC101
usecase url_vaccination_task_update_dimensiontables_only as UC102
diff --git a/docs/blueprints/who/who_domain_model.png b/docs/blueprints/who/who_domain_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c350944a4911ebcc27dd11aa620448eac99969d
Binary files /dev/null and b/docs/blueprints/who/who_domain_model.png differ
diff --git a/docs/blueprints/who/who_use_cases.png b/docs/blueprints/who/who_use_cases.png
new file mode 100644
index 0000000000000000000000000000000000000000..083d1b6d7450e567e9f663273ae22285855f76c8
Binary files /dev/null and b/docs/blueprints/who/who_use_cases.png differ
diff --git a/docs/blueprints/who/who_use_cases.txt b/docs/blueprints/who/who_use_cases.txt
index c238522b71a2fdffc69e71eccabdde399e1d9f1b..05d027e19f7c2d7480721d46068884c2623584ee 100644
--- a/docs/blueprints/who/who_use_cases.txt
+++ b/docs/blueprints/who/who_use_cases.txt
@@ -5,7 +5,7 @@ package user {
actor SysAdmin as su
actor Admin as au
}
-package who {
+package who_views_frontend {
usecase url_who_info as UC1
usecase url_who_tasks as UC2
usecase url_who_imported as UC3
@@ -27,7 +27,7 @@ package who {
usecase url_who_region_all as UC19
usecase url_who_region_all as UC20
}
-package who_admin_web {
+package who_views_for_tasks {
usecase url_task_who_download_only as UC50
usecase url_task_who_import_only as UC51
usecase url_task_who_update_dimension_tables_only as UC52
@@ -36,7 +36,7 @@ package who_admin_web {
usecase url_task_who_update_star_schema_initial as UC55
usecase url_task_who_update_star_schema_incremental as UC56
}
-package who_tasks {
+package who_celery_tasks {
usecase task_who_download_only as UC100
usecase task_who_import_only as UC101
usecase task_who_update_dimension_tables_only as UC102