From fea382531895063825481b0ab37c1e0139c1200a Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 26 May 2021 00:12:55 +0200
Subject: [PATCH] Refactoring: vaccination
---
.../blueprints/data_owid/owid_model.py | 2 +-
.../blueprints/data_owid/owid_service_import.py | 1 +
.../blueprints/data_owid/owid_service_update.py | 15 +++++++--------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/flask_covid19/blueprints/data_owid/owid_model.py b/src/flask_covid19/blueprints/data_owid/owid_model.py
index 62e06058..36449d2d 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_model.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_model.py
@@ -45,7 +45,7 @@ class OwidContinent(BlueprintLocationGroup):
)
def __str__(self):
- result = "" + self.region + " "
+ result = "" + self.location_group + " "
return result
id = db.Column(db.Integer, primary_key=True)
diff --git a/src/flask_covid19/blueprints/data_owid/owid_service_import.py b/src/flask_covid19/blueprints/data_owid/owid_service_import.py
index 5354f257..f96afab5 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_service_import.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_service_import.py
@@ -34,6 +34,7 @@ class OwidServiceImport:
date_reported = row['date']
d = BlueprintDateReportedFactory.create_new_object_for_owid(my_date_rep=date_reported)
o = OwidImport(
+ date_reported_import_str=date_reported,
iso_code=row['iso_code'],
date=date_reported,
continent=row['continent'],
diff --git a/src/flask_covid19/blueprints/data_owid/owid_service_update.py b/src/flask_covid19/blueprints/data_owid/owid_service_update.py
index 1f520cb1..d3fabb33 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_service_update.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_service_update.py
@@ -46,14 +46,14 @@ class OwidServiceUpdateFull(OwidServiceUpdateBase):
OwidContinent.remove_all()
i = 0
for oi in OwidImport.get_all_continents():
- my_OwidContinent = OwidContinent(
- region=oi.continent,
+ o = OwidContinent(
+ location_group=oi.continent,
processed_update=False,
processed_full_update=False,
)
- db.session.add(my_OwidContinent)
+ db.session.add(o)
i += 1
- output = " full update OWID continent: [ " + str(i) + " ] " + str(my_OwidContinent) + " added"
+ output = " full update OWID continent: [ " + str(i) + " ] " + str(o) + " added"
log_lines.append(output)
for log_line in log_lines:
app.logger.info(log_line)
@@ -72,12 +72,11 @@ class OwidServiceUpdateFull(OwidServiceUpdateBase):
log_lines = []
i = 0
for continent in OwidContinent.find_all():
- log_lines.append("continent.region: " + continent.region)
- for oi in OwidImport.get_countries(continent.region):
+ log_lines.append("continent.region: " + continent.location_group)
+ for oi in OwidImport.get_countries(continent.location_group):
i += 1
o = OwidCountry(
- continent_id=continent.id,
- continent=continent,
+ location_group=continent,
location=oi.location,
iso_code=oi.iso_code,
population=oi.population,
--
GitLab