diff --git a/src/flask_covid19/blueprints/data_owid/owid_model.py b/src/flask_covid19/blueprints/data_owid/owid_model.py index 62e060583a0284f54b8e9e0c8450661b5e3c897b..36449d2d494162511165df5e01bc2dba7c95fa21 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 5354f2576d49622324275bac9a4f793387ced39a..f96afab5146a4a9619cfaf19bdcc7f682719e353 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 1f520cb1bd9ee6a4aa040a4867e41d60da010e08..d3fabb33604af1dbfb5955991ab91aa7205429f1 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,