From 5607242a83807cb2108fbb1ed6a28fa36a85d51f Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Mon, 8 Feb 2021 20:16:08 +0100 Subject: [PATCH] start DEV 0.0.15 --- src/covid19/blueprints/common/common_model.py | 2 +- src/covid19/blueprints/vaccination/vaccination_model.py | 2 +- .../blueprints/vaccination/vaccination_service_update.py | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/covid19/blueprints/common/common_model.py b/src/covid19/blueprints/common/common_model.py index 608000c0..e2ecdd82 100644 --- a/src/covid19/blueprints/common/common_model.py +++ b/src/covid19/blueprints/common/common_model.py @@ -8,7 +8,7 @@ class CommonDateReported(db.Model): __tablename__ = 'common_date_reported' # id = db.Column(db.Integer, primary_key=True) - date_reported = db.Column(db.String(255), nullable=False, unique=True) + date_reported = db.Column(db.String(255), nullable=False) year_week = db.Column(db.String(255), nullable=False) datum = db.Column(db.Date, nullable=False) year = db.Column(db.Integer, nullable=False) diff --git a/src/covid19/blueprints/vaccination/vaccination_model.py b/src/covid19/blueprints/vaccination/vaccination_model.py index 090c05cc..0bd6a69b 100644 --- a/src/covid19/blueprints/vaccination/vaccination_model.py +++ b/src/covid19/blueprints/vaccination/vaccination_model.py @@ -11,7 +11,7 @@ class VaccinationDateReported(CommonDateReported): } id = db.Column(db.Integer, primary_key=True) - date_reported = db.Column(db.String(255), nullable=False, unique=True) + date_reported = db.Column(db.String(255), nullable=False) year_week = db.Column(db.String(255), nullable=False) datum = db.Column(db.Date, nullable=False) year = db.Column(db.Integer, nullable=False) diff --git a/src/covid19/blueprints/vaccination/vaccination_service_update.py b/src/covid19/blueprints/vaccination/vaccination_service_update.py index d2d5b048..db4298a0 100644 --- a/src/covid19/blueprints/vaccination/vaccination_service_update.py +++ b/src/covid19/blueprints/vaccination/vaccination_service_update.py @@ -40,12 +40,13 @@ class VaccinationServiceUpdate: VaccinationData.remove_all() result_date_rep = VaccinationImport.get_date_rep() i = 0 - for item_date_rep in result_date_rep: + for item_date_rep, in result_date_rep: + #dt = item_date_rep['date_rep'] europe_date_reported = VaccinationDateReported.find_by_date_reported( - i_date_reported=item_date_rep['date_rep'] + i_date_reported=item_date_rep ) if europe_date_reported is None: - o = VaccinationDateReported.create_new_object_factory(item_date_rep['date_rep']) + o = VaccinationDateReported.create_new_object_factory(item_date_rep) europe_date_reported = o result_europe_data_import = VaccinationImport.find_by_datum(europe_date_reported) for item_europe_data_import in result_europe_data_import: -- GitLab