diff --git a/src/covid19/blueprints/ecdc/ecdc_model_import.py b/src/covid19/blueprints/ecdc/ecdc_model_import.py index ee2eea91a06d22e5edc533a8cea0d4de9f5dd3c8..04c70daaf72b6c7151b012ff4cf4cd3979e53c81 100644 --- a/src/covid19/blueprints/ecdc/ecdc_model_import.py +++ b/src/covid19/blueprints/ecdc/ecdc_model_import.py @@ -46,7 +46,8 @@ class EcdcImport(db.Model): # TODO: #109 SQLalchemy instead of SQL in: EcdcImport.get_date_rep # sql = "select distinct date_rep, year_week from edcd_import order by year_week desc" #return db.session.execute(sql).fetchall() - return db.session.query(cls.date_rep)\ + return db.session.query(cls.date_rep) \ + .group_by(cls.date_rep) \ .order_by(cls.date_rep.desc())\ .distinct().all() @@ -56,6 +57,7 @@ class EcdcImport(db.Model): # sql = "select distinct continent_exp from edcd_import order by continent_exp asc" #return db.session.execute(sql).fetchall() return db.session.query(cls.continent_exp) \ + .group_by(cls.continent_exp) \ .order_by(cls.continent_exp.asc()) \ .distinct().all() diff --git a/src/covid19/blueprints/ecdc/ecdc_service_update.py b/src/covid19/blueprints/ecdc/ecdc_service_update.py index 96b239f4a12284f96219df5446a81fb87a2efeb5..6a6a604f56669e7c2cc69ef152637b5cbd1a1b74 100644 --- a/src/covid19/blueprints/ecdc/ecdc_service_update.py +++ b/src/covid19/blueprints/ecdc/ecdc_service_update.py @@ -23,7 +23,7 @@ class EcdcServiceUpdate: for result_item in result_date_rep: k += 1 #my_date_rep = result_item['date_rep'] - my_date_rep = result_item + my_date_rep = result_item[0] o = EcdcDateReported.create_new_object_factory( my_date_rep=my_date_rep ) @@ -39,7 +39,8 @@ class EcdcServiceUpdate: app.logger.info("------------------------------------------------------------") result_continent = EcdcImport.get_continent() for result_item in result_continent: - my_continent_exp = result_item['continent_exp'] + #my_continent_exp = result_item['continent_exp'] + my_continent_exp = result_item[0] o = EcdcContinent( region=my_continent_exp )