From c6225176ac2d4bab6a047b5dcfb955702f3c3d8e Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Mon, 8 Feb 2021 16:47:42 +0100 Subject: [PATCH] start DEV 0.0.15 --- .../blueprints/vaccination/vaccination_model.py | 11 +++-------- .../vaccination/vaccination_service_update.py | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/covid19/blueprints/vaccination/vaccination_model.py b/src/covid19/blueprints/vaccination/vaccination_model.py index 267d2be0..84900d90 100644 --- a/src/covid19/blueprints/vaccination/vaccination_model.py +++ b/src/covid19/blueprints/vaccination/vaccination_model.py @@ -72,13 +72,13 @@ class VaccinationData(db.Model): @classmethod def get_all_as_page(cls, page): return db.session.query(cls)\ - .order_by(cls.datum.desc())\ + .order_by(cls.date_reported)\ .paginate(page, per_page=ITEMS_PER_PAGE) @classmethod def get_all(cls): return db.session.query(cls)\ - .order_by(cls.datum.desc())\ + .order_by(cls.date_reported)\ .all() @classmethod @@ -96,10 +96,5 @@ class VaccinationData(db.Model): @classmethod def find_by_datum(cls, other_datum): return db.session.query(cls) \ - .filter(cls.datum == other_datum) \ + .filter(cls.date_reported == other_datum) \ .one_or_none() - - @classmethod - def create_new_object_factory(cls, my_date_rep): - # TODO implement VaccinationData.create_new_object_factory - pass diff --git a/src/covid19/blueprints/vaccination/vaccination_service_update.py b/src/covid19/blueprints/vaccination/vaccination_service_update.py index 13d5cd45..1d6e772c 100644 --- a/src/covid19/blueprints/vaccination/vaccination_service_update.py +++ b/src/covid19/blueprints/vaccination/vaccination_service_update.py @@ -25,7 +25,7 @@ class VaccinationServiceUpdate: for one_date_reported in date_reported_list: i += 1 output = " [ " + str(i) + " ] " + one_date_reported + " added" - o = VaccinationData.create_new_object_factory(one_date_reported) + o = VaccinationDateReported.create_new_object_factory(one_date_reported) db.session.add(o) app.logger.info(output) db.session.commit() -- GitLab