From dcab374aad8492de77c34ce7e26d467e3ed4a0ac Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 17 Feb 2021 19:45:04 +0100
Subject: [PATCH] ### 0.0.17 Release * ------------------------------------- *
Issue #82 change to ORM ClassHierarchy * Fixed #108 change to ORM
ClassHierarchy in: EcdcImport.get_countries_of_continent * Fixed #39
SQLalchemy instead of SQL: AllModelClasses.remove_all() * Fixed #40
SQLalchemy instead of SQL: EcdcImport.get_date_rep() * Fixed #41 SQLalchemy
instead of SQL: EcdcImport.get_countries_of_continent() * Fixed #107
SQLalchemy instead of SQL in: EcdcImport.get_countries_of_continent * Fixed
#109 SQLalchemy instead of SQL in: EcdcImport.get_date_rep * Fixed #110
SQLalchemy instead of SQL in: EcdcImport.get_continent *
------------------------------------- * Fixed #123 split
RkiBundeslaenderService into two Services, one for bundeslaender and one for
landkreise * Fixed #128 add fields from csv to RkiLandkreiseImport * Fixed
#139 refactor RkiBundeslaenderServiceDownload to new method scheme introduced
07.02.2021 * Fixed #140 move WhoImport to RKI in: rk_service_import.py *
Fixed #125 implement RkiLandkreise * Fixed #126 implement
RkiBundeslaenderImport * Issue #129 change to ORM ClassHierarchy in:
RkiLandkreiseImport.get_new_dates_as_array * Issue #131 change to ORM
ClassHierarchy in: RkiGermanyDataImportTable.get_new_dates_as_array * Issue
#146 add Tasks and URLs for starting Tasks to rki_views * Issue #127
implement RkiBundeslaenderImport.get_dates_reported * Issue #132 refactor
RkiBundeslaenderService to new method scheme introduced 07.02.2021 * Issue
#133 implement RkiBundeslaenderService.task_database_drop_create * Issue #134
implement RkiBundeslaenderService.run_update_dimension_tables_only * Issue
#135 implement RkiBundeslaenderService.run_update_fact_table_incremental_only
* Issue #136 implement
RkiBundeslaenderService.run_update_fact_table_initial_only * Issue #137
implement RkiBundeslaenderService.run_update_star_schema_incremental * Issue
#138 implement RkiBundeslaenderService.run_update_star_schema_initial * Issue
#141 implement RkiBundeslaenderServiceUpdate.update_dimension_tables_only *
Issue #142 implement
RkiBundeslaenderServiceUpdate.update_fact_table_incremental_only * Issue #143
implement RkiBundeslaenderServiceUpdate.update_fact_table_initial_only *
Issue #144 implement
RkiBundeslaenderServiceUpdate.update_star_schema_incremental * Issue #145
implement RkiBundeslaenderServiceUpdate.update_star_schema_initial * Issue
#147 refactor RkiBundeslaenderServiceUpdate.__update_who_date_reported *
Issue #148 refactor RkiBundeslaenderServiceUpdate.__update_who_region * Issue
#149 refactor RkiBundeslaenderServiceUpdate.__update_who_country * Issue #150
refactor RkiBundeslaenderServiceUpdate.__update_who_global_data * Issue #151
refactor RkiBundeslaenderServiceUpdate.__update_who_global_data_short * Issue
#152 refactor RkiBundeslaenderServiceUpdate.__update_who_global_data_initial
* Issue #153 refactor RkiBundeslaenderServiceUpdate.update_db * Issue #154
refactor RkiBundeslaenderServiceUpdate.update_db_short * Issue #155 refactor
RkiBundeslaenderServiceUpdate.update_db_initial
### 0.0.18 Release
* Issue #42 SQLalchemy instead of SQL: WhoImport.get_new_dates_as_array()
* Issue #83 SQLalchemy instead of SQL in WhoImport.get_new_dates_as_array
---
src/covid19/blueprints/admin/admin_views.py | 6 ++--
.../rki_bundeslaender/rki_service_import.py | 32 +++++++++++--------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index d82ff4b9..324e260d 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -59,11 +59,11 @@ def task_admin_import_all_files(self):
logger.info("------------------------------------------------------------")
logger.info(" task_admin_import_all_files [start] ")
logger.info("------------------------------------------------------------")
- who_service.task_import_all_files()
+ #who_service.task_import_all_files()
ecdc_service.task_import_all_files()
rki_vaccination_service.task_import_all_files()
- rki_service_bundeslaender.task_import_all_files()
- rki_service_landkreise.task_import_all_files()
+ #rki_service_bundeslaender.task_import_all_files()
+ #rki_service_landkreise.task_import_all_files()
logger.info("------------------------------------------------------------")
logger.info(" task_admin_import_all_files [done] ")
logger.info("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
index c2c5881d..26dafb50 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
@@ -25,26 +25,32 @@ class RkiBundeslaenderServiceImport:
app.logger.info(" TABLE: " + RkiBundeslaenderImport.__tablename__)
app.logger.info("------------------------------------------------------------")
row = None
- if sys.platform == 'linux':
- keyDate_reported ='\ufeffDate_reported'
- else:
- keyDate_reported = 'Date_reported'
try:
RkiBundeslaenderImport.remove_all()
with open(self.cfg.src_cvsfile_path, newline='\n') as csv_file:
file_reader = csv.DictReader(csv_file, delimiter=',', quotechar='"')
k = 0
for row in file_reader:
- # TODO: #140 move WhoImport to RKI in: rk_service_import.py
o = RkiBundeslaenderImport(
- date_reported=row[keyDate_reported],
- country_code=row['Country_code'],
- country=row['Country'],
- who_region=row['WHO_region'],
- new_cases=row['New_cases'],
- cumulative_cases=row['Cumulative_cases'],
- new_deaths=row['New_deaths'],
- cumulative_deaths=row['Cumulative_deaths']
+ OBJECTID_1=row['OBJECTID_1'],
+ LAN_ew_AGS=row['LAN_ew_AGS'],
+ LAN_ew_GEN=row['LAN_ew_GEN'],
+ LAN_ew_BEZ=row['LAN_ew_BEZ'],
+ LAN_ew_EWZ=row['LAN_ew_EWZ'],
+ OBJECTID=row['OBJECTID'],
+ Fallzahl=row['Fallzahl'],
+ Aktualisierung=row['Aktualisierung'],
+ AGS_TXT=row['AGS_TXT'],
+ GlobalID=row['GlobalID'],
+ faelle_100000_EW=row['faelle_100000_EW'],
+ Death=row['Death'],
+ cases7_bl_per_100k=row['cases7_bl_per_100k'],
+ cases7_bl=row['cases7_bl'],
+ death7_bl=row['death7_bl'],
+ cases7_bl_per_100k_txt=row['cases7_bl_per_100k_txt'],
+ AdmUnitId=row['AdmUnitId'],
+ SHAPE_Length=row['SHAPE_Length'],
+ SHAPE_Area=row['SHAPE_Area'],
)
db.session.add(o)
if (k % 2000) == 0:
--
GitLab