From c73ffdef9733735c8ebd2704f51c564237860980 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Fri, 28 May 2021 23:53:05 +0200
Subject: [PATCH] work
---
.../blueprints/data_ecdc/ecdc_model.py | 13 +++++++++----
.../blueprints/data_ecdc/ecdc_model_import.py | 12 ++++++++++--
.../blueprints/data_owid/owid_model.py | 8 +++++---
.../data_vaccination/vaccination_model.py | 6 ++++--
.../data_vaccination/vaccination_model_import.py | 8 ++++++--
5 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
index cfe1e18f..35a0f393 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_model.py
@@ -1,5 +1,5 @@
from sqlalchemy import and_
-from sqlalchemy.orm import joinedload, subqueryload
+from sqlalchemy.orm import joinedload
from database import db, ITEMS_PER_PAGE, cache
from flask_covid19.blueprints.app_all.all_model import BlueprintDateReported, BlueprintLocationGroup
from flask_covid19.blueprints.app_all.all_model import BlueprintLocation, BlueprintFactTable
@@ -19,7 +19,9 @@ class EcdcDateReported(BlueprintDateReported):
def __repr__(self):
return "%s(%s, %s, %s)" % (self.__class__.__name__,
- self.date_reported_import_str, self.datum.isoformat(), self.year_day_of_year)
+ self.date_reported_import_str,
+ self.datum.isoformat(),
+ self.year_day_of_year)
id = db.Column(db.Integer, primary_key=True)
#
@@ -78,7 +80,10 @@ class EcdcCountry(BlueprintLocation):
def __repr__(self):
return "%s(%s, %s, %s; %s, %s)" % (self.__class__.__name__,
self.location_group.__repr__(),
- self.location_code, self.location, self.pop_data_2019, self.geo_id)
+ self.location_code,
+ self.location,
+ self.pop_data_2019,
+ self.geo_id)
def __str__(self):
return " " + self.location_group.location_group \
@@ -151,7 +156,7 @@ class EcdcData(BlueprintFactTable):
)
def __repr__(self):
- return "%s(%s, %s)" % (self.__class__.__name__, self.date_reported_id, self.location_id)
+ return "%s(%s %s)" % (self.__class__.__name__, self.date_reported.__repr__(), self.location.__repr__())
id = db.Column(db.Integer, primary_key=True)
date_reported_id = db.Column(db.Integer, db.ForeignKey('ecdc_date_reported.id'), nullable=False)
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_model_import.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_model_import.py
index 1d651591..46cdec1b 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_model_import.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_model_import.py
@@ -7,7 +7,11 @@ class EcdcImport(AllImport):
__mapper_args__ = {'concrete': True}
def __repr__(self):
- return "%s(%s)" % (self.__class__.__name__, self.id)
+ return "%s(%s %s %s %s)" % (self.__class__.__name__,
+ self.date_reported_import_str,
+ self.datum.isoformat(),
+ self.countries_and_territories,
+ self.continent_exp)
id = db.Column(db.Integer, primary_key=True)
date_reported_import_str = db.Column(db.String(255), nullable=False)
@@ -146,7 +150,11 @@ class EcdcFlat(AllFlat):
__mapper_args__ = {'concrete': True}
def __repr__(self):
- return "%s(%s)" % (self.__class__.__name__, self.id)
+ return "%s(%s %s %s %s)" % (self.__class__.__name__,
+ self.date_reported_import_str,
+ self.datum.isoformat(),
+ self.location,
+ self.location_group.__repr__())
id = db.Column(db.Integer, primary_key=True)
processed_update = db.Column(db.Boolean, nullable=False)
diff --git a/src/flask_covid19/blueprints/data_owid/owid_model.py b/src/flask_covid19/blueprints/data_owid/owid_model.py
index 48307e17..70bdd68d 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_model.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_model.py
@@ -69,8 +69,10 @@ class OwidCountry(BlueprintLocation):
)
def __repr__(self):
- return "%s(%s, %s, %s)" % (self.__class__.__name__,
- self.location_group.__repr__(), self.location_code, self.location)
+ return "%s(%s %s %s)" % (self.__class__.__name__,
+ self.location_group.__repr__(),
+ self.location_code,
+ self.location)
def __str__(self):
result = "" + self.location_group.__str__() + " : " + self.location_code + " | " + self.location + " "
@@ -147,7 +149,7 @@ class OwidData(BlueprintFactTable):
)
def __repr__(self):
- return "%s(%s %s)" % (self.__class__.__name__, self.date_reported_id, self.location_id)
+ return "%s(%s %s)" % (self.__class__.__name__, self.date_reported.__repr__(), self.location.__repr__())
id = db.Column(db.Integer, primary_key=True)
date_reported_id = db.Column(db.Integer, db.ForeignKey('owid_date_reported.id'), nullable=False)
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
index 8fbb0980..5cf58f5b 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
@@ -19,7 +19,9 @@ class VaccinationDateReported(BlueprintDateReported):
def __repr__(self):
return "%s(%s, %s, %s)" % (self.__class__.__name__,
- self.date_reported_import_str, self.datum.isoformat(), self.year_day_of_year)
+ self.date_reported_import_str,
+ self.datum.isoformat(),
+ self.year_day_of_year)
id = db.Column(db.Integer, primary_key=True)
#
@@ -48,7 +50,7 @@ class VaccinationData(BlueprintFactTableTimeSeries):
)
def __repr__(self):
- return "%s(%s)" % (self.__class__.__name__, self.date_reported_id)
+ return "%s(%s)" % (self.__class__.__name__, self.date_reported.__repr__())
id = db.Column(db.Integer, primary_key=True)
date_reported_id = db.Column(db.Integer, db.ForeignKey('vaccination_date_reported.id'), nullable=False)
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_model_import.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_model_import.py
index 9e6d23e3..16753d17 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_model_import.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_model_import.py
@@ -7,7 +7,9 @@ class VaccinationImport(AllImport):
__mapper_args__ = {'concrete': True}
def __repr__(self):
- return "%s(%s)" % (self.__class__.__name__, self.id)
+ return "%s(%s %s)" % (self.__class__.__name__,
+ self.date_reported_import_str,
+ self.datum.isoformat())
id = db.Column(db.Integer, primary_key=True)
processed_update = db.Column(db.Boolean, nullable=False)
@@ -141,7 +143,9 @@ class VaccinationFlat(AllImport):
__mapper_args__ = {'concrete': True}
def __repr__(self):
- return "%s(%s)" % (self.__class__.__name__, self.id)
+ return "%s(%s %s)" % (self.__class__.__name__,
+ self.date_reported_import_str,
+ self.datum.isoformat())
id = db.Column(db.Integer, primary_key=True)
processed_update = db.Column(db.Boolean, nullable=False)
--
GitLab