From c57ffcc775d6f26c632de56a919ab8784734e39f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sun, 25 Apr 2021 23:10:37 +0200
Subject: [PATCH] working on 0.0.31 Release *
------------------------------------- * Fixed #211 ECDC-templates: change URL
to for_url() * Fixed #213 WHO-template: change URL to for_url() *
------------------------------------- * Issue #195
RkiVaccinationImport.get_daterep_missing_in_vaccination_data(): native SQL to
SQLalechemy Query * Fixed #83 WhoImport.get_new_dates_as_array() SQLalchemy
instead of SQL * Fixed #219 WhoImport.countries() SQLalchemy instead of SQL *
------------------------------------- * Issue #207 remove deprecated:
database.port * Issue #208 remove deprecated: database.run_run_with_debug *
Issue #209 remove deprecated: database.ITEMS_PER_PAGE *
------------------------------------- * Issue #210 database.py: logging for
Celery on Windows * ------------------------------------- * Fixed #196
OwidImport.get_new_dates_reported_as_array() needs implementation *
------------------------------------- * 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() *
-------------------------------------
---
src/covid19/blueprints/owid_test/owid_test_service.py | 5 +++--
src/covid19/blueprints/owid_test/owid_test_views.py | 2 +-
src/covid19/blueprints/who_test/who_test_service.py | 5 +++--
src/covid19/blueprints/who_test/who_test_views.py | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/covid19/blueprints/owid_test/owid_test_service.py b/src/covid19/blueprints/owid_test/owid_test_service.py
index 7233e05d..9640cb2c 100644
--- a/src/covid19/blueprints/owid_test/owid_test_service.py
+++ b/src/covid19/blueprints/owid_test/owid_test_service.py
@@ -10,11 +10,12 @@ from covid19.blueprints.owid.owid_model import OwidDateReported, OwidContinent,
class OwidTestService:
- def __init__(self, database):
+ def __init__(self, database, owid_service):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" OwidTestService [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
+ self.__owid_service = owid_service
self.cfg = ApplicationServiceConfig.create_config_for_owid()
app.logger.debug("------------------------------------------------------------")
app.logger.info(" OwidTestService [ready]")
@@ -43,7 +44,7 @@ class OwidTestService:
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" OwidTestService.run_update_star_schema_incremental() [START]")
app.logger.debug("------------------------------------------------------------")
- app.logger.debug(" TODO....")
+ self.__owid_service.run_update_star_schema_incremental()
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" OwidTestService.run_update_star_schema_incremental() [DONE]")
app.logger.debug("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/owid_test/owid_test_views.py b/src/covid19/blueprints/owid_test/owid_test_views.py
index 07c31f39..00837ed8 100644
--- a/src/covid19/blueprints/owid_test/owid_test_views.py
+++ b/src/covid19/blueprints/owid_test/owid_test_views.py
@@ -14,7 +14,7 @@ from covid19.blueprints.application.application_model_transient import Applicati
from covid19.blueprints.owid_test.owid_test_service import OwidTestService
-owid_test_service = OwidTestService(db)
+owid_test_service = OwidTestService(db, owid_service)
app_owid_test = Blueprint('owid_test', __name__, template_folder='templates', url_prefix='/owid/test')
diff --git a/src/covid19/blueprints/who_test/who_test_service.py b/src/covid19/blueprints/who_test/who_test_service.py
index ac7b0e72..26a1be17 100644
--- a/src/covid19/blueprints/who_test/who_test_service.py
+++ b/src/covid19/blueprints/who_test/who_test_service.py
@@ -5,11 +5,12 @@ from covid19.blueprints.application.application_service_config import Applicatio
from covid19.blueprints.who.who_model import WhoDateReported, WhoData
class WhoTestService:
- def __init__(self, database):
+ def __init__(self, database, who_service):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WHO Test Service [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
+ self.__who_service = who_service
self.cfg = ApplicationServiceConfig.create_config_for_who()
app.logger.debug("------------------------------------------------------------")
app.logger.info(" WHO Test Service [ready]")
@@ -38,7 +39,7 @@ class WhoTestService:
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WhoTestService.run_update_star_schema_incremental() [START]")
app.logger.debug("------------------------------------------------------------")
- app.logger.debug("")
+ self.__who_service.run_update_star_schema_incremental()
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WhoTestService.run_update_star_schema_incremental() [DONE]")
app.logger.debug("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/who_test/who_test_views.py b/src/covid19/blueprints/who_test/who_test_views.py
index 48d487fc..5445165d 100644
--- a/src/covid19/blueprints/who_test/who_test_views.py
+++ b/src/covid19/blueprints/who_test/who_test_views.py
@@ -17,7 +17,7 @@ from covid19.blueprints.who.who_views import app_who
from covid19.blueprints.who_test.who_test_service import WhoTestService
-who_test_service = WhoTestService(db)
+who_test_service = WhoTestService(db, who_service)
app_who_test = Blueprint('who_test', __name__, template_folder='templates', url_prefix='/who/test')
--
GitLab