From 8cb6a7fefa8d3093225c472fe4eb159bf6a42acf Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 30 Jan 2021 18:15:28 +0100
Subject: [PATCH] ### 0.0.13 Release * Fixed #49
EuropeServiceUpdate.__update_data_short() (wontfix) * Fixed #52 download
vaccination timeline data file * Fixed #53 import vaccination timeline data
file into db * Fixed #54 /vaccination/imported * Fixed #57 frontend: use npm
for handling 3rdParty css and javascript modules like jQuery, Bootstrap *
Fixed #58 frontend: remove jumbotron from all pageheader, put jumbotron as
main content on home page * Fixed #47 major refactoring: Routes from app.py
to org...who,europe,... (Doublette von #65) * Fixed #48 major refactoring:
Tasks from server_mq.py to org...who,europe,... (Doublette von #65) * Fixed
#64 major refactoring: create two packages: for web app and for celery worker
* Issue #65 major refactoring: add flask-blueprints for admin, common,
europe, rki, vaccination, who
### 0.0.14 Release
* Issue #66 frontend: migrate to Bootstrap Theme sb-admin-angular
* Issue #67 implement Flask-Login
### 0.0.15 Release
* Issue #5 Visual Graphs for Data per Countries order by Date
* Issue #59 frontend: add correct breadcrumb to every page
* Issue #60 frontend: better design for tables
* Issue #61 frontend: better design for navtabs
* Issue #62 frontend: better design for pages
* Issue #63 frontend: add footer design
### 0.0.16 Release
* Issue #28 /admin/database/import
* Issue #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Issue #40 SQLalchemy instead of SQL: EuropeDataImportTable.get_date_rep()
* Issue #41 SQLalchemy instead of SQL: EuropeDataImportTable.get_countries_of_continent()
* Issue #42 SQLalchemy instead of SQL: WhoGlobalDataImportTable.get_new_dates_as_array()
---
covid19/oodm/rki/rki_service_import.py | 2 +-
.../oodm/vaccination/vaccination_service.py | 17 ++++-------
.../vaccination_service_download.py | 28 +++++++++----------
.../vaccination/vaccination_service_import.py | 10 +++----
4 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/covid19/oodm/rki/rki_service_import.py b/covid19/oodm/rki/rki_service_import.py
index acea710a..e5f8a164 100644
--- a/covid19/oodm/rki/rki_service_import.py
+++ b/covid19/oodm/rki/rki_service_import.py
@@ -5,7 +5,7 @@ import psycopg2
from database import db, app
-from covid19.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.who.who_model_import import WhoGlobalDataImportTable
class RkiServiceImport:
diff --git a/covid19/oodm/vaccination/vaccination_service.py b/covid19/oodm/vaccination/vaccination_service.py
index f3c6efdd..90e09006 100644
--- a/covid19/oodm/vaccination/vaccination_service.py
+++ b/covid19/oodm/vaccination/vaccination_service.py
@@ -1,24 +1,19 @@
-import os
-
from database import app
from covid19.oodm.vaccination.vaccination_service_download import VaccinationServiceDownload
from covid19.oodm.vaccination.vaccination_service_import import VaccinationServiceImport
+from covid19.oodm.vaccination.vaccination_service_config import VaccinationServiceDownloadConfig
class VaccinationService:
def __init__(self, database):
- app.logger.info("------------------------------------------------------------")
- app.logger.info(" Vaccination Service [init]")
- app.logger.info("------------------------------------------------------------")
+ app.logger.debug("------------------------------------------------------------")
+ app.logger.debug(" Vaccination Service [init]")
+ app.logger.debug("------------------------------------------------------------")
self.__database = database
- self.limit_nr = 20
- self.__cvsfile_name = "germany_vaccinations_timeseries_v2.tsv"
- self.__src_cvsfile_name = "data"+os.sep+self.__cvsfile_name
- self.__src_cvsfile_tmp_name = "data"+os.sep+"tmp_"+self.__cvsfile_name
- self.__url_src_data = "https://impfdashboard.de/static/data/germany_vaccinations_timeseries_v2.tsv"
+ self.cfg = VaccinationServiceDownloadConfig()
self.vaccination_service_download = VaccinationServiceDownload(database)
self.vaccination_service_import = VaccinationServiceImport(database)
- app.logger.info("------------------------------------------------------------")
+ app.logger.debug("------------------------------------------------------------")
app.logger.info(" Vaccination Service [ready]")
def run_download(self):
diff --git a/covid19/oodm/vaccination/vaccination_service_download.py b/covid19/oodm/vaccination/vaccination_service_download.py
index 0bd9145f..0ef205ae 100644
--- a/covid19/oodm/vaccination/vaccination_service_download.py
+++ b/covid19/oodm/vaccination/vaccination_service_download.py
@@ -7,13 +7,13 @@ from covid19.oodm.vaccination.vaccination_service_config import VaccinationServi
class VaccinationServiceDownload:
def __init__(self, database):
- app.logger.info("------------------------------------------------------------")
- app.logger.info(" Vaccination Service Download [init]")
- app.logger.info("------------------------------------------------------------")
+ app.logger.debug("------------------------------------------------------------")
+ app.logger.debug(" Vaccination Service Download [init]")
+ app.logger.debug("------------------------------------------------------------")
self.__database = database
self.cfg = VaccinationServiceDownloadConfig()
- app.logger.info("------------------------------------------------------------")
- app.logger.info(" Vaccination Service Download [ready]")
+ app.logger.debug("------------------------------------------------------------")
+ app.logger.debug(" Vaccination Service Download [ready]")
def download_file(self):
app.logger.info(" download - Vaccination [begin] ")
@@ -27,19 +27,19 @@ class VaccinationServiceDownload:
data_file = wget.download(self.cfg.url_src_data, self.cfg.cvsfile_path)
app.logger.info(" " + data_file + " ")
except RuntimeError as error:
- app.logger.info("############################################################")
- app.logger.info(" " + error + " ")
- app.logger.info("############################################################")
+ app.logger.error("############################################################")
+ app.logger.error(" " + error + " ")
+ app.logger.error("############################################################")
flash(message="error while downloading: " + self.cfg.cvsfile_path, category='error')
except AttributeError as attribute_error:
- app.logger.info("############################################################")
- app.logger.info(attribute_error)
- app.logger.info("############################################################")
+ app.logger.error("############################################################")
+ app.logger.error(attribute_error)
+ app.logger.error("############################################################")
flash(message="error after downloading: " + self.cfg.cvsfile_path, category='error')
except Exception as error:
- app.logger.info("############################################################")
- app.logger.info(error)
- app.logger.info("############################################################")
+ app.logger.error("############################################################")
+ app.logger.error(error)
+ app.logger.error("############################################################")
flash(message="error after downloading: " + self.cfg.cvsfile_path, category='error')
finally:
app.logger.info("------------------------------------------------------------")
diff --git a/covid19/oodm/vaccination/vaccination_service_import.py b/covid19/oodm/vaccination/vaccination_service_import.py
index d185672a..c0ecb49c 100644
--- a/covid19/oodm/vaccination/vaccination_service_import.py
+++ b/covid19/oodm/vaccination/vaccination_service_import.py
@@ -9,14 +9,14 @@ from covid19.oodm.vaccination.vaccination_service_config import VaccinationServi
class VaccinationServiceImport:
def __init__(self, database):
- app.logger.info("------------------------------------------------------------")
- app.logger.info(" Vaccination Service Import [init]")
- app.logger.info("------------------------------------------------------------")
+ app.logger.debug("------------------------------------------------------------")
+ app.logger.debug(" Vaccination Service Import [init]")
+ app.logger.debug("------------------------------------------------------------")
self.__database = database
self.cfg = VaccinationServiceDownloadConfig()
self.__url_src_data = "https://impfdashboard.de/static/data/germany_vaccinations_timeseries_v2.tsv"
- app.logger.info("------------------------------------------------------------")
- app.logger.info(" Vaccination Service Import [ready]")
+ app.logger.debug("------------------------------------------------------------")
+ app.logger.debug(" Vaccination Service Import [ready]")
def import_file(self):
src_cvsfile_name = self.cfg.data_path+os.sep+self.cfg.cvsfile_name
--
GitLab