From b6fb53b9a13cccd9e574227f3cac21c35f2f8a8a Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 25 May 2021 12:19:30 +0200
Subject: [PATCH] Refactoring: vaccination
---
.../blueprints/data_divi/divi_model.py | 33 ++++++++++---------
.../blueprints/data_who/who_model.py | 2 +-
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/flask_covid19/blueprints/data_divi/divi_model.py b/src/flask_covid19/blueprints/data_divi/divi_model.py
index cfdee989..2f5ae703 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_model.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_model.py
@@ -54,25 +54,28 @@ class DiviCountry(BlueprintLocation):
db.UniqueConstraint('country_code', 'country', name="uix_divi_country"),
)
+ def __str__(self):
+ return self.location_group.__str__() + " : " + self.location_code + " | " + self.location
+
id = db.Column(db.Integer, primary_key=True)
- country_code = db.Column(db.String(255), unique=True, nullable=False)
- country = db.Column(db.String(255), unique=True, nullable=False)
- region_id = db.Column(db.Integer, db.ForeignKey('divi_country_region.id'), nullable=False)
- region = db.relationship(
+ location_code = db.Column(db.String(255), unique=True, nullable=True)
+ location = db.Column(db.String(255), nullable=False, unique=True)
+ location_group_id = db.Column(db.Integer, db.ForeignKey('blueprint_location_group.id'), nullable=False)
+ location_group = db.relationship(
'DiviRegion',
lazy='joined',
cascade='save-update',
- order_by='DiviRegion.region')
-
- def __str__(self):
- result = ""
- result += self.country_code
- result += " "
- result += self.country
- result += " "
- result += self.region.region
- result += " "
- return result
+ order_by='DiviRegion.location_group')
+ processed_update = db.Column(db.Boolean, nullable=False)
+ processed_full_update = db.Column(db.Boolean, nullable=False)
+ #country_code = db.Column(db.String(255), unique=True, nullable=False)
+ #country = db.Column(db.String(255), unique=True, nullable=False)
+ #region_id = db.Column(db.Integer, db.ForeignKey('divi_country_region.id'), nullable=False)
+ #region = db.relationship(
+ # 'DiviRegion',
+ # lazy='joined',
+ # cascade='save-update',
+ # order_by='DiviRegion.region')
@classmethod
def remove_all(cls):
diff --git a/src/flask_covid19/blueprints/data_who/who_model.py b/src/flask_covid19/blueprints/data_who/who_model.py
index c434f7f7..2f762b5f 100644
--- a/src/flask_covid19/blueprints/data_who/who_model.py
+++ b/src/flask_covid19/blueprints/data_who/who_model.py
@@ -92,7 +92,7 @@ class WhoCountry(BlueprintLocation):
processed_full_update = db.Column(db.Boolean, nullable=False)
def __str__(self):
- return self.location_code + " | " + self.location + " -> " + self.location_group.__str__()
+ return self.location_group.__str__() + " : "+ self.location_code + " | " + self.location
@classmethod
def find_by_country_code_and_country_and_who_region_id(cls, i_country_code, i_country, my_region):
--
GitLab