Skip to content
Snippets Groups Projects
Commit f24fec91 authored by thomaswoehlke's avatar thomaswoehlke
Browse files

Merge remote-tracking branch 'origin/main'

parents 95150d38 42a24ab5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 387 additions and 15 deletions
.gitignore
+ 1
− 1
View file @ f24fec91
......@@ -1146,4 +1146,4 @@ dump.rdb
/logfile5.txt
/logfile*.txt
/src/covid19/static/vendor/
/.checkmate/
/.checkmate
README.md
+ 1
− 1
View file @ f24fec91
# covid19python
* Version 0.0.32 asdf
* Version 0.0.32
## git
* github: https://git.noc.ruhr-uni-bochum.de/thomaswoehlke/flask-covid19.git
......
data @ 55065ba6
Compare 107d3f8a...55065ba6
Subproject commit 107d3f8a9cf82edde724adc26f7fcacfb4a0ec34
Subproject commit 55065ba62c4341104e2c6768a3ebfa046bd2a013
docs/BACKLOG.md
+ 116
− 12
View file @ f24fec91
......@@ -295,33 +295,137 @@
### 0.0.32 Release
* Fixed #212 implement OwidService.task_database_drop_create()
* Fixed #214 implement OwidServiceUpdate.update_dimension_tables_only()
* Fixed #215 implement OwidServiceUpdate.update_fact_table_incremental_only()
* Fixed #216 implement OwidServiceUpdate.update_fact_table_initial_only()
* Fixed #217 implement OwidServiceUpdate.update_star_schema_incremental()
* Fixed #218 implement OwidServiceUpdate.update_star_schema_initial()
* Fixed #210 database.py: logging for Celery on Windows (wontfix)
### 0.0.33 Release
* Fixed #165 implement url_ecdc_task_download_only in europe_views.py
* Fixed #166 implement url_ecdc_task_import_only in europe_views.py
* Fixed #167 implement url_ecdc_task_update_dimensiontables_only in europe_views.py
* Fixed #168 implement url_ecdc_task_update_facttable_incremental_only in europe_views.py
* Fixed #169 implement url_ecdc_task_update_facttable_initial_only in europe_views.py
* Fixed #163 implement url_ecdc_task_update_star_schema_initial in europe_views.py
* Fixed #164 implement url_ecdc_task_update_starschema_incremental in europe_views.py
* Fixed #177 BUG: RkiBundeslaenderServiceImport.import_file (wontfix)
* Fixed #178 BUG: RkiLandkreiseServiceImport.import_file (wontfix)
* Fixed #222 RKI: Download Data File
* Fixed #223 RKI: Prepare Navigation and Pages for Info, Tasks, Tests and RKI imported
* Fixed #224 RKI: Prepare Development of RKI import
### 0.0.34 Release
* -------------------------------------
* Issue WHO: Development: Navigation and Pages for Info, Tasks and Tests
* Issue WHO: Development: Download Data File
* Issue WHO: Development: import
* Issue WHO: Development: full update Dimension Tables
* Issue WHO: Development: full update Fact Table
* Issue WHO: Development: update Dimension Tables
* Issue WHO: Development: update Fact Table
* Issue WHO: Development: Navigation and Pages for Imported Table
* Issue WHO: Development: Navigation and Pages for Dimension Tables
* Issue WHO: Development: Navigation and Pages for Fact Table
* Issue WHO: Update UML Diagrams for Domain Model
* Issue WHO: Update UML Diagrams for Use Cases
* Issue WHO: QA: add Selenium Tests for all Frontend Urls and Pages without any Access to Database
* Issue WHO: QA: add Selenium Tests for all Frontend Urls and Pages with Read Access to Database
* Issue WHO: Documentation: write Tast-Plan for manual Testing
* Issue WHO: Documentation: write Checklist for manual Testing
* -------------------------------------
* Issue OWID: Development: Navigation and Pages for Info, Tasks and Tests
* Issue OWID: Development: Download Data File
* Issue OWID: Development: import
* Issue OWID: Development: full update Dimension Tables
* Issue OWID: Development: full update Fact Table
* Issue OWID: Development: update Dimension Tables
* Issue OWID: Development: update Fact Table
* Issue OWID: Development: Navigation and Pages for Imported Table
* Issue OWID: Development: Navigation and Pages for Dimension Tables
* Issue OWID: Development: Navigation and Pages for Fact Table
* Issue OWID: Documentation: Update UML Diagrams for Domain Model
* Issue OWID: Documentation: Update UML Diagrams for Use Cases
* Issue OWID: QA: add Selenium Tests for all Frontend Urls and Pages without any Access to Database
* Issue OWID: QA: add Selenium Tests for all Frontend Urls and Pages with Read Access to Database
* Issue OWID: Documentation: write Tast-Plan for manual Testing
* Issue OWID: Documentation: write Checklist for manual Testing
* -------------------------------------
* Issue ECDC: Development: Navigation and Pages for Info, Tasks and Tests
* Issue ECDC: Development: Download Data File
* Issue ECDC: Development: import
* Issue ECDC: Development: full update Dimension Tables
* Issue ECDC: Development: full update Fact Table
* Issue ECDC: Development: update Dimension Tables
* Issue ECDC: Development: update Fact Table
* Issue ECDC: Development: Navigation and Pages for Imported Table
* Issue ECDC: Development: Navigation and Pages for Dimension Tables
* Issue ECDC: Development: Navigation and Pages for Fact Table
* Issue ECDC: Documentation: Update UML Diagrams for Domain Model
* Issue ECDC: Documentation: Update UML Diagrams for Use Cases
* Issue ECDC: QA: add Selenium Tests for all Frontend Urls and Pages without any Access to Database
* Issue ECDC: QA: add Selenium Tests for all Frontend Urls and Pages with Read Access to Database
* Issue ECDC: Documentation: write Tast-Plan for manual Testing
* Issue ECDC: Documentation: write Checklist for manual Testing
* -------------------------------------
* Issue RKI Vaccination: Development: Navigation and Pages for Info, Tasks and Tests
* Issue RKI Vaccination: Development: Download Data File
* Issue RKI Vaccination: Development: import
* Issue RKI Vaccination: Development: full update Dimension Tables
* Issue RKI Vaccination: Development: full update Fact Table
* Issue RKI Vaccination: Development: update Dimension Tables
* Issue RKI Vaccination: Development: update Fact Table
* Issue RKI Vaccination: Development: Navigation and Pages for Imported Table
* Issue RKI Vaccination: Development: Navigation and Pages for Dimension Tables
* Issue RKI Vaccination: Development: Navigation and Pages for Fact Table
* Issue RKI Vaccination: Documentation: Update UML Diagrams for Domain Model
* Issue RKI Vaccination: Documentation: Update UML Diagrams for Use Cases
* Issue RKI Vaccination: QA: add Selenium Tests for all Frontend Urls and Pages without any Access to Database
* Issue RKI Vaccination: QA: add Selenium Tests for all Frontend Urls and Pages with Read Access to Database
* Issue RKI Vaccination: Documentation: write Tast-Plan for manual Testing
* Issue RKI Vaccination: Documentation: write Checklist for manual Testing
* -------------------------------------
* Issue RKI: Development: Navigation and Pages for Info, Tasks and Tests
* Issue RKI: Development: Download Data File
* Issue RKI: Development: import
* Issue RKI: Development: full update Dimension Tables
* Issue RKI: Development: full update Fact Table
* Issue RKI: Development: update Dimension Tables
* Issue RKI: Development: update Fact Table
* Issue RKI: Development: Navigation and Pages for Imported Table
* Issue RKI: Development: Navigation and Pages for Dimension Tables
* Issue RKI: Development: Navigation and Pages for Fact Table
* Issue RKI: QA: add Selenium Tests for all Frontend Urls and Pages without any Access to Database
* Issue RKI: QA: add Selenium Tests for all Frontend Urls and Pages with Read Access to Database
* Issue RKI: Documentation: write Tast-Plan for manual Testing
* Issue RKI: Documentation: write Checklist for manual Testing
* -------------------------------------
* Issue #220 add Selenium Tests for all Frontend Urls and Pages without any Access to Database
* Issue #221 add Selenium Tests for all Frontend Urls and Pages with Read Access to Database
### 0.0.35 Release
* -------------------------------------
* Issue #195 RkiVaccinationImport.get_daterep_missing_in_vaccination_data(): native SQL to SQLalechemy Query
* -------------------------------------
* Issue #207 remove deprecated: database.port
* Issue #208 remove deprecated: database.run_run_with_debug
* Issue #209 remove deprecated: database.ITEMS_PER_PAGE
* -------------------------------------
* Issue #212 implement OwidService.task_database_drop_create()
* -------------------------------------
* Issue #214 implement OwidServiceUpdate.update_dimension_tables_only()
* Issue #215 implement OwidServiceUpdate.update_fact_table_incremental_only()
* Issue #216 implement OwidServiceUpdate.update_fact_table_initial_only()
* Issue #217 implement OwidServiceUpdate.update_star_schema_incremental()
* Issue #218 implement OwidServiceUpdate.update_star_schema_initial()
* -------------------------------------
* Issue #210 database.py: logging for Celery on Windows
### 00 Inbox
* -------------------------------------
* Issue add Selenium Tests for all Frontend Urls and Pages without any Access to Database
* Issue add Selenium Tests for all Frontend Urls and Pages with Read Access to Database
### 01 Next
* -------------------------------------
* Issue #198 UML: WHO Visual Graphs for Data per Countries order by Date
* Issue #5 WHO Visual Graphs for Data per Countries order by Date
* -------------------------------------
* Issue #177 BUG: RkiBundeslaenderServiceImport.import_file
* Issue #178 BUG: RkiLandkreiseServiceImport.import_file
### 02 Soon
* -------------------------------------
......
docs/BACKLOG_Config.md 0 → 100644
+ 23
− 0
View file @ f24fec91
# config
## Matrix Blueprints
| WHO | OWID | ECDC | Vaccination | RKI | Intensivregister | All | Label | config |
|-------|-------|-------|-------------|-------|------------------|---------|---------------|------------------------------------------------|
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Navigation and Pages for Info, Tasks and Tests |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Download Data File |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | import |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | full update Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | full update Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | update Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | update Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Navigation and Pages for Imported Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Navigation and Pages for Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Navigation and Pages for Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Documentation | Update UML Diagrams for Domain Model |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Documentation | Update UML Diagrams for Use Cases |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Documentation | write Tast-Plan for manual Testing |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Documentation | write Checklist for manual Testing |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | QA | add Selenium Tests for all Frontend Urls and Pages without any Access to Database |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | QA | add Selenium Tests for all Frontend Urls and Pages with Read Access to Database |
docs/BACKLOG_Issues.md 0 → 100644
+ 23
− 0
View file @ f24fec91
# Backlog
## Matrix Blueprints
| WHO | OWID | ECDC | Vaccination | RKI | Intensivregister | All | Label | config |
|-------|-------|-------|-------------|-------|------------------|---------|---------------|------------------------------------------------|
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Navigation and Pages for Info, Tasks and Tests |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Download Data File |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | import |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | full update Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | full update Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | update Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | update Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Navigation and Pages for Imported Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Navigation and Pages for Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Development | Navigation and Pages for Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Documentation | Update UML Diagrams for Domain Model |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Documentation | Update UML Diagrams for Use Cases |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | QA | add Selenium Tests for all Frontend Urls and Pages without any Access to Database |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | QA | add Selenium Tests for all Frontend Urls and Pages with Read Access to Database |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Documentation | write Tast-Plan for manual Testing |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Documentation | write Checklist for manual Testing |
docs/BACKLOG_Test_Cases.md 0 → 100644
+ 22
− 0
View file @ f24fec91
# Test Cases
## Matrix Data Blueprints
| WHO | OWID | ECDC | Vaccination | RKI | Intensivregister | All | Label | Test Case |
|-------|-------|-------|-------------|-------|------------------|---------|-----------|------------------------------------------------|
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | Navigation and Pages for Info, Tasks and Tests |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | Download Data File |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | import |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | full update Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | full update Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | update Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | update Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | Navigation and Pages for Imported Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | Navigation and Pages for Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | Navigation and Pages for Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | Update UML Diagrams for Domain Model |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | Update UML Diagrams for Use Cases |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | add Selenium Tests for all Frontend Urls and Pages without any Access to Database |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | add Selenium Tests for all Frontend Urls and Pages with Read Access to Database |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | write Tast-Plan for manual Testing |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Test Case | write Checklist for manual Testing |
docs/BACKLOG_Use_Cases.md 0 → 100644
+ 22
− 0
View file @ f24fec91
# Use Cases
## Matrix Data Blueprints
| WHO | OWID | ECDC | Vaccination | RKI | Intensivregister | All | Label | Use Case |
|-------|-------|-------|-------------|-------|------------------|---------|----------|------------------------------------------------|
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | Navigation and Pages for Info, Tasks and Tests |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | Download Data File |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | import |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | full update Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | full update Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | update Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | update Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | Navigation and Pages for Imported Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | Navigation and Pages for Dimension Tables |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | Navigation and Pages for Fact Table |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | Update UML Diagrams for Domain Model |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | Update UML Diagrams for Use Cases |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | add Selenium Tests for all Frontend Urls and Pages without any Access to Database |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | add Selenium Tests for all Frontend Urls and Pages with Read Access to Database |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | write Tast-Plan for manual Testing |
| Issue | Issue | Issue | Issue | Issue | Issue | Issue | Use Case | write Checklist for manual Testing |
docs/Blueprints.md 0 → 100644
+ 16
− 0
View file @ f24fec91
# Blueprints
## App Blueprints
### app_admin
### app_all
Fuer alle Data Blueprints. Gemeinsamkeiten aller Data Blueprints.
### app_application
### app_user
## Data Blueprints
### who
### owid
### ecdc
### rki_vaccination
### rki_cases
### intensivregister
\ No newline at end of file
docs/blueprints/app_application/uml/domain_model/application_domain_model.png 0 → 100644
+ 0
− 0
View file @ f24fec91
docs/blueprints/app_application/uml/domain_model/application_domain_model.png

