From 7f36d08f9f44ce00cbe6ad59bffa0fc7aa5cdad4 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 24 May 2021 12:43:35 +0200
Subject: [PATCH] Refactoring: vaccination
---
.../blueprints/data_vaccination/vaccination_model_import.py | 2 +-
.../data_vaccination/vaccination_service_import.py | 6 +++---
.../blueprints/data_vaccination/vaccination_views.py | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_model_import.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_model_import.py
index feab740e..2e7de4a1 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_model_import.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_model_import.py
@@ -124,7 +124,7 @@ class VaccinationImport(db.Model):
return new_dates
-class RkiVaccinationFlat(db.Model):
+class VaccinationFlat(db.Model):
__tablename__ = 'vaccination_import_flat'
id = db.Column(db.Integer, primary_key=True)
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 02f8fc3c..07828bc3 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
@@ -6,7 +6,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 import VaccinationImport, RkiVaccinationFlat
+from flask_covid19.blueprints.data_vaccination.vaccination_model_import import VaccinationImport, VaccinationFlat
class RkiVaccinationServiceImport:
@@ -33,7 +33,7 @@ class RkiVaccinationServiceImport:
app.logger.info("------------------------------------------------------------")
try:
VaccinationImport.remove_all()
- RkiVaccinationFlat.remove_all()
+ VaccinationFlat.remove_all()
k = 0
with open(src_cvsfile_name, newline='\n') as csv_file:
file_reader = csv.DictReader(csv_file, delimiter='\t', quotechar='"')
@@ -67,7 +67,7 @@ class RkiVaccinationServiceImport:
processed_full_update=False,
)
db.session.add(o)
- oo = RkiVaccinationFlat(
+ oo = VaccinationFlat(
dosen_kumulativ=self.__int(row['dosen_kumulativ']),
dosen_differenz_zum_vortag=self.__int(row['dosen_differenz_zum_vortag']),
dosen_biontech_kumulativ=self.__int(row['dosen_biontech_kumulativ']),
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
index baff3a08..0f5eca6f 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
@@ -8,14 +8,14 @@ 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 import VaccinationImport, RkiVaccinationFlat
+from flask_covid19.blueprints.data_vaccination.vaccination_model_import import VaccinationImport, VaccinationFlat
from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
app_vaccination = Blueprint('vaccination', __name__, template_folder='templates', url_prefix='/vaccination')
admin.add_view(ModelView(VaccinationImport, db.session, category="Vaccination"))
-admin.add_view(ModelView(RkiVaccinationFlat, 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(RkiVaccinationData, db.session, category="Vaccination"))
--
GitLab