From 4b6682cedb9af0ca929852ec64cb095699ae10d5 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 17 Feb 2021 23:55:48 +0100
Subject: [PATCH] ### 0.0.18 Release
---
BACKLOG.md | 37 ++++++-----
src/covid19/blueprints/ecdc/ecdc_service.py | 2 +-
.../blueprints/rki_landkreise/rki_service.py | 63 +++----------------
src/covid19/blueprints/who/who_service.py | 37 +----------
4 files changed, 32 insertions(+), 107 deletions(-)
diff --git a/BACKLOG.md b/BACKLOG.md
index 74b5f3d1..54848165 100644
--- a/BACKLOG.md
+++ b/BACKLOG.md
@@ -203,31 +203,34 @@
### 0.0.18 Release
+* Fixed #133 implement RkiBundeslaenderService.task_database_drop_create
+* Fixed #134 implement RkiBundeslaenderService.run_update_dimension_tables_only
+* Fixed #135 implement RkiBundeslaenderService.run_update_fact_table_incremental_only
+* Fixed #136 implement RkiBundeslaenderService.run_update_fact_table_initial_only
+* Fixed #137 implement RkiBundeslaenderService.run_update_star_schema_incremental
+* Fixed #138 implement RkiBundeslaenderService.run_update_star_schema_initial
+* Fixed #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
+* -------------------------------------
+* Fixed #147 refactor RkiBundeslaenderServiceUpdate.__update_who_date_reported
+* Fixed #148 refactor RkiBundeslaenderServiceUpdate.__update_who_region
+* Fixed #149 refactor RkiBundeslaenderServiceUpdate.__update_who_country
+* Fixed #150 refactor RkiBundeslaenderServiceUpdate.__update_who_global_data
+* Fixed #151 refactor RkiBundeslaenderServiceUpdate.__update_who_global_data_short
+* Fixed #152 refactor RkiBundeslaenderServiceUpdate.__update_who_global_data_initial
+* Fixed #153 refactor RkiBundeslaenderServiceUpdate.update_db
+* Fixed #154 refactor RkiBundeslaenderServiceUpdate.update_db_short
+* Fixed #155 refactor RkiBundeslaenderServiceUpdate.update_db_initial
+* -------------------------------------
+* Fixed #131 change to ORM ClassHierarchy in: RkiGermanyDataImportTable.get_new_dates_as_array
* Issue #129 change to ORM ClassHierarchy in: RkiLandkreiseImport.get_new_dates_as_array
-* Issue #131 change to ORM ClassHierarchy in: RkiGermanyDataImportTable.get_new_dates_as_array
* Issue #146 add Tasks and URLs for starting Tasks to rki_views
* Issue #127 implement RkiBundeslaenderImport.get_dates_reported
-* Issue #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
-* Issue #133 implement RkiBundeslaenderService.task_database_drop_create
-* Issue #134 implement RkiBundeslaenderService.run_update_dimension_tables_only
-* Issue #135 implement RkiBundeslaenderService.run_update_fact_table_incremental_only
-* Issue #136 implement RkiBundeslaenderService.run_update_fact_table_initial_only
-* Issue #137 implement RkiBundeslaenderService.run_update_star_schema_incremental
-* Issue #138 implement RkiBundeslaenderService.run_update_star_schema_initial
+* -------------------------------------
* Issue #141 implement RkiBundeslaenderServiceUpdate.update_dimension_tables_only
* Issue #142 implement RkiBundeslaenderServiceUpdate.update_fact_table_incremental_only
* Issue #143 implement RkiBundeslaenderServiceUpdate.update_fact_table_initial_only
* Issue #144 implement RkiBundeslaenderServiceUpdate.update_star_schema_incremental
* Issue #145 implement RkiBundeslaenderServiceUpdate.update_star_schema_initial
-* Fixed #147 refactor RkiBundeslaenderServiceUpdate.__update_who_date_reported
-* Issue #148 refactor RkiBundeslaenderServiceUpdate.__update_who_region
-* Issue #149 refactor RkiBundeslaenderServiceUpdate.__update_who_country
-* Issue #150 refactor RkiBundeslaenderServiceUpdate.__update_who_global_data
-* Issue #151 refactor RkiBundeslaenderServiceUpdate.__update_who_global_data_short
-* Issue #152 refactor RkiBundeslaenderServiceUpdate.__update_who_global_data_initial
-* Issue #153 refactor RkiBundeslaenderServiceUpdate.update_db
-* Issue #154 refactor RkiBundeslaenderServiceUpdate.update_db_short
-* Issue #155 refactor RkiBundeslaenderServiceUpdate.update_db_initial
### 0.0.198 Release
diff --git a/src/covid19/blueprints/ecdc/ecdc_service.py b/src/covid19/blueprints/ecdc/ecdc_service.py
index 8a45d814..ff1fe49d 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service.py
@@ -27,7 +27,7 @@ class EcdcService:
def task_database_drop_create(self):
self.service_import.import_file()
- self.service_update.update_db_short()
+ self.service_update.update_star_schema_initial()
return self
def run_download_only(self):
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service.py b/src/covid19/blueprints/rki_landkreise/rki_service.py
index ea3915d7..361f31ce 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service.py
@@ -7,7 +7,6 @@ from covid19.blueprints.rki_landkreise.rki_service_import import RkiLandkreiseSe
from covid19.blueprints.rki_landkreise.rki_service_update import RkiLandkreiseServiceUpdate
-# TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
class RkiLandkreiseService:
def __init__(self, database):
app.logger.debug("------------------------------------------------------------")
@@ -27,7 +26,9 @@ class RkiLandkreiseService:
return self
def task_database_drop_create(self):
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
+ self.service_import.import_file()
+ self.service_update.update_dimension_tables_only()
+ self.service_update.update_fact_table_incremental_only()
# TODO: #133 implement RkiBundeslaenderService.task_database_drop_create
return self
@@ -40,76 +41,32 @@ class RkiLandkreiseService:
return self
def run_update_dimension_tables_only(self):
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
+ self.service_update.update_dimension_tables_only()
# TODO: #134 implement RkiBundeslaenderService.run_update_dimension_tables_only
return self
def run_update_fact_table_incremental_only(self):
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
+ self.service_update.update_fact_table_incremental_only()
# TODO: #135 implement RkiBundeslaenderService.run_update_fact_table_incremental_only
return self
def run_update_fact_table_initial_only(self):
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
+ self.service_update.update_fact_table_initial_only()
# TODO: #136 implement RkiBundeslaenderService.run_update_fact_table_initial_only
return self
def run_update_star_schema_incremental(self):
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
+ self.service_import.import_file()
+ self.service_update.update_star_schema_incremental()
# TODO: #137 implement RkiBundeslaenderService.run_update_star_schema_incremental
return self
def run_update_star_schema_initial(self):
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
+ self.service_import.import_file()
+ self.service_update.update_star_schema_initial()
# TODO: #138 implement RkiBundeslaenderService.run_update_star_schema_initial
return self
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
- def run_download(self):
- app.logger.info(" run update [begin]")
- app.logger.info("------------------------------------------------------------")
- success = self.service_download.download_file()
- app.logger.info("")
- app.logger.info(" run update [done]")
- app.logger.info("------------------------------------------------------------")
- return success
-
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
- def run_update(self, import_file=True):
- app.logger.info(" run update [begin]")
- app.logger.info("------------------------------------------------------------")
- if import_file:
- self.service_import.import_file()
- self.service_update.update_db()
- app.logger.info("")
- app.logger.info(" run update [done]")
- app.logger.info("------------------------------------------------------------")
- return self
-
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
- def run_update_short(self, import_file=True):
- app.logger.info(" run update short [begin]")
- app.logger.info("------------------------------------------------------------")
- if import_file:
- self.service_import.import_file()
- self.service_update.update_db_short()
- app.logger.info("")
- app.logger.info(" run update short [done]")
- app.logger.info("------------------------------------------------------------")
- return self
-
- # TODO: #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
- def run_update_initial(self, import_file=True):
- app.logger.info(" run update initial [begin]")
- app.logger.info("------------------------------------------------------------")
- if import_file:
- self.service_import.import_file()
- self.service_update.update_db_initial()
- app.logger.info("")
- app.logger.info(" run update initial [done]")
- app.logger.info("------------------------------------------------------------")
- return self
-
def download_all_files(self):
self.service_download.download_file()
return self
diff --git a/src/covid19/blueprints/who/who_service.py b/src/covid19/blueprints/who/who_service.py
index d7d6887e..d2e5031f 100644
--- a/src/covid19/blueprints/who/who_service.py
+++ b/src/covid19/blueprints/who/who_service.py
@@ -21,7 +21,7 @@ class WhoService:
app.logger.info(" WHO Service [ready]")
def pretask_database_drop_create(self):
- flash("who_service.run_download started")
+ flash("WhoService.pretask_database_drop_create started")
self.service_download.download_file()
return self
@@ -40,68 +40,33 @@ class WhoService:
#def run_update_star_schema_initial(self):
def run_download_only(self):
- app.logger.info(" run_download_only [begin]")
- app.logger.info("------------------------------------------------------------")
self.service_download.download_file()
- app.logger.info("")
- app.logger.info(" run_download_only [done]")
- app.logger.info("------------------------------------------------------------")
return self
def run_import_only(self):
- app.logger.info(" run_import_only [begin]")
- app.logger.info("------------------------------------------------------------")
self.service_import.import_file()
- app.logger.info("")
- app.logger.info(" run_import_only [done]")
- app.logger.info("------------------------------------------------------------")
return self
def run_update_dimension_tables_only(self):
- app.logger.info(" run_update_only [begin]")
- app.logger.info("------------------------------------------------------------")
self.service_update.update_dimension_tables_only()
- app.logger.info("")
- app.logger.info(" run_update_only [done]")
- app.logger.info("------------------------------------------------------------")
return self
def run_update_fact_table_incremental_only(self):
- app.logger.info(" run_update_only [begin]")
- app.logger.info("------------------------------------------------------------")
self.service_update.update_fact_table_incremental_only()
- app.logger.info("")
- app.logger.info(" run_update_only [done]")
- app.logger.info("------------------------------------------------------------")
return self
def run_update_fact_table_initial_only(self):
- app.logger.info(" run_update_initial [begin]")
- app.logger.info("------------------------------------------------------------")
self.service_update.update_fact_table_initial_only()
- app.logger.info("")
- app.logger.info(" run_update_initial [done]")
- app.logger.info("------------------------------------------------------------")
return self
def run_update_star_schema_incremental(self):
- app.logger.info(" run_update_short [begin]")
- app.logger.info("------------------------------------------------------------")
self.service_import.import_file()
self.service_update.update_star_schema_incremental()
- app.logger.info("")
- app.logger.info(" run_update_short [done]")
- app.logger.info("------------------------------------------------------------")
return self
def run_update_star_schema_initial(self):
- app.logger.info(" run_update_initial_full [begin]")
- app.logger.info("------------------------------------------------------------")
self.service_import.import_file()
self.service_update.update_star_schema_initial()
- app.logger.info("")
- app.logger.info(" run_update_initial_full [done]")
- app.logger.info("------------------------------------------------------------")
return self
def download_all_files(self):
--
GitLab