221 KiB

docs/blueprints/app_application/uml/domain_model/application_domain_model.txt 0 → 100644
+ 162
− 0
View file @ f24fec91
@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 ApplicationPage << (T,#FF7700) Transient >> {
title: String
subtitle: String
subtitle_info: String
}
class ApplicationServiceConfig << (T,#FF7700) Transient >> {
limit_nr: Integer
data_path: String
slug: String
category: String
sub_category: String
tablename: String
cvsfile_name: String
url_src: String
cvsfile_path: String
msg_job: String
msg_ok: String
msg_error: String
create_config_for_who()
create_config_for_rki_vaccination()
create_config_for_owid()
create_config_for_ecdc()
create_config_for_rki_bundeslaender()
create_config_for_rki_landkreise()
}
class ApplicationServiceDownload << (S,red) Service >> {
-log_error()
-log_success()
-prepare_download()
-download_with_wget()
-download_with_subprocess_and_os_native_wget()
download_file()
}
class database << (S,#FF7700) Singleton >> {
{static} int port
{static} bool run_run_with_debug
{static} int ITEMS_PER_PAGE
app: Flask
db: SQLAlchemy
admin: Admin
app_cors: CORS
app_bootstrap: Bootstrap
create_app()
create_db(my_app)
create_db_test(my_app)
create_celery(my_app)
create_admin(my_app)
}
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 >> {
}
class EcdcService << (S,red) Service >> {
}
class RkiVaccinationService << (S,red) Service >> {
}
class RkiBundeslaenderService << (S,red) Service >> {
}
class RkiLandkreiseService << (S,red) Service >> {
}
class OwidService << (S,red) Service >> {
}
ApplicationDateReported <|-- RkiDateReported
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
application_services "*" --> "1" ApplicationService: application_service
application_services "*" --> "1" AdminService: admin_service
application_services "*" --> "1" WhoService: who_service
application_services "*" --> "1" EcdcService: ecdc_service
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
ApplicationService "*" --> "1" database
ApplicationServiceDownload "*" --> "1" database
AdminService "*" --> "1" database
WhoService "*" --> "1" database
EcdcService "*" --> "1" database
RkiBundeslaenderService "*" --> "1" database
RkiLandkreiseService "*" --> "1" database
RkiVaccinationService "*" --> "1" database
OwidService "*" --> "1" database
ApplicationService : SQLAlchemy database
ApplicationServiceDownload : SQLAlchemy database
AdminService : SQLAlchemy database
WhoService : SQLAlchemy database
EcdcService : SQLAlchemy database
RkiBundeslaenderService : SQLAlchemy database
RkiLandkreiseService : SQLAlchemy database
RkiVaccinationService : SQLAlchemy database
OwidService : SQLAlchemy database
@enduml
docs/blueprints/app_application/uml/use_cases/application_use_cases.png 0 → 100644
+ 0
− 0
View file @ f24fec91
docs/blueprints/app_application/uml/use_cases/application_use_cases.png

17.7 KiB

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment