From 14196ca00cab8237608236e143b4c444abb98e59 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 25 May 2021 23:43:58 +0200
Subject: [PATCH] Refactoring: vaccination
---
.../blueprints/data_owid/owid_model_import.py | 31 -------------------
.../data_owid/owid_service_update.py | 2 +-
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/src/flask_covid19/blueprints/data_owid/owid_model_import.py b/src/flask_covid19/blueprints/data_owid/owid_model_import.py
index 0a35abf6..4f1feb26 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_model_import.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_model_import.py
@@ -77,37 +77,6 @@ class OwidImport(AllImport):
life_expectancy = db.Column(db.String(255), nullable=False)
human_development_index = db.Column(db.String(255), nullable=False)
- @classmethod
- def remove_all(cls):
- for one in cls.get_all():
- db.session.delete(one)
- db.session.commit()
- return None
-
- @classmethod
- def get_all_as_page(cls, page):
- return db.session.query(cls).order_by(
- cls.date.desc()
- ).paginate(page, per_page=ITEMS_PER_PAGE)
-
- @classmethod
- def get_all(cls):
- return db.session.query(cls).order_by(
- cls.date.desc()
- ).all()
-
- @classmethod
- def get_by_id(cls, other_id):
- return db.session.query(cls)\
- .filter(cls.id == other_id)\
- .one()
-
- @classmethod
- def find_by_id(cls, other_id):
- return db.session.query(cls)\
- .filter(cls.id == other_id)\
- .one()
-
@classmethod
def get_dates(cls):
return db.session.query(cls.date)\
diff --git a/src/flask_covid19/blueprints/data_owid/owid_service_update.py b/src/flask_covid19/blueprints/data_owid/owid_service_update.py
index e2a40bff..20097e4f 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_service_update.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_service_update.py
@@ -71,7 +71,7 @@ class OwidServiceUpdateFull(OwidServiceUpdateBase):
self.__full_update_continent()
log_lines = []
i = 0
- for continent in OwidContinent.get_all():
+ for continent in OwidContinent.find_all():
log_lines.append("continent.region: " + continent.region)
for oi in OwidImport.get_countries(continent.region):
i += 1
--
GitLab