diff --git a/etc/db/mysql/create_user_anddb.sql b/etc/db/mysql/create_user_anddb.sql index da33c85207bf56a094bbd7b7f385081ef0802b50..71f6cbcbade2f57c48323cc48542956eae8afdfd 100644 --- a/etc/db/mysql/create_user_anddb.sql +++ b/etc/db/mysql/create_user_anddb.sql @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:489d32e94c0012a18a259dbcc0754036ab3bb24e222a05ed2a2cef1c839ad3c5 -size 503 +oid sha256:2593acd4bc32739e7cc0ae99e3c5332767c49fd015687b445d6f663798edf9be +size 524 diff --git a/src/flask_covid19/blueprints/data_who/who_model_import.py b/src/flask_covid19/blueprints/data_who/who_model_import.py index 920b796baec767b8ff5b67cecd5a5383826dd507..89437cda0940dcd7cce1d769d12e6fafe0c09d6f 100644 --- a/src/flask_covid19/blueprints/data_who/who_model_import.py +++ b/src/flask_covid19/blueprints/data_who/who_model_import.py @@ -176,10 +176,10 @@ class WhoFlat(AllFlat): location_group = db.Column(db.String(255), nullable=False) location_code = db.Column(db.String(255), nullable=False) # - new_cases = db.Column(db.String(255), nullable=False) - cumulative_cases = db.Column(db.String(255), nullable=False) - new_deaths = db.Column(db.String(255), nullable=False) - cumulative_deaths = db.Column(db.String(255), nullable=False) + new_cases = db.Column(db.Integer, nullable=False) + cumulative_cases = db.Column(db.Integer, nullable=False) + new_deaths = db.Column(db.Integer, nullable=False) + cumulative_deaths = db.Column(db.Integer, nullable=False) country_code = db.Column(db.String(255), nullable=False) country = db.Column(db.String(255), nullable=False) who_region = db.Column(db.String(255), nullable=False) diff --git a/src/flask_covid19/blueprints/data_who/who_service_import.py b/src/flask_covid19/blueprints/data_who/who_service_import.py index 60386bcaf4320b2bfe74786823e243edafd4b46d..3711fb31cc5a56a0069e11825b6e882db247855d 100644 --- a/src/flask_covid19/blueprints/data_who/who_service_import.py +++ b/src/flask_covid19/blueprints/data_who/who_service_import.py @@ -51,6 +51,10 @@ class WhoServiceImport: processed_full_update=False, ) db.session.add(o) + my_new_cases = int(row['New_cases']) + my_cumulative_cases = int(row['Cumulative_cases']) + my_new_deaths = int(row['New_deaths']) + my_cumulative_deaths = int(row['Cumulative_deaths']) oo = WhoFlat( datum=d.datum, year=d.year, @@ -69,10 +73,10 @@ class WhoServiceImport: processed_update=False, processed_full_update=False, # - new_cases=row['New_cases'], - cumulative_cases=row['Cumulative_cases'], - new_deaths=row['New_deaths'], - cumulative_deaths=row['Cumulative_deaths'], + new_cases=my_new_cases, + cumulative_cases=my_cumulative_cases, + new_deaths=my_new_deaths, + cumulative_deaths=my_cumulative_deaths, country_code=row['Country_code'], country=row['Country'], who_region=row['WHO_region'],