diff --git a/BACKLOG.md b/BACKLOG.md
index 572fc5b206a808ba15009a14677c4ecf8a3dd271..2ae9ac659dd48bd0fa7820d48e8204eaf0e6fc4e 100644
--- a/BACKLOG.md
+++ b/BACKLOG.md
@@ -125,7 +125,7 @@
### 0.0.15 Release
* -------------------------------------
-* Fixed #88 rename VaccinationImport to VaccinationImport
+* Fixed #88 rename RkiVaccinationImport to RkiVaccinationImport
* 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
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py
index 26690727cc9a513c98b187d5c5b7b2ce2ef4714c..0f5957c2a4d3284458cd86c5ab9b9bef24a833a6 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py
@@ -1,8 +1,8 @@
from database import db, ITEMS_PER_PAGE
-class VaccinationImport(db.Model):
- __tablename__ = 'vaccination_import'
+class RkiVaccinationImport(db.Model):
+ __tablename__ = 'rki_vaccination_import'
id = db.Column(db.Integer, primary_key=True)
datum = db.Column(db.String(255), nullable=False)
@@ -89,30 +89,30 @@ class VaccinationImport(db.Model):
sql_query = """
select
distinct
- vaccination_import.datum
+ rki_vaccination_import.datum
from
- vaccination_import
+ rki_vaccination_import
where
datum
not in (
select
distinct
- vaccination_import.datum
+ rki_vaccination_import.datum
from
- vaccination_data
+ rki_vaccination_data
left join
- vaccination_date_reported
+ rki_vaccination_date_reported
on
- vaccination_data.date_reported_id=vaccination_date_reported.id
+ rki_vaccination_data.date_reported_id=rki_vaccination_date_reported.id
group by
- vaccination_import.datum
+ rki_vaccination_import.datum
order by
- vaccination_import.datum desc
+ rki_vaccination_import.datum desc
)
group by
- vaccination_import.datum
+ rki_vaccination_import.datum
order by
- vaccination_import.datum desc
+ rki_vaccination_import.datum desc
"""
new_dates = []
for item, in db.session.execute(sql_query):
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index 76dd3bc6da9586cf652f44f4e7f38726f69a6c38..74de4fd104258253f6042815ca6df977719ae2c7 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -3,7 +3,7 @@ import csv
import psycopg2
from database import db, app
-from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import VaccinationImport
+from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
@@ -25,12 +25,12 @@ class RkiVaccinationServiceImport:
app.logger.info(" TABLE: who_global_data_import")
app.logger.info("------------------------------------------------------------")
try:
- VaccinationImport.remove_all()
+ RkiVaccinationImport.remove_all()
k = 0
with open(src_cvsfile_name, newline='\n') as csv_file:
file_reader = csv.DictReader(csv_file, delimiter='\t', quotechar='"')
for row in file_reader:
- o = VaccinationImport(
+ o = RkiVaccinationImport(
datum=row['date'],
dosen_kumulativ=int(row['dosen_kumulativ']),
dosen_differenz_zum_vortag=int(row['dosen_differenz_zum_vortag']),
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
index 263425e5c7fe3fbf78db6334121b806df127c07d..079355da990538fca2a82ba9412e4974dca9ec5e 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
-from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import VaccinationImport
+from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
from covid19.blueprints.rki_vaccination.rki_vaccination_model import VaccinationDateReported, VaccinationData
@@ -20,7 +20,7 @@ class RkiVaccinationServiceUpdate:
app.logger.info("------------------------------------------------------------")
VaccinationData.remove_all()
VaccinationDateReported.remove_all()
- date_reported_list = VaccinationImport.get_date_reported_as_array()
+ date_reported_list = RkiVaccinationImport.get_date_reported_as_array()
i = 0
for one_date_reported in date_reported_list:
i += 1
@@ -37,7 +37,7 @@ class RkiVaccinationServiceUpdate:
app.logger.info(" __update_data_initial [begin]")
app.logger.info("------------------------------------------------------------")
VaccinationData.remove_all()
- result_date_rep = VaccinationImport.get_date_rep()
+ result_date_rep = RkiVaccinationImport.get_date_rep()
i = 0
for item_date_rep, in result_date_rep:
#dt = item_date_rep['date_rep']
@@ -47,7 +47,7 @@ class RkiVaccinationServiceUpdate:
if europe_date_reported is None:
o = VaccinationDateReported.create_new_object_factory(item_date_rep)
europe_date_reported = o
- result_europe_data_import = VaccinationImport.find_by_datum(europe_date_reported.date_reported)
+ result_europe_data_import = RkiVaccinationImport.find_by_datum(europe_date_reported.date_reported)
for item_europe_data_import in result_europe_data_import:
o = VaccinationData(
date_reported=europe_date_reported,
@@ -88,11 +88,11 @@ class RkiVaccinationServiceUpdate:
def __update_data_incremental(self):
app.logger.info(" __update_data_initial [begin]")
app.logger.info("------------------------------------------------------------")
- result_date_rep = VaccinationImport.get_daterep_missing_in_vaccination_data()
+ result_date_rep = RkiVaccinationImport.get_daterep_missing_in_vaccination_data()
i = 0
for item_date_rep in result_date_rep:
europe_date_reported = VaccinationDateReported.create_new_object_factory(item_date_rep)
- result_europe_data_import = VaccinationImport.find_by_datum(europe_date_reported)
+ result_europe_data_import = RkiVaccinationImport.find_by_datum(europe_date_reported)
for item_europe_data_import in result_europe_data_import:
o = VaccinationData(
date_reported=europe_date_reported,
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py
index d0548d2216a74856a59b59fa6e4317c519686315..cd178685aaa1ef03607917f7bff3964b15d50b5e 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py
@@ -7,7 +7,7 @@ from covid19.app_services import rki_vaccination_service
from covid19.app_workers import celery
from covid19.blueprints.rki_vaccination.rki_vaccination_model import VaccinationData, VaccinationDateReported
-from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import VaccinationImport
+from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
from covid19.blueprints.common.common_model_transient import ApplicationPage
@@ -132,7 +132,7 @@ def url_vaccination_tasks():
@app_rki_vaccination.route('/imported')
def url_vaccination_imported(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline imported")
- page_data = VaccinationImport.get_all_as_page(page)
+ page_data = RkiVaccinationImport.get_all_as_page(page)
return render_template(
'rki_vaccination/vaccination_imported.html',
page_data=page_data,