diff --git a/src/covid19/blueprints/common/common_model.py b/src/covid19/blueprints/common/common_model.py index 608000c00efbc734f86e43068ceeb7d4bca62da1..e2ecdd82b3d8fb85c16be873c3813c9fdba42f6d 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 090c05cc74bb347ddf6c9c83ff8b90288e681a06..0bd6a69b08e7f9811bd5980814c338828fb0a1b0 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 d2d5b04882777ff6e649b752c0d019e895e85377..db4298a0276e37654f7f516fe982a75b202989f1 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: