From 2d1cfc4867d13031c7665ecec5bc5c3117dda642 Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Mon, 24 May 2021 12:41:51 +0200 Subject: [PATCH] Refactoring: vaccination --- docs/BACKLOG.md | 16 ++++++++-------- src/flask_covid19/__init__.py | 2 +- .../blueprints/app_all/all_service.py | 4 ++-- .../blueprints/app_web/web_services.py | 4 ++-- .../data_vaccination/vaccination_service.py | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/BACKLOG.md b/docs/BACKLOG.md index f26b8185..e11dd920 100644 --- a/docs/BACKLOG.md +++ b/docs/BACKLOG.md @@ -138,20 +138,20 @@ * Fixed #175 implement url_vaccination_task_update_facttable_incremental_only in vaccination_views.py * Fixed #176 implement url_vaccination_task_update_facttable_initial_only in vaccination_views.py * ------------------------------------- -* Fixed #91 implement RkiVaccinationService.run_download_only -* Fixed #92 implement RkiVaccinationService.run_import_only -* Fixed #93 implement RkiVaccinationService.run_update_dimension_tables_only -* Fixed #94 implement RkiVaccinationService.run_update_fact_table_incremental_only -* Fixed #95 implement RkiVaccinationService.run_update_fact_table_initial_only -* Fixed #96 implement RkiVaccinationService.run_update_star_schema_incremental -* Fixed #97 implement RkiVaccinationService.run_update_star_schema_initial +* Fixed #91 implement VaccinationService.run_download_only +* Fixed #92 implement VaccinationService.run_import_only +* Fixed #93 implement VaccinationService.run_update_dimension_tables_only +* Fixed #94 implement VaccinationService.run_update_fact_table_incremental_only +* 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 #90 refactor RkiVaccinationService to new method scheme introduced 07.02.2021 +* 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 RkiVaccinationServiceImport to new method scheme introduced 07.02.2021 * Fixed #100 refactor RkiVaccinationServiceUpdate to new method scheme introduced 07.02.2021 diff --git a/src/flask_covid19/__init__.py b/src/flask_covid19/__init__.py index 700269b1..1532957f 100644 --- a/src/flask_covid19/__init__.py +++ b/src/flask_covid19/__init__.py @@ -10,7 +10,7 @@ from flask_covid19.blueprints.data_divi.divi_model_import import DiviImport from flask_covid19.blueprints.data_ecdc.ecdc_service import EcdcService from flask_covid19.blueprints.data_owid.owid_service import OwidService -from flask_covid19.blueprints.data_vaccination.vaccination_service import RkiVaccinationService +from flask_covid19.blueprints.data_vaccination.vaccination_service import VaccinationService from flask_covid19.blueprints.data_who.who_service import WhoService from flask_covid19.blueprints.data_divi.divi_service import DiviService from flask_covid19.blueprints.data_rki_cases.rki_service import RkiService diff --git a/src/flask_covid19/blueprints/app_all/all_service.py b/src/flask_covid19/blueprints/app_all/all_service.py index 89885447..77ff14b6 100644 --- a/src/flask_covid19/blueprints/app_all/all_service.py +++ b/src/flask_covid19/blueprints/app_all/all_service.py @@ -2,7 +2,7 @@ from database import app from flask_covid19.blueprints.data_ecdc.ecdc_service import EcdcService from flask_covid19.blueprints.data_owid.owid_service import OwidService -from flask_covid19.blueprints.data_vaccination.vaccination_service import RkiVaccinationService +from flask_covid19.blueprints.data_vaccination.vaccination_service import VaccinationService from flask_covid19.blueprints.data_who.who_service import WhoService from flask_covid19.blueprints.data_divi.divi_service import DiviService from flask_covid19.blueprints.data_rki_cases.rki_service import RkiService @@ -11,7 +11,7 @@ from flask_covid19.blueprints.data_rki_cases.rki_service import RkiService class AllDataServiceDispachterMatrix: def __init__(self, who_service: WhoService, owid_service: OwidService, ecdc_service: EcdcService, rki_service: RkiService, - rki_vaccination_service: RkiVaccinationService, + rki_vaccination_service: VaccinationService, divi_service: DiviService): app.logger.debug("------------------------------------------------------------") app.logger.debug(" All Service [init]") diff --git a/src/flask_covid19/blueprints/app_web/web_services.py b/src/flask_covid19/blueprints/app_web/web_services.py index 58d1aff2..40653760 100644 --- a/src/flask_covid19/blueprints/app_web/web_services.py +++ b/src/flask_covid19/blueprints/app_web/web_services.py @@ -6,7 +6,7 @@ from flask_covid19.blueprints.app_user.user_service import UserService from flask_covid19.blueprints.app_web.web_service import WebService from flask_covid19.blueprints.data_ecdc.ecdc_service import EcdcService from flask_covid19.blueprints.data_owid.owid_service import OwidService -from flask_covid19.blueprints.data_vaccination.vaccination_service import RkiVaccinationService +from flask_covid19.blueprints.data_vaccination.vaccination_service import VaccinationService from flask_covid19.blueprints.data_who.who_service import WhoService from flask_covid19.blueprints.data_divi.divi_service import DiviService from flask_covid19.blueprints.data_rki_cases.rki_service import RkiService @@ -23,7 +23,7 @@ web_service = WebService(db, app_user_service) who_service = WhoService(db) owid_service = OwidService(db) ecdc_service = EcdcService(db) -vaccination_service = RkiVaccinationService(db) +vaccination_service = VaccinationService(db) rki_service = RkiService(db) divi_service = DiviService(db) diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py index b8e242ea..9c0fc8cd 100644 --- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py +++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py @@ -8,7 +8,7 @@ from flask_covid19.blueprints.data_vaccination.vaccination_service_update import from flask_covid19.blueprints.data_vaccination.vaccination_service_update import RkiVaccinationServiceUpdateFull -class RkiVaccinationService: +class VaccinationService: def __init__(self, database): app.logger.debug("------------------------------------------------------------") app.logger.debug(" Vaccination Service [init]") -- GitLab