From 5db24f5a3b75702ad3b525adc6210007b5c99522 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 24 May 2021 12:46:38 +0200
Subject: [PATCH] Refactoring: vaccination
---
docs/BACKLOG.md | 12 ++++++------
.../data_vaccination/vaccination_service.py | 8 ++++----
.../data_vaccination/vaccination_service_update.py | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/BACKLOG.md b/docs/BACKLOG.md
index f57ee48f..9966575b 100644
--- a/docs/BACKLOG.md
+++ b/docs/BACKLOG.md
@@ -145,16 +145,16 @@
* Fixed #95 implement VaccinationService.run_update_fact_table_initial_only
* Fixed #96 implement VaccinationService.run_update_star_schema_incremental
* Fixed #97 implement VaccinationService.run_update_star_schema_initial
-* Fixed #101 implement RkiVaccinationServiceUpdate.update_dimension_tables_only
-* Fixed #102 implement RkiVaccinationServiceUpdate.update_fact_table_incremental_only
-* Fixed #103 implement RkiVaccinationServiceUpdate.update_fact_table_initial_only
-* Fixed #104 implement RkiVaccinationServiceUpdate.update_star_schema_incremental
-* Fixed #105 implement RkiVaccinationServiceUpdate.update_star_schema_initial
+* Fixed #101 implement VaccinationServiceUpdate.update_dimension_tables_only
+* Fixed #102 implement VaccinationServiceUpdate.update_fact_table_incremental_only
+* Fixed #103 implement VaccinationServiceUpdate.update_fact_table_initial_only
+* Fixed #104 implement VaccinationServiceUpdate.update_star_schema_incremental
+* Fixed #105 implement VaccinationServiceUpdate.update_star_schema_initial
* -------------------------------------
* Fixed #90 refactor VaccinationService to new method scheme introduced 07.02.2021
* Fixed #98 refactor RkiVaccinationServiceDownload to new method scheme introduced 07.02.2021
* Fixed #99 refactor VaccinationServiceImport to new method scheme introduced 07.02.2021
-* Fixed #100 refactor RkiVaccinationServiceUpdate to new method scheme introduced 07.02.2021
+* Fixed #100 refactor VaccinationServiceUpdate to new method scheme introduced 07.02.2021
* -------------------------------------
* Fixed #87 change to: Vaccination.datum many to one VaccinationDateReported
* Fixed #106 add Tasks and URLs for starting Tasks to vaccination_views
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py
index b033a5d7..9d9d30fc 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py
@@ -4,8 +4,8 @@ from database import app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
from flask_covid19.blueprints.app_all.all_service_download import BlueprintDownloadService
from flask_covid19.blueprints.data_vaccination.vaccination_service_import import VaccinationServiceImport
-from flask_covid19.blueprints.data_vaccination.vaccination_service_update import RkiVaccinationServiceUpdate
-from flask_covid19.blueprints.data_vaccination.vaccination_service_update import RkiVaccinationServiceUpdateFull
+from flask_covid19.blueprints.data_vaccination.vaccination_service_update import VaccinationServiceUpdate
+from flask_covid19.blueprints.data_vaccination.vaccination_service_update import VaccinationServiceUpdateFull
class VaccinationService:
@@ -17,8 +17,8 @@ class VaccinationService:
self.cfg = BlueprintConfig.create_config_for_rki_vaccination()
self.service_download = BlueprintDownloadService(database, self.cfg)
self.service_import = VaccinationServiceImport(database, self.cfg)
- self.service_update = RkiVaccinationServiceUpdate(database, self.cfg)
- self.service_update_full = RkiVaccinationServiceUpdateFull(database, self.cfg)
+ self.service_update = VaccinationServiceUpdate(database, self.cfg)
+ self.service_update_full = VaccinationServiceUpdateFull(database, self.cfg)
app.logger.debug("------------------------------------------------------------")
app.logger.info(" Vaccination Service [ready]")
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
index a461af3e..d9a844f3 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
@@ -5,7 +5,7 @@ from flask_covid19.blueprints.data_vaccination.vaccination_model import Vaccinat
from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationData
-class RkiVaccinationServiceUpdateBase:
+class VaccinationServiceUpdateBase:
def __init__(self, database, config: BlueprintConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Vaccination Service Update [init]")
@@ -16,10 +16,10 @@ class RkiVaccinationServiceUpdateBase:
app.logger.debug(" Vaccination Service Update [ready] ")
-class RkiVaccinationServiceUpdateFull(RkiVaccinationServiceUpdateBase):
+class VaccinationServiceUpdateFull(VaccinationServiceUpdateBase):
def __full_update_date_reported(self):
- app.logger.info(" RkiVaccinationServiceUpdateFull.__full_update_date_reported [begin]")
+ app.logger.info(" VaccinationServiceUpdateFull.__full_update_date_reported [begin]")
app.logger.info("------------------------------------------------------------")
VaccinationDateReported.remove_all()
date_reported_list = VaccinationImport.get_date_reported_as_array()
@@ -31,7 +31,7 @@ class RkiVaccinationServiceUpdateFull(RkiVaccinationServiceUpdateBase):
output = " full_update RkiVaccination date_reported [ " + str(i) + " ] " + str(o)
app.logger.info(output)
db.session.commit()
- app.logger.info(" RkiVaccinationServiceUpdateFull.__full_update_date_reported [done]")
+ app.logger.info(" VaccinationServiceUpdateFull.__full_update_date_reported [done]")
app.logger.info("------------------------------------------------------------")
return self
@@ -98,7 +98,7 @@ class RkiVaccinationServiceUpdateFull(RkiVaccinationServiceUpdateBase):
return self
-class RkiVaccinationServiceUpdate(RkiVaccinationServiceUpdateBase):
+class VaccinationServiceUpdate(VaccinationServiceUpdateBase):
def __update_date_reported(self):
app.logger.info(" __update_date_reported [begin]")
--
GitLab