From e1a4dc750e773d6bbdbf59b788b9ff7a02080fcb Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 26 May 2021 18:45:41 +0200
Subject: [PATCH] Refactoring: vaccination
---
src/flask_covid19/blueprints/data_rki/rki_model.py | 11 +++--------
.../blueprints/data_rki/rki_service_update.py | 6 +++---
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/flask_covid19/blueprints/data_rki/rki_model.py b/src/flask_covid19/blueprints/data_rki/rki_model.py
index 4b5c7a51..95a7666a 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_model.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_model.py
@@ -159,7 +159,7 @@ class RkiLandkreis(BlueprintLocation):
return db.session.query(cls).order_by(cls.location).all()
@classmethod
- def find_by_location_group(cls, location_group: RkiBundesland, page: int):
+ def find_by_location_group(cls, location_group: RkiBundesland):
return db.session.query(cls).filter(
cls.location_group == location_group
).order_by(cls.location).all()
@@ -174,16 +174,11 @@ class RkiLandkreis(BlueprintLocation):
def find_all_as_dict(cls):
rki_landkreis_dict = {}
for my_rki_landkreis in cls.find_all():
- rki_landkreis_dict[my_rki_landkreis.location] = my_rki_landkreis
+ my_key = my_rki_landkreis.location_type + " " + my_rki_landkreis.location
+ rki_landkreis_dict[my_key] = my_rki_landkreis
return rki_landkreis_dict
-association_table_rki_to_altersgruppe = db.Table('rki_to_altersgruppe', db.Model.metadata,
- db.Column('rki_id', db.Integer, db.ForeignKey('rki.id')),
- db.Column('rki_altersgruppe_id', db.Integer, db.ForeignKey('rki_altersgruppe.id'))
-)
-
-
class RkiAltersgruppe(BlueprintEntity):
__tablename__ = 'rki_altersgruppe'
__mapper_args__ = {'concrete': True}
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 99c9911a..3fcdbffd 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service_update.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service_update.py
@@ -209,12 +209,12 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase):
# app.logger.info("------------------------------------------------------------")
for o_import in list_imports:
# app.logger.info("o_import.landkreis " + o_import.landkreis)
- key_location = o_import.landkreis.split(" ")[1]
+ key_location = o_import.landkreis
key_altersgruppen = o_import.altersgruppe
- my_altersgruppe = dict_altersgruppen[key_altersgruppen]
- my_landkreis = dict_locations[key_location]
key_datenstand = o_import.datenstand
key_ref_datum = o_import.ref_datum
+ my_altersgruppe = dict_altersgruppen[key_altersgruppen]
+ my_landkreis = dict_locations[key_location]
my_datenstand = dict_datenstand[key_datenstand]
my_ref_datum = dict_ref_datum[key_ref_datum]
# app.logger.info(str(my_landkreis))
--
GitLab