From d45a605530551e6eda5435dc7f7b66be39d57106 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 13 Feb 2021 23:44:42 +0100
Subject: [PATCH] ## 0.0.15 Release * ------------------------------------- *
Fixed #88 rename VaccinationImport to VaccinationImport * Fixed #89 change
tablename from vaccination_germany_timeline_import to vaccination_import *
Fixed #86 rename VaccinationData to VaccinationData * Fixed #162 rename table
vaccination_germany_timeline into vaccination_data *
------------------------------------- * Fixed #170 implement
url_vaccination_task_update_star_schema_initial in vaccination_views.py *
Fixed #171 implement url_vaccination_task_update_starschema_incremental in
vaccination_views.py * Fixed #172 implement url_vaccination_task_import_only
in vaccination_views.py * Fixed #173 implement
url_vaccination_task_import_only in vaccination_views.py * Fixed #174
implement url_vaccination_task_update_dimensiontables_only in
vaccination_views.py * Fixed #175 implement
url_vaccination_task_update_facttable_incremental_only in
vaccination_views.py * Fixed #176 implement
url_vaccination_task_update_facttable_initial_only in vaccination_views.py *
------------------------------------- * Fixed #91 implement
VaccinationService.run_download_only * Fixed #92 implement
VaccinationService.run_import_only * Fixed #93 implement
VaccinationService.run_update_dimension_tables_only * Fixed #94 implement
VaccinationService.run_update_fact_table_incremental_only * Fixed #95
implement VaccinationService.run_update_fact_table_initial_only * Fixed #96
implement VaccinationService.run_update_star_schema_incremental * Fixed #97
implement VaccinationService.run_update_star_schema_initial * Fixed #101
implement VaccinationServiceUpdate.update_dimension_tables_only * Fixed #102
implement VaccinationServiceUpdate.update_fact_table_incremental_only * Fixed
#103 implement VaccinationServiceUpdate.update_fact_table_initial_only *
Fixed #104 implement VaccinationServiceUpdate.update_star_schema_incremental
* Fixed #105 implement VaccinationServiceUpdate.update_star_schema_initial *
------------------------------------- * Fixed #90 refactor VaccinationService
to new method scheme introduced 07.02.2021 * Fixed #98 refactor
VaccinationServiceDownload to new method scheme introduced 07.02.2021 * Fixed
#99 refactor VaccinationServiceImport to new method scheme introduced
07.02.2021 * Fixed #100 refactor VaccinationServiceUpdate to new method
scheme introduced 07.02.2021 * ------------------------------------- * Fixed
#87 change to: Vaccination.datum many to one VaccinationDateReported * Fixed
#106 add Tasks and URLs for starting Tasks to vaccination_views *
-------------------------------------
---
src/covid19/blueprints/ecdc/ecdc_model_import.py | 4 +++-
src/covid19/blueprints/ecdc/ecdc_service_update.py | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/ecdc_model_import.py b/src/covid19/blueprints/ecdc/ecdc_model_import.py
index ee2eea91..04c70daa 100644
--- a/src/covid19/blueprints/ecdc/ecdc_model_import.py
+++ b/src/covid19/blueprints/ecdc/ecdc_model_import.py
@@ -46,7 +46,8 @@ class EcdcImport(db.Model):
# TODO: #109 SQLalchemy instead of SQL in: EcdcImport.get_date_rep
# sql = "select distinct date_rep, year_week from edcd_import order by year_week desc"
#return db.session.execute(sql).fetchall()
- return db.session.query(cls.date_rep)\
+ return db.session.query(cls.date_rep) \
+ .group_by(cls.date_rep) \
.order_by(cls.date_rep.desc())\
.distinct().all()
@@ -56,6 +57,7 @@ class EcdcImport(db.Model):
# sql = "select distinct continent_exp from edcd_import order by continent_exp asc"
#return db.session.execute(sql).fetchall()
return db.session.query(cls.continent_exp) \
+ .group_by(cls.continent_exp) \
.order_by(cls.continent_exp.asc()) \
.distinct().all()
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_update.py b/src/covid19/blueprints/ecdc/ecdc_service_update.py
index 96b239f4..6a6a604f 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_update.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_update.py
@@ -23,7 +23,7 @@ class EcdcServiceUpdate:
for result_item in result_date_rep:
k += 1
#my_date_rep = result_item['date_rep']
- my_date_rep = result_item
+ my_date_rep = result_item[0]
o = EcdcDateReported.create_new_object_factory(
my_date_rep=my_date_rep
)
@@ -39,7 +39,8 @@ class EcdcServiceUpdate:
app.logger.info("------------------------------------------------------------")
result_continent = EcdcImport.get_continent()
for result_item in result_continent:
- my_continent_exp = result_item['continent_exp']
+ #my_continent_exp = result_item['continent_exp']
+ my_continent_exp = result_item[0]
o = EcdcContinent(
region=my_continent_exp
)
--
GitLab