diff --git a/src/covid19/blueprints/common/common_model.py b/src/covid19/blueprints/common/common_model.py index e09b8dec6e132bfd786e35e80fa4ae4bfc34e8f6..7420fa7fea56e3e165482b187f4d6d40f5de04ec 100644 --- a/src/covid19/blueprints/common/common_model.py +++ b/src/covid19/blueprints/common/common_model.py @@ -133,6 +133,10 @@ class CommonRegion(db.Model): id = db.Column(db.Integer, primary_key=True) region = db.Column(db.String(255), nullable=False) + def __str__(self): + result = " " + self.region + " " + return result + @classmethod def remove_all(cls): for one in cls.get_all(): diff --git a/src/covid19/blueprints/europe/europe_model.py b/src/covid19/blueprints/europe/europe_model.py index ab929a30d80bc455bdf7d9b92ed871e3a342ffe7..8d3f91fe01c6c19da75c719e0a7ab4446eb8a8ad 100644 --- a/src/covid19/blueprints/europe/europe_model.py +++ b/src/covid19/blueprints/europe/europe_model.py @@ -49,6 +49,10 @@ class EuropeCountry(db.Model): continent_id = db.Column(db.Integer, db.ForeignKey('common_region.id'), nullable=False) continent = db.relationship('CommonRegion', lazy='subquery', order_by='CommonRegion.region') + def __str__(self): + result = " " + self.geo_id + " " + self.country_territory_code + " " + self.countries_and_territories + " " + return result + @classmethod def remove_all(cls): for one in cls.get_all(): diff --git a/src/covid19/blueprints/europe/europe_service_update.py b/src/covid19/blueprints/europe/europe_service_update.py index 70a925fb5a2af0b2f16e0692276c1e78229f4f48..d23a2afe4cf65f5e558bb71d367b8c353555511d 100644 --- a/src/covid19/blueprints/europe/europe_service_update.py +++ b/src/covid19/blueprints/europe/europe_service_update.py @@ -39,10 +39,10 @@ class EuropeServiceUpdate: 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( region=my_continent_exp ) + app.logger.info("| " + str(o) + " |") db.session.add(o) db.session.commit() app.logger.info(" __update_continent [done]") @@ -62,6 +62,7 @@ class EuropeServiceUpdate: country_territory_code=c['country_territory_code'], pop_data_2019=c['pop_data_2019'], continent=my_continent) + app.logger.info("| " + str(o) + " |") db.session.add(o) db.session.commit() app.logger.info(" __update_country [done]")