From 69a2036d9ca8cd56b16ca281586b6ddc985bc9e3 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 26 May 2021 12:57:17 +0200
Subject: [PATCH] Refactoring: vaccination
---
.../blueprints/app_web/web_model_factory.py | 13 ++++++++++++-
src/flask_covid19/blueprints/data_rki/rki_model.py | 3 +++
.../blueprints/data_rki/rki_service_update.py | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/flask_covid19/blueprints/app_web/web_model_factory.py b/src/flask_covid19/blueprints/app_web/web_model_factory.py
index 76d8d8ff..683e5e7e 100644
--- a/src/flask_covid19/blueprints/app_web/web_model_factory.py
+++ b/src/flask_covid19/blueprints/app_web/web_model_factory.py
@@ -51,6 +51,17 @@ class BlueprintDateReportedFactory:
datum_parts = (my_year, my_month, my_day)
return datum_parts
+ @classmethod
+ def __get_datetime_german_parts(cls, my_datetime: str):
+ my_datetime_parts = my_datetime.split(",")
+ my_date_rep = my_datetime_parts[0]
+ my_date_parts = my_date_rep.split('.')
+ my_day = int(my_date_parts[0])
+ my_month = int(my_date_parts[1])
+ my_year = int(my_date_parts[2])
+ datum_parts = (my_year, my_month, my_day)
+ return datum_parts
+
@classmethod
def __get_datum_parts(cls, my_date_rep: str):
my_date_parts = my_date_rep.split("-")
@@ -264,7 +275,7 @@ class BlueprintDateReportedFactory:
@classmethod
def create_new_object_for_rki_date_datenstand(cls, my_date_rep: str):
- (my_year, my_month, my_day) = cls.__get_datetime_parts(my_date_rep)
+ (my_year, my_month, my_day) = cls.__get_datetime_german_parts(my_datetime=my_date_rep)
my_datum = date(my_year, my_month, my_day)
o = cls.__create_new_object_factory(date_reported_import_str=my_date_rep, my_datum=my_datum)
return cls.__get_rki_date_datenstand(o)
diff --git a/src/flask_covid19/blueprints/data_rki/rki_model.py b/src/flask_covid19/blueprints/data_rki/rki_model.py
index 755564f8..4e9e7a6c 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_model.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_model.py
@@ -172,6 +172,9 @@ class RkiAltersgruppe(BlueprintEntity):
__tablename__ = 'rki_altersgruppe'
__mapper_args__ = {'concrete': True}
+ def __str__(self):
+ return " " + self.altersgruppe + " "
+
id = db.Column(db.Integer, primary_key=True)
processed_update = db.Column(db.Boolean, nullable=False)
processed_full_update = db.Column(db.Boolean, nullable=False)
diff --git a/src/flask_covid19/blueprints/data_rki/rki_service_update.py b/src/flask_covid19/blueprints/data_rki/rki_service_update.py
index 03693a4b..5de88b7f 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service_update.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service_update.py
@@ -82,7 +82,7 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase):
def __full_update_altersgruppe(self):
app.logger.info(" RkiServiceUpdateFull.__full_update_altersgruppe [begin]")
app.logger.info("------------------------------------------------------------")
- RkiBundesland.remove_all()
+ RkiAltersgruppe.remove_all()
app.logger.info("")
i = 0
output_lines = []
--
GitLab