From e0a8c12eaf8e734ab7310712e6ec4b2c36c17475 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 24 May 2021 12:44:20 +0200
Subject: [PATCH] Refactoring: vaccination
---
docs/BACKLOG.md | 2 +-
.../data_vaccination/vaccination_model.py | 10 +++++-----
.../data_vaccination/vaccination_service_import.py | 4 ++--
.../data_vaccination/vaccination_service_update.py | 14 +++++++-------
.../data_vaccination/vaccination_views.py | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/docs/BACKLOG.md b/docs/BACKLOG.md
index 6e94f1eb..261c33cc 100644
--- a/docs/BACKLOG.md
+++ b/docs/BACKLOG.md
@@ -156,7 +156,7 @@
* Fixed #99 refactor RkiVaccinationServiceImport to new method scheme introduced 07.02.2021
* Fixed #100 refactor RkiVaccinationServiceUpdate to new method scheme introduced 07.02.2021
* -------------------------------------
-* Fixed #87 change to: Vaccination.datum many to one RkiVaccinationDateReported
+* 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_model.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
index fbf6cbce..ff8de3a3 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
@@ -3,7 +3,7 @@ from database import db, ITEMS_PER_PAGE
from flask_covid19.blueprints.app_all.all_model import BlueprintDateReported
-class RkiVaccinationDateReported(BlueprintDateReported):
+class VaccinationDateReported(BlueprintDateReported):
__tablename__ = 'vaccination_date_reported'
__mapper_args__ = {
'concrete': True
@@ -37,7 +37,7 @@ class RkiVaccinationDateReported(BlueprintDateReported):
@classmethod
def create_new_object_factory(cls, my_date_rep: str):
o = cls.create_new_object_factory_rki_vaccination(my_date_rep=my_date_rep)
- oo = RkiVaccinationDateReported(
+ oo = VaccinationDateReported(
datum=o.datum,
year=o.year,
month=o.month,
@@ -60,10 +60,10 @@ class RkiVaccinationData(db.Model):
id = db.Column(db.Integer, primary_key=True)
date_reported_id = db.Column(db.Integer, db.ForeignKey('vaccination_date_reported.id'), nullable=False)
date_reported = db.relationship(
- 'RkiVaccinationDateReported',
+ 'VaccinationDateReported',
lazy='joined',
cascade='save-update',
- order_by='desc(RkiVaccinationDateReported.datum)')
+ order_by='desc(VaccinationDateReported.datum)')
dosen_kumulativ = db.Column(db.Integer, nullable=False)
dosen_differenz_zum_vortag = db.Column(db.Integer, nullable=False)
dosen_biontech_kumulativ = db.Column(db.Integer, nullable=False)
@@ -119,7 +119,7 @@ class RkiVaccinationData(db.Model):
.one_or_none()
@classmethod
- def find_by_datum(cls, other_datum: RkiVaccinationDateReported):
+ def find_by_datum(cls, other_datum: VaccinationDateReported):
return db.session.query(cls) \
.filter(cls.date_reported_id == other_datum.id) \
.one_or_none()
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
index 07828bc3..b1d35265 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
@@ -5,7 +5,7 @@ from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.data_vaccination.vaccination_model import RkiVaccinationDateReported
+from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationDateReported
from flask_covid19.blueprints.data_vaccination.vaccination_model_import import VaccinationImport, VaccinationFlat
@@ -39,7 +39,7 @@ class RkiVaccinationServiceImport:
file_reader = csv.DictReader(csv_file, delimiter='\t', quotechar='"')
for row in file_reader:
date_reported = row['date']
- d = RkiVaccinationDateReported.create_new_object_factory(my_date_rep=date_reported)
+ d = VaccinationDateReported.create_new_object_factory(my_date_rep=date_reported)
o = VaccinationImport(
dosen_kumulativ=self.__int(row['dosen_kumulativ']),
dosen_differenz_zum_vortag=self.__int(row['dosen_differenz_zum_vortag']),
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 cad987cc..50e4d93a 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
from flask_covid19.blueprints.data_vaccination.vaccination_model_import import VaccinationImport
-from flask_covid19.blueprints.data_vaccination.vaccination_model import RkiVaccinationDateReported
+from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationDateReported
from flask_covid19.blueprints.data_vaccination.vaccination_model import RkiVaccinationData
@@ -21,12 +21,12 @@ class RkiVaccinationServiceUpdateFull(RkiVaccinationServiceUpdateBase):
def __full_update_date_reported(self):
app.logger.info(" RkiVaccinationServiceUpdateFull.__full_update_date_reported [begin]")
app.logger.info("------------------------------------------------------------")
- RkiVaccinationDateReported.remove_all()
+ VaccinationDateReported.remove_all()
date_reported_list = VaccinationImport.get_date_reported_as_array()
i = 0
for one_date_reported in date_reported_list:
i += 1
- o = RkiVaccinationDateReported.create_new_object_factory(one_date_reported)
+ o = VaccinationDateReported.create_new_object_factory(one_date_reported)
db.session.add(o)
output = " full_update RkiVaccination date_reported [ " + str(i) + " ] " + str(o)
app.logger.info(output)
@@ -42,7 +42,7 @@ class RkiVaccinationServiceUpdateFull(RkiVaccinationServiceUpdateBase):
result_date_rep = VaccinationImport.get_date_rep()
i = 0
for item_date_rep, in result_date_rep:
- d = RkiVaccinationDateReported.get_by_datum(
+ d = VaccinationDateReported.get_by_datum(
d_datum=item_date_rep
)
for item_import in VaccinationImport.find_by_datum(d.date_reported_import_str):
@@ -103,13 +103,13 @@ class RkiVaccinationServiceUpdate(RkiVaccinationServiceUpdateBase):
def __update_date_reported(self):
app.logger.info(" __update_date_reported [begin]")
app.logger.info("------------------------------------------------------------")
- RkiVaccinationDateReported.remove_all()
+ VaccinationDateReported.remove_all()
date_reported_list = VaccinationImport.get_date_reported_as_array()
i = 0
for one_date_reported in date_reported_list:
i += 1
output = " [ " + str(i) + " ] " + one_date_reported + " added"
- o = RkiVaccinationDateReported.create_new_object_factory(one_date_reported)
+ o = VaccinationDateReported.create_new_object_factory(one_date_reported)
db.session.add(o)
app.logger.info(output)
db.session.commit()
@@ -123,7 +123,7 @@ class RkiVaccinationServiceUpdate(RkiVaccinationServiceUpdateBase):
result_date_rep = VaccinationImport.get_daterep_missing_in_vaccination_data()
i = 0
for item_date_rep in result_date_rep:
- date_reported = RkiVaccinationDateReported.get_by_date_reported(item_date_rep)
+ date_reported = VaccinationDateReported.get_by_date_reported(item_date_rep)
for item_data_import in VaccinationImport.find_by_datum(item_date_rep):
o = RkiVaccinationData(
date_reported=date_reported,
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
index 0f5eca6f..cfec3fb9 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
@@ -7,7 +7,7 @@ from database import admin, db, celery
from flask_covid19.blueprints.app_web.web_services import vaccination_service
from flask_covid19.blueprints.data_vaccination.vaccination_model import RkiVaccinationData
-from flask_covid19.blueprints.data_vaccination.vaccination_model import RkiVaccinationDateReported
+from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationDateReported
from flask_covid19.blueprints.data_vaccination.vaccination_model_import import VaccinationImport, VaccinationFlat
from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
@@ -16,7 +16,7 @@ app_vaccination = Blueprint('vaccination', __name__, template_folder='templates'
admin.add_view(ModelView(VaccinationImport, db.session, category="Vaccination"))
admin.add_view(ModelView(VaccinationFlat, db.session, category="Vaccination"))
-admin.add_view(ModelView(RkiVaccinationDateReported, db.session, category="Vaccination"))
+admin.add_view(ModelView(VaccinationDateReported, db.session, category="Vaccination"))
admin.add_view(ModelView(RkiVaccinationData, db.session, category="Vaccination"))
--
GitLab