diff --git a/org/woehlke/covid19/europe/europe_model.py b/org/woehlke/covid19/europe/europe_model.py index 35e80f769dd99835d548d8cbabc1deebfcd8ad71..858f5ba6ad7c923353acc25e78854c019e913059 100644 --- a/org/woehlke/covid19/europe/europe_model.py +++ b/org/woehlke/covid19/europe/europe_model.py @@ -39,6 +39,11 @@ class EuropeDataImportTable(db.Model): sql = "select distinct date_rep, year_week from europe_data_import order by year_week desc" return db.session.execute(sql) + @classmethod + def get_continent(cls): + sql = "select distinct continent_exp from europe_data_import order by continent_exp asc" + return db.session.execute(sql) + class EuropeDateReported(db.Model): __tablename__ = 'europe_date_reported' diff --git a/org/woehlke/covid19/europe/europe_service_update.py b/org/woehlke/covid19/europe/europe_service_update.py index 7e82181046bad2aa76c728a58e2ee941fef79260..7fec89cd4d57c75c69a49aafc80a88f8cdab12a7 100644 --- a/org/woehlke/covid19/europe/europe_service_update.py +++ b/org/woehlke/covid19/europe/europe_service_update.py @@ -1,7 +1,7 @@ import os import psycopg2 from database import db, app -from org.woehlke.covid19.europe.europe_model import EuropeDataImportTable, EuropeDateReported +from org.woehlke.covid19.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent class EuropeServiceUpdate: @@ -26,7 +26,7 @@ class EuropeServiceUpdate: for result_item in result_date_rep: my_date_rep = result_item['date_rep'] my_year_week = result_item['year_week'] - app.logger.info("| "+my_date_rep+" | "+my_year_week+" |") + app.logger.info("| " + my_date_rep + " | " + my_year_week + " |") o = EuropeDateReported( date_rep=my_date_rep, year_week=my_year_week @@ -40,7 +40,16 @@ class EuropeServiceUpdate: def __update_continent(self): app.logger.info(" __update_continent [begin]") app.logger.info("------------------------------------------------------------") - app.logger.info(" ... ") + EuropeContinent.remove_all() + result_continent = EuropeDataImportTable.get_continent() + for result_item in result_continent: + my_continent_exp = result_item['continent_exp'] + app.logger.info("| " + my_continent_exp + " |") + o = EuropeContinent( + continent_exp=my_continent_exp + ) + db.session.add(o) + db.session.commit() app.logger.info(" __update_continent [done]") app.logger.info("------------------------------------------------------------") return self