From fd4a2dc99d3aa131fedea494972f8a29550f75ef Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 20 May 2021 08:45:09 +0200
Subject: [PATCH] Refactoring: rename covid19 to flask_covid19
---
.../blueprints/divi/divi_model.py | 2 +-
.../blueprints/ecdc/ecdc_model.py | 2 +-
.../blueprints/ecdc/ecdc_service.py | 4 +-
.../blueprints/ecdc/ecdc_service_import.py | 4 +-
.../blueprints/ecdc/ecdc_service_update.py | 4 +-
.../blueprints/ecdc/ecdc_views.py | 4 +-
.../blueprints/ecdc_test/ecdc_test_service.py | 2 +-
.../blueprints/ecdc_test/ecdc_test_views.py | 4 +-
.../blueprints/owid/owid_model.py | 2 +-
.../blueprints/owid/owid_service.py | 6 +-
.../blueprints/owid/owid_service_import.py | 4 +-
.../blueprints/owid/owid_service_update.py | 4 +-
.../blueprints/owid/owid_views.py | 176 +----------------
.../blueprints/owid/owid_views_diagrams.py | 186 ++++++++++++++++++
.../blueprints/owid_test/owid_test_service.py | 4 +-
.../blueprints/owid_test/owid_test_views.py | 6 +-
.../blueprints/rki_cases/rki_model.py | 3 +-
.../blueprints/rki_cases/rki_service.py | 4 +-
.../rki_cases/rki_service_import.py | 2 +-
.../rki_cases/rki_service_update.py | 4 +-
.../blueprints/rki_cases/rki_views.py | 4 +-
.../rki_cases_test/rki_test_service.py | 20 +-
.../rki_cases_test/rki_test_views.py | 8 +-
.../rki_vaccination/rki_vaccination_model.py | 2 +-
.../rki_vaccination_service.py | 5 +-
.../rki_vaccination_service_import.py | 4 +-
.../rki_vaccination_service_update.py | 6 +-
.../rki_vaccination/rki_vaccination_views.py | 5 +-
.../blueprints/who_test/who_test_service.py | 2 +-
.../blueprints/who_test/who_test_views.py | 6 +-
30 files changed, 253 insertions(+), 236 deletions(-)
create mode 100644 src/flask_covid19/blueprints/owid/owid_views_diagrams.py
diff --git a/src/flask_covid19/blueprints/divi/divi_model.py b/src/flask_covid19/blueprints/divi/divi_model.py
index 96fd0f45..1ffd5c48 100644
--- a/src/flask_covid19/blueprints/divi/divi_model.py
+++ b/src/flask_covid19/blueprints/divi/divi_model.py
@@ -2,7 +2,7 @@ from sqlalchemy import and_
from datetime import date
from sqlalchemy.orm import joinedload, subqueryload
from database import db, ITEMS_PER_PAGE
-from flask_covid19 import ApplicationDateReported, ApplicationRegion
+from flask_covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion
class DiviDateReported(ApplicationDateReported):
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_model.py b/src/flask_covid19/blueprints/ecdc/ecdc_model.py
index adca19a5..f23c7298 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_model.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_model.py
@@ -1,6 +1,6 @@
from sqlalchemy import and_
from database import db, ITEMS_PER_PAGE
-from flask_covid19 import ApplicationDateReported, ApplicationRegion
+from flask_covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion
class EcdcDateReported(ApplicationDateReported):
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service.py b/src/flask_covid19/blueprints/ecdc/ecdc_service.py
index 19d157a1..b0c5e513 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service.py
@@ -1,8 +1,8 @@
from database import app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload
-from flask_covid19 import EcdcServiceImport
-from flask_covid19 import EcdcServiceUpdate, EcdcServiceUpdateFull
+from flask_covid19.blueprints.ecdc.ecdc_service_import import EcdcServiceImport
+from flask_covid19.blueprints.ecdc.ecdc_service_update import EcdcServiceUpdate, EcdcServiceUpdateFull
class EcdcService:
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py b/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
index bbe88482..794a15e6 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
@@ -3,8 +3,8 @@ import psycopg2
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import EcdcDateReported
-from flask_covid19 import EcdcImport
+from flask_covid19.blueprints.ecdc.ecdc_model import EcdcDateReported
+from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
class EcdcServiceImport:
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py b/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
index fdaa8d8d..95a1a4c9 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import EcdcImport
-from flask_covid19 import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
+from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
+from flask_covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
class EcdcServiceUpdateBase:
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
index 8aa83048..c1b58a12 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
@@ -7,8 +7,8 @@ from database import admin, db
from flask_covid19.blueprints.app_all.all_services import ecdc_service
from flask_covid19.blueprints.app_mq.application_workers import celery
-from flask_covid19 import EcdcImport
-from flask_covid19 import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
+from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
+from flask_covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
diff --git a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py
index 56de2f8d..be3ae234 100644
--- a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py
+++ b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py
@@ -1,6 +1,6 @@
from database import app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import EcdcDateReported, EcdcData
+from flask_covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcData
class EcdcTestService:
diff --git a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py
index ebc01f8f..68b1737c 100644
--- a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py
+++ b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py
@@ -8,8 +8,8 @@ from flask_covid19.blueprints.app_all.all_services import ecdc_service
from flask_covid19.blueprints.app_mq.application_workers import celery
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
-from flask_covid19 import EcdcImport
-from flask_covid19 import EcdcTestService
+from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
+from flask_covid19.blueprints.ecdc_test.ecdc_test_service import EcdcTestService
ecdc_test_service = EcdcTestService(db, ecdc_service)
diff --git a/src/flask_covid19/blueprints/owid/owid_model.py b/src/flask_covid19/blueprints/owid/owid_model.py
index 13200b2b..f7fa784c 100644
--- a/src/flask_covid19/blueprints/owid/owid_model.py
+++ b/src/flask_covid19/blueprints/owid/owid_model.py
@@ -3,7 +3,7 @@ from datetime import date
from sqlalchemy.orm import joinedload, subqueryload
from database import db, ITEMS_PER_PAGE
-from flask_covid19 import ApplicationDateReported, ApplicationRegion
+from flask_covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion
class OwidDateReported(ApplicationDateReported):
diff --git a/src/flask_covid19/blueprints/owid/owid_service.py b/src/flask_covid19/blueprints/owid/owid_service.py
index 7bc458f7..0c6b59e6 100644
--- a/src/flask_covid19/blueprints/owid/owid_service.py
+++ b/src/flask_covid19/blueprints/owid/owid_service.py
@@ -1,10 +1,10 @@
-from flask import flash
from database import app
+
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload
-from flask_covid19 import OwidServiceImport
-from flask_covid19 import OwidServiceUpdate, OwidServiceUpdateFull
+from flask_covid19.blueprints.owid.owid_service_import import OwidServiceImport
+from flask_covid19.blueprints.owid.owid_service_update import OwidServiceUpdate, OwidServiceUpdateFull
class OwidService:
diff --git a/src/flask_covid19/blueprints/owid/owid_service_import.py b/src/flask_covid19/blueprints/owid/owid_service_import.py
index 8633efd1..2933cdea 100644
--- a/src/flask_covid19/blueprints/owid/owid_service_import.py
+++ b/src/flask_covid19/blueprints/owid/owid_service_import.py
@@ -2,8 +2,8 @@ import csv
import psycopg2
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import OwidDateReported
-from flask_covid19 import OwidImport
+from flask_covid19.blueprints.owid.owid_model import OwidDateReported
+from flask_covid19.blueprints.owid.owid_model_import import OwidImport
class OwidServiceImport:
diff --git a/src/flask_covid19/blueprints/owid/owid_service_update.py b/src/flask_covid19/blueprints/owid/owid_service_update.py
index b2582920..be84975b 100644
--- a/src/flask_covid19/blueprints/owid/owid_service_update.py
+++ b/src/flask_covid19/blueprints/owid/owid_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
-from flask_covid19 import OwidImport
+from flask_covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
+from flask_covid19.blueprints.owid.owid_model_import import OwidImport
class OwidServiceUpdateBase:
diff --git a/src/flask_covid19/blueprints/owid/owid_views.py b/src/flask_covid19/blueprints/owid/owid_views.py
index 66e53d1b..410f9671 100644
--- a/src/flask_covid19/blueprints/owid/owid_views.py
+++ b/src/flask_covid19/blueprints/owid/owid_views.py
@@ -8,8 +8,8 @@ from database import app, admin, db
from flask_covid19.blueprints.app_all.all_services import owid_service
from flask_covid19.blueprints.app_mq.application_workers import celery
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
-from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
-from flask_covid19 import OwidImport
+from flask_covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
+from flask_covid19.blueprints.owid.owid_model_import import OwidImport
app_owid = Blueprint('owid', __name__, template_folder='templates', url_prefix='/owid ')
@@ -18,178 +18,6 @@ admin.add_view(ModelView(OwidImport, db.session, category="OWID"))
admin.add_view(ModelView(OwidDateReported, db.session, category="OWID"))
admin.add_view(ModelView(OwidData, db.session, category="OWID"))
-# def task_owid_download_only(self):
-# def task_owid_import_only(self):
-# def task_owid_update_dimension_tables_only(self):
-# def task_owid_update_fact_table_incremental_only(self):
-# def task_owid_update_fact_table_initial_only(self):
-# def task_owid_update_fact_table_initial_only(self):
-# def task_owid_update_star_schema_incremental(self):
-# def task_owid_update_star_schema_initial(self):
-
-#
-# https://ourworldindata.org/grapher/covid-stringency-index?time=2020-01-26
-# https://ourworldindata.org/grapher/biweekly-confirmed-covid-19-cases
-#
-# Biweekly change in confirmed COVID-19 cases
-# Biweekly change in confirmed COVID-19 deaths
-# Biweekly confirmed COVID-19 cases
-# Biweekly confirmed COVID-19 cases per million people
-# Biweekly confirmed COVID-19 deaths
-# Biweekly confirmed COVID-19 deaths per million people
-# COVID-19 Testing Policies
-# COVID-19 Vaccination Policy
-# COVID-19 death rate vs. Population density
-# COVID-19 vaccine doses administered
-# COVID-19 vaccine doses administered per 100 people
-# COVID-19: Daily new confirmed cases vs cumulative cases
-# COVID-19: Daily new confirmed cases vs cumulative cases
-# COVID-19: Daily tests vs. Daily new confirmed cases
-# COVID-19: Daily tests vs. Daily new confirmed cases per million
-# COVID-19: Stringency Index
-# Cancellation of public events during COVID-19 pandemic
-# Case fatality rate of COVID-19 vs. Median age of the population
-# Case fatality rate of the ongoing COVID-19 pandemic
-# Case fatality rate vs. Tests per confirmed case
-# Case fatality rate vs. Total confirmed COVID-19 deaths
-# Confirmed COVID-19 deaths per million vs GDP per capita
-# Confirmed COVID-19 deaths vs. Population density
-# Cumulative COVID-19 tests, confirmed cases and deaths
-# Cumulative COVID-19 tests, confirmed cases and deaths per million people
-# Cumulative confirmed COVID-19 casesMap and country time-series
-# Cumulative confirmed COVID-19 casesBy Region
-# Cumulative confirmed COVID-19 cases per million vs. GDP per capita
-# Cumulative confirmed COVID-19 deathsBy Region
-# Cumulative confirmed COVID-19 deaths and cases
-# Cumulative confirmed COVID-19 deaths vs. cases
-# Daily COVID-19 tests
-# Daily COVID-19 tests
-# Daily COVID-19 tests per thousand people
-# Daily COVID-19 tests per thousand peopleRolling 7-day average
-# Daily COVID-19 vaccine doses administered
-# Daily COVID-19 vaccine doses administered per 100 people
-# Daily and total confirmed COVID-19 deaths
-# Daily and total confirmed COVID-19 deaths per million
-# Daily confirmed COVID-19 casesMap and country time-series
-# Daily confirmed COVID-19 casesStacked area chart – by world region
-# Daily confirmed COVID-19 cases and deaths
-# Daily confirmed COVID-19 cases per million people
-# Daily confirmed COVID-19 cases per million, 3-day rolling average
-# Daily confirmed COVID-19 cases per million: which countries are bending the curve?Trajectories
-# Daily confirmed COVID-19 cases, rolling 7-day average
-# Daily confirmed COVID-19 cases: which countries are bending the curve?
-# Daily confirmed COVID-19 deathsMap and time-series
-# Daily confirmed COVID-19 deathsBy Region
-# Daily confirmed COVID-19 deaths per million people
-# Daily confirmed COVID-19 deaths per million, 3-day rolling average
-# Daily confirmed COVID-19 deaths per million, rolling 7-day average
-# Daily confirmed COVID-19 deaths per million: which countries are bending the curve?Trajectories
-# Daily confirmed COVID-19 deaths, rolling 7-day average
-# Daily confirmed COVID-19 deaths: which countries are bending the curve?Trajectories
-# Daily new confirmed COVID-19 cases and deaths
-# Daily new confirmed cases of COVID-19
-# Daily new confirmed cases of COVID-19
-# Daily new confirmed cases of COVID-19 per million people
-# Daily new estimated COVID-19 infections from the ICL model
-# Daily new estimated COVID-19 infections from the IHME model
-# Daily new estimated COVID-19 infections from the LSHTM model
-# Daily new estimated COVID-19 infections from the YYG model
-# Daily new estimated infections of COVID-19
-# Daily tests per thousand peopleSince total confirmed cases reached 1 per million
-# Daily vs. Total confirmed COVID-19 cases
-# Daily vs. Total confirmed COVID-19 cases per million people
-# Daily vs. Total confirmed COVID-19 deaths per million
-# Daily vs. cumulative confirmed deaths due to COVID-19
-# Debt or contract relief during the COVID-19 pandemic
-# Excess mortality during COVID-19: Deaths from all causes compared to previous years, all agesP-scores
-# Excess mortality during COVID-19: Deaths from all causes compared to previous years, by ageP-scores
-# Excess mortality during COVID-19: Number of deaths from all causes compared to previous yearsRaw death counts
-# Face covering policies during the COVID-19 pandemic
-# Government Response Stringency Index vs. Biweekly change in confirmed COVID-19 cases
-# Grocery and pharmacy stores: How did the number of visitors change since the beginning of the pandemic?
-# How did the number of visitors change since the beginning of the pandemic?
-# Income support during the COVID-19 pandemic
-# International travel controls during the COVID-19 pandemic
-# Number of COVID-19 patients in ICU per million
-# Number of COVID-19 patients in hospital
-# Number of COVID-19 patients in hospital per million
-# Number of COVID-19 patients in intensive care (ICU)
-# Number of people fully vaccinated against COVID-19
-# Number of people who received at least one dose of COVID-19 vaccine
-# Number of tests per confirmed case vs. Total confirmed COVID-19 cases per million people
-# Parks and outdoor spaces: How did the number of visitors change since the beginning of the pandemic?
-# Per capita: COVID-19 tests vs. Confirmed deaths
-# Per capita: tests for COVID-19 vs. Confirmed cases
-# Public information campaigns on the COVID-19 pandemic
-# Public transport closures during the COVID-19 pandemic
-# Residential areas: How did the time spent at home change since the beginning of the pandemic?
-# Restrictions on internal movement during the COVID-19 pandemic
-# Restrictions on public gatherings in the COVID-19 pandemic
-# Retail and recreation: How did the number of visitors change since the beginning of the pandemic?
-# School closures during the COVID-19 pandemic
-# Share of COVID-19 tests that were positiveOver time, since 5th death was confirmed
-# Share of people who received at least one dose of COVID-19 vaccine
-# Share of the population fully vaccinated against COVID-19
-# Share of total COVID-19 tests that were positive
-# Share who would get a COVID-19 vaccine if it was available to them this week
-# Stay-at-home requirements during the COVID-19 pandemic
-# Tests conducted per new confirmed case of COVID-19
-# Tests per confirmed case – total vs. Case fatality rate
-# Tests per thousand since the 100th confirmed case of COVID-19
-# Tests per thousand since the 5th confirmed death due to COVID-19
-# The share of COVID-19 tests that are positive
-# Total COVID-19 testsLine chart
-# Total COVID-19 testsMap chart
-# Total COVID-19 tests conducted vs. Confirmed cases
-# Total COVID-19 tests conducted vs. Confirmed casesPositive rate comparison
-# Total COVID-19 tests conducted vs. Confirmed cases per million
-# Total COVID-19 tests for each confirmed case
-# Total COVID-19 tests for each confirmed caseBar chart
-# Total COVID-19 tests per 1,000 peopleLine chart
-# Total COVID-19 tests per 1,000 peopleMap chart
-# Total COVID-19 tests per 1,000 peopleBar chart
-# Total COVID-19 tests per 1,000 vs. GDP per capita
-# Total COVID-19 tests per 1,000: how are testing rates changing?Since daily new confirmed deaths due to COVID-19 reached 0.1 per million
-# Total COVID-19 tests per 1,000: how are testing rates changing?Since daily new confirmed deaths due to COVID-19 reached 0.1 per million
-# Total and daily confirmed COVID-19 cases
-# Total and daily confirmed COVID-19 cases per million people
-# Total confirmed COVID-19 casesBy Income Group
-# Total confirmed COVID-19 cases per million peopleMap and country time-series
-# Total confirmed COVID-19 cases per million: how rapidly are they increasing?Trajectories
-# Total confirmed COVID-19 cases vs. deaths per million
-# Total confirmed COVID-19 cases, by source
-# Total confirmed COVID-19 cases: how rapidly are they increasing?Trajectories
-# Total confirmed COVID-19 deathsMap and country time-series
-# Total confirmed COVID-19 deathsBy Income Group
-# Total confirmed COVID-19 deaths and cases per million people
-# Total confirmed COVID-19 deaths per million people
-# Total confirmed COVID-19 deaths per million vs GDP per capita
-# Total confirmed COVID-19 deaths per million: how rapidly are they increasing?
-# Total confirmed COVID-19 deaths: how rapidly are they increasing?Trajectories
-# Total confirmed deaths due to COVID-19 vs. Population
-# Total confirmed deaths from COVID-19, by source
-# Total number of COVID-19 tests per confirmed case
-# Transit stations: How did the number of visitors change since the beginning of the pandemic?
-# Week by week change in confirmed COVID-19 cases
-# Week by week change of confirmed COVID-19 cases vs. GDP per capita
-# Week by week change of confirmed COVID-19 deaths
-# Week by week change of confirmed COVID-19 deaths vs. GDP per capita
-# Weekly case growth rate vs. daily case rate
-# Weekly confirmed COVID-19 cases
-# Weekly confirmed COVID-19 cases per million people
-# Weekly confirmed COVID-19 deaths
-# Weekly confirmed COVID-19 deaths per million people
-# Weekly death growth rate vs. daily death rate
-# Weekly new ICU admissions for COVID-19
-# Weekly new ICU admissions for COVID-19 per million
-# Weekly new hospital admissions for COVID-19
-# Weekly new hospital admissions for COVID-19 per million
-# Which countries do COVID-19 contact tracing?
-# Workplace closures during the COVID-19 pandemic
-# Workplaces: How did the number of visitors change since the beginning of the pandemic?
-
-
-
# ---------------------------------------------------------------------------------------------------------------
# Url Routes Frontend
# ---------------------------------------------------------------------------------------------------------------
diff --git a/src/flask_covid19/blueprints/owid/owid_views_diagrams.py b/src/flask_covid19/blueprints/owid/owid_views_diagrams.py
new file mode 100644
index 00000000..f2bcfc6d
--- /dev/null
+++ b/src/flask_covid19/blueprints/owid/owid_views_diagrams.py
@@ -0,0 +1,186 @@
+from flask import render_template, redirect, url_for, flash, Blueprint
+from sqlalchemy.exc import OperationalError
+from celery import states
+from celery.utils.log import get_task_logger
+from flask_admin.contrib.sqla import ModelView
+
+from database import app, admin, db
+from flask_covid19.blueprints.app_all.all_services import owid_service
+from flask_covid19.blueprints.app_mq.application_workers import celery
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
+from flask_covid19.blueprints.owid.owid_model_import import OwidImport
+
+from flask_covid19.blueprints.owid.owid_views import app_owid
+
+
+# def task_owid_download_only(self):
+# def task_owid_import_only(self):
+# def task_owid_update_dimension_tables_only(self):
+# def task_owid_update_fact_table_incremental_only(self):
+# def task_owid_update_fact_table_initial_only(self):
+# def task_owid_update_fact_table_initial_only(self):
+# def task_owid_update_star_schema_incremental(self):
+# def task_owid_update_star_schema_initial(self):
+
+#
+# https://ourworldindata.org/grapher/covid-stringency-index?time=2020-01-26
+# https://ourworldindata.org/grapher/biweekly-confirmed-covid-19-cases
+#
+# Biweekly change in confirmed COVID-19 cases
+# Biweekly change in confirmed COVID-19 deaths
+# Biweekly confirmed COVID-19 cases
+# Biweekly confirmed COVID-19 cases per million people
+# Biweekly confirmed COVID-19 deaths
+# Biweekly confirmed COVID-19 deaths per million people
+# COVID-19 Testing Policies
+# COVID-19 Vaccination Policy
+# COVID-19 death rate vs. Population density
+# COVID-19 vaccine doses administered
+# COVID-19 vaccine doses administered per 100 people
+# COVID-19: Daily new confirmed cases vs cumulative cases
+# COVID-19: Daily new confirmed cases vs cumulative cases
+# COVID-19: Daily tests vs. Daily new confirmed cases
+# COVID-19: Daily tests vs. Daily new confirmed cases per million
+# COVID-19: Stringency Index
+# Cancellation of public events during COVID-19 pandemic
+# Case fatality rate of COVID-19 vs. Median age of the population
+# Case fatality rate of the ongoing COVID-19 pandemic
+# Case fatality rate vs. Tests per confirmed case
+# Case fatality rate vs. Total confirmed COVID-19 deaths
+# Confirmed COVID-19 deaths per million vs GDP per capita
+# Confirmed COVID-19 deaths vs. Population density
+# Cumulative COVID-19 tests, confirmed cases and deaths
+# Cumulative COVID-19 tests, confirmed cases and deaths per million people
+# Cumulative confirmed COVID-19 casesMap and country time-series
+# Cumulative confirmed COVID-19 casesBy Region
+# Cumulative confirmed COVID-19 cases per million vs. GDP per capita
+# Cumulative confirmed COVID-19 deathsBy Region
+# Cumulative confirmed COVID-19 deaths and cases
+# Cumulative confirmed COVID-19 deaths vs. cases
+# Daily COVID-19 tests
+# Daily COVID-19 tests
+# Daily COVID-19 tests per thousand people
+# Daily COVID-19 tests per thousand peopleRolling 7-day average
+# Daily COVID-19 vaccine doses administered
+# Daily COVID-19 vaccine doses administered per 100 people
+# Daily and total confirmed COVID-19 deaths
+# Daily and total confirmed COVID-19 deaths per million
+# Daily confirmed COVID-19 casesMap and country time-series
+# Daily confirmed COVID-19 casesStacked area chart – by world region
+# Daily confirmed COVID-19 cases and deaths
+# Daily confirmed COVID-19 cases per million people
+# Daily confirmed COVID-19 cases per million, 3-day rolling average
+# Daily confirmed COVID-19 cases per million: which countries are bending the curve?Trajectories
+# Daily confirmed COVID-19 cases, rolling 7-day average
+# Daily confirmed COVID-19 cases: which countries are bending the curve?
+# Daily confirmed COVID-19 deathsMap and time-series
+# Daily confirmed COVID-19 deathsBy Region
+# Daily confirmed COVID-19 deaths per million people
+# Daily confirmed COVID-19 deaths per million, 3-day rolling average
+# Daily confirmed COVID-19 deaths per million, rolling 7-day average
+# Daily confirmed COVID-19 deaths per million: which countries are bending the curve?Trajectories
+# Daily confirmed COVID-19 deaths, rolling 7-day average
+# Daily confirmed COVID-19 deaths: which countries are bending the curve?Trajectories
+# Daily new confirmed COVID-19 cases and deaths
+# Daily new confirmed cases of COVID-19
+# Daily new confirmed cases of COVID-19
+# Daily new confirmed cases of COVID-19 per million people
+# Daily new estimated COVID-19 infections from the ICL model
+# Daily new estimated COVID-19 infections from the IHME model
+# Daily new estimated COVID-19 infections from the LSHTM model
+# Daily new estimated COVID-19 infections from the YYG model
+# Daily new estimated infections of COVID-19
+# Daily tests per thousand peopleSince total confirmed cases reached 1 per million
+# Daily vs. Total confirmed COVID-19 cases
+# Daily vs. Total confirmed COVID-19 cases per million people
+# Daily vs. Total confirmed COVID-19 deaths per million
+# Daily vs. cumulative confirmed deaths due to COVID-19
+# Debt or contract relief during the COVID-19 pandemic
+# Excess mortality during COVID-19: Deaths from all causes compared to previous years, all agesP-scores
+# Excess mortality during COVID-19: Deaths from all causes compared to previous years, by ageP-scores
+# Excess mortality during COVID-19: Number of deaths from all causes compared to previous yearsRaw death counts
+# Face covering policies during the COVID-19 pandemic
+# Government Response Stringency Index vs. Biweekly change in confirmed COVID-19 cases
+# Grocery and pharmacy stores: How did the number of visitors change since the beginning of the pandemic?
+# How did the number of visitors change since the beginning of the pandemic?
+# Income support during the COVID-19 pandemic
+# International travel controls during the COVID-19 pandemic
+# Number of COVID-19 patients in ICU per million
+# Number of COVID-19 patients in hospital
+# Number of COVID-19 patients in hospital per million
+# Number of COVID-19 patients in intensive care (ICU)
+# Number of people fully vaccinated against COVID-19
+# Number of people who received at least one dose of COVID-19 vaccine
+# Number of tests per confirmed case vs. Total confirmed COVID-19 cases per million people
+# Parks and outdoor spaces: How did the number of visitors change since the beginning of the pandemic?
+# Per capita: COVID-19 tests vs. Confirmed deaths
+# Per capita: tests for COVID-19 vs. Confirmed cases
+# Public information campaigns on the COVID-19 pandemic
+# Public transport closures during the COVID-19 pandemic
+# Residential areas: How did the time spent at home change since the beginning of the pandemic?
+# Restrictions on internal movement during the COVID-19 pandemic
+# Restrictions on public gatherings in the COVID-19 pandemic
+# Retail and recreation: How did the number of visitors change since the beginning of the pandemic?
+# School closures during the COVID-19 pandemic
+# Share of COVID-19 tests that were positiveOver time, since 5th death was confirmed
+# Share of people who received at least one dose of COVID-19 vaccine
+# Share of the population fully vaccinated against COVID-19
+# Share of total COVID-19 tests that were positive
+# Share who would get a COVID-19 vaccine if it was available to them this week
+# Stay-at-home requirements during the COVID-19 pandemic
+# Tests conducted per new confirmed case of COVID-19
+# Tests per confirmed case – total vs. Case fatality rate
+# Tests per thousand since the 100th confirmed case of COVID-19
+# Tests per thousand since the 5th confirmed death due to COVID-19
+# The share of COVID-19 tests that are positive
+# Total COVID-19 testsLine chart
+# Total COVID-19 testsMap chart
+# Total COVID-19 tests conducted vs. Confirmed cases
+# Total COVID-19 tests conducted vs. Confirmed casesPositive rate comparison
+# Total COVID-19 tests conducted vs. Confirmed cases per million
+# Total COVID-19 tests for each confirmed case
+# Total COVID-19 tests for each confirmed caseBar chart
+# Total COVID-19 tests per 1,000 peopleLine chart
+# Total COVID-19 tests per 1,000 peopleMap chart
+# Total COVID-19 tests per 1,000 peopleBar chart
+# Total COVID-19 tests per 1,000 vs. GDP per capita
+# Total COVID-19 tests per 1,000: how are testing rates changing?Since daily new confirmed deaths due to COVID-19 reached 0.1 per million
+# Total COVID-19 tests per 1,000: how are testing rates changing?Since daily new confirmed deaths due to COVID-19 reached 0.1 per million
+# Total and daily confirmed COVID-19 cases
+# Total and daily confirmed COVID-19 cases per million people
+# Total confirmed COVID-19 casesBy Income Group
+# Total confirmed COVID-19 cases per million peopleMap and country time-series
+# Total confirmed COVID-19 cases per million: how rapidly are they increasing?Trajectories
+# Total confirmed COVID-19 cases vs. deaths per million
+# Total confirmed COVID-19 cases, by source
+# Total confirmed COVID-19 cases: how rapidly are they increasing?Trajectories
+# Total confirmed COVID-19 deathsMap and country time-series
+# Total confirmed COVID-19 deathsBy Income Group
+# Total confirmed COVID-19 deaths and cases per million people
+# Total confirmed COVID-19 deaths per million people
+# Total confirmed COVID-19 deaths per million vs GDP per capita
+# Total confirmed COVID-19 deaths per million: how rapidly are they increasing?
+# Total confirmed COVID-19 deaths: how rapidly are they increasing?Trajectories
+# Total confirmed deaths due to COVID-19 vs. Population
+# Total confirmed deaths from COVID-19, by source
+# Total number of COVID-19 tests per confirmed case
+# Transit stations: How did the number of visitors change since the beginning of the pandemic?
+# Week by week change in confirmed COVID-19 cases
+# Week by week change of confirmed COVID-19 cases vs. GDP per capita
+# Week by week change of confirmed COVID-19 deaths
+# Week by week change of confirmed COVID-19 deaths vs. GDP per capita
+# Weekly case growth rate vs. daily case rate
+# Weekly confirmed COVID-19 cases
+# Weekly confirmed COVID-19 cases per million people
+# Weekly confirmed COVID-19 deaths
+# Weekly confirmed COVID-19 deaths per million people
+# Weekly death growth rate vs. daily death rate
+# Weekly new ICU admissions for COVID-19
+# Weekly new ICU admissions for COVID-19 per million
+# Weekly new hospital admissions for COVID-19
+# Weekly new hospital admissions for COVID-19 per million
+# Which countries do COVID-19 contact tracing?
+# Workplace closures during the COVID-19 pandemic
+# Workplaces: How did the number of visitors change since the beginning of the pandemic?
+
diff --git a/src/flask_covid19/blueprints/owid_test/owid_test_service.py b/src/flask_covid19/blueprints/owid_test/owid_test_service.py
index 2e725ea5..ca214ff8 100644
--- a/src/flask_covid19/blueprints/owid_test/owid_test_service.py
+++ b/src/flask_covid19/blueprints/owid_test/owid_test_service.py
@@ -1,7 +1,7 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
-from flask_covid19 import OwidImport
+from flask_covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
+from flask_covid19.blueprints.owid.owid_model_import import OwidImport
class OwidTestService:
diff --git a/src/flask_covid19/blueprints/owid_test/owid_test_views.py b/src/flask_covid19/blueprints/owid_test/owid_test_views.py
index 4fae00e8..5a870f4d 100644
--- a/src/flask_covid19/blueprints/owid_test/owid_test_views.py
+++ b/src/flask_covid19/blueprints/owid_test/owid_test_views.py
@@ -6,11 +6,11 @@ from flask_login import login_required
from database import app, db
from flask_covid19.blueprints.app_all.all_services import owid_service
from flask_covid19.blueprints.app_mq.application_workers import celery
-from flask_covid19 import OwidData
-from flask_covid19 import OwidImport
+from flask_covid19.blueprints.owid.owid_model import OwidData
+from flask_covid19.blueprints.owid.owid_model_import import OwidImport
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
-from flask_covid19.blueprints.owid_test import OwidTestService
+from flask_covid19.blueprints.owid_test.owid_test_service import OwidTestService
owid_test_service = OwidTestService(db, owid_service)
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_model.py b/src/flask_covid19/blueprints/rki_cases/rki_model.py
index 28de848b..5080047b 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_model.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_model.py
@@ -1,9 +1,8 @@
from sqlalchemy import and_
from datetime import date
-from sqlalchemy.orm import joinedload, subqueryload
from database import db, ITEMS_PER_PAGE
-from flask_covid19 import ApplicationDateReported, ApplicationRegion
+from flask_covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion
class RkiMeldedatum(ApplicationDateReported):
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_service.py b/src/flask_covid19/blueprints/rki_cases/rki_service.py
index ab713def..1c315fa3 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service.py
@@ -3,8 +3,8 @@ from flask import flash
from database import app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload
-from flask_covid19 import RkiServiceImport
-from flask_covid19 import RkiServiceUpdate, RkiServiceUpdateFull
+from flask_covid19.blueprints.rki_cases.rki_service_import import RkiServiceImport
+from flask_covid19.blueprints.rki_cases.rki_service_update import RkiServiceUpdate, RkiServiceUpdateFull
class RkiService:
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_service_import.py b/src/flask_covid19/blueprints/rki_cases/rki_service_import.py
index 6914fc09..bf639885 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service_import.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service_import.py
@@ -3,7 +3,7 @@ import psycopg2
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import RkiImport
+from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
class RkiServiceImport:
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_service_update.py b/src/flask_covid19/blueprints/rki_cases/rki_service_update.py
index a68c83d2..dea4eb47 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service_update.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service_update.py
@@ -1,8 +1,8 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import RkiData, RkiMeldedatum
-from flask_covid19 import RkiImport
+from flask_covid19.blueprints.rki_cases.rki_model import RkiData, RkiMeldedatum
+from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
class RkiServiceUpdateBase:
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_views.py b/src/flask_covid19/blueprints/rki_cases/rki_views.py
index 7b224760..8639635c 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_views.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_views.py
@@ -6,8 +6,8 @@ from celery import states
from database import app, admin, db
from flask_covid19.blueprints.app_mq.application_workers import celery
from flask_covid19.blueprints.app_all.all_services import rki_service
-from flask_covid19 import RkiData, RkiMeldedatum
-from flask_covid19 import RkiImport
+from flask_covid19.blueprints.rki_cases.rki_model import RkiData, RkiMeldedatum
+from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
drop_and_create_data_again = True
diff --git a/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py b/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py
index fba73417..4164f7d1 100644
--- a/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py
+++ b/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py
@@ -1,7 +1,7 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import RkiData, RkiDateReported, RkiCountryRegion, RkiCountry
-from flask_covid19 import RkiImport
+from flask_covid19.blueprints.rki_cases.rki_model import RkiData, RkiMeldedatum, RkiBundesland, RkiLandkreis
+from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
class RkiTestService:
@@ -20,7 +20,7 @@ class RkiTestService:
app.logger.debug(" RkiTestService.delete_last_day() [START]")
app.logger.debug("------------------------------------------------------------")
joungest_datum_str = RkiData.get_joungest_datum()
- joungest_datum = RkiDateReported.find_by_date_reported(joungest_datum_str)
+ joungest_datum = RkiMeldedatum.find_by_date_reported(joungest_datum_str)
app.logger.info("joungest_datum:")
app.logger.info(joungest_datum)
app.logger.info("RkiData.get_data_for_one_day(joungest_datum):")
@@ -40,10 +40,10 @@ class RkiTestService:
app.logger.debug(" RkiTestService.delete_last_continent() [START]")
app.logger.debug("------------------------------------------------------------")
app.logger.info("OwidContinent.get_last_continent()")
- last_continent = RkiCountryRegion.get_last_continent()
+ last_continent = RkiBundesland.get_last_continent()
app.logger.info("last_continent:" + str(last_continent))
app.logger.info("OwidCountry.get_all_countries_for_continent(last_continent)")
- countries_for_continent = RkiCountry.get_all_countries_for_continent(last_continent)
+ countries_for_continent = RkiLandkreis.get_all_countries_for_continent(last_continent)
i = 0
for country in countries_for_continent:
for data in RkiData.get_all_data_for_country(country):
@@ -52,8 +52,8 @@ class RkiTestService:
app.logger.info(line)
app.logger.info("RkiData.delete_all_data_for_country(country)")
RkiData.delete_all_data_for_country(country)
- app.logger.info("RkiCountry.delete_all_countries_for_continent(last_continent)")
- RkiCountry.delete_all_countries_for_continent(last_continent)
+ app.logger.info("RkiLandkreis.delete_all_countries_for_continent(last_continent)")
+ RkiLandkreis.delete_all_countries_for_continent(last_continent)
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RkiTestService.delete_last_continent() [DONE]")
app.logger.debug("------------------------------------------------------------")
@@ -73,12 +73,12 @@ class RkiTestService:
app.logger.debug("------------------------------------------------------------")
app.logger.debug("")
RkiData.remove_all()
- RkiCountry.remove_all()
- for continent in RkiCountryRegion.get_all():
+ RkiLandkreis.remove_all()
+ for continent in RkiBundesland.get_all():
app.logger.info("continent.region: " + continent.region)
for oi in RkiImport.get_countries_for_continent(continent.region):
app.logger.info("continent.region: " + continent.region +" - oi.location: " + oi.location)
- o = RkiCountry(
+ o = RkiLandkreis(
continent_id=continent.id,
continent=continent,
location=oi.location,
diff --git a/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py b/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py
index 03dbe134..1ffcf6cf 100644
--- a/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py
+++ b/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py
@@ -7,13 +7,13 @@ from database import app, db
from flask_covid19.blueprints.app_all.all_services import rki_service
from flask_covid19.blueprints.app_mq.application_workers import celery
-from flask_covid19 import RkiData
-from flask_covid19 import RkiImport
+from flask_covid19.blueprints.rki_cases.rki_model import RkiData
+from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
-from flask_covid19.blueprints.owid_test import OwidTestService
+from flask_covid19.blueprints.rki_cases_test.rki_test_service import RkiTestService
-rki_test_service = OwidTestService(db, rki_service)
+rki_test_service = RkiTestService(db, rki_service)
app_rki_test = Blueprint('rki_test', __name__, template_folder='templates', url_prefix='/rki/test')
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model.py
index 92648afd..01bc3816 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_model.py
@@ -1,7 +1,7 @@
from datetime import date
from database import db, ITEMS_PER_PAGE
-from flask_covid19 import ApplicationDateReported, ApplicationRegion
+from flask_covid19.blueprints.app_all.all_model import ApplicationDateReported
class RkiVaccinationDateReported(ApplicationDateReported):
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py
index b9a0bf5c..ada73c72 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py
@@ -3,8 +3,9 @@ from flask import flash
from database import app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload
-from flask_covid19 import RkiVaccinationServiceImport
-from flask_covid19 import RkiVaccinationServiceUpdate, RkiVaccinationServiceUpdateFull
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_service_import import RkiVaccinationServiceImport
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_service_update import RkiVaccinationServiceUpdate
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_service_update import RkiVaccinationServiceUpdateFull
class RkiVaccinationService:
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index ce5bf42a..d82f3df2 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -4,8 +4,8 @@ import psycopg2
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import RkiVaccinationDateReported
-from flask_covid19 import RkiVaccinationImport
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
class RkiVaccinationServiceImport:
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
index 689f2741..81eb42dc 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
@@ -1,8 +1,10 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import RkiVaccinationImport
-from flask_covid19 import RkiVaccinationDateReported, RkiVaccinationData
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationData
+
class RkiVaccinationServiceUpdateBase:
def __init__(self, database, config: ApplicationServiceConfig):
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
index 85147e02..99be2fc8 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
@@ -7,8 +7,9 @@ from database import admin, db
from flask_covid19.blueprints.app_all.all_services import rki_vaccination_service
from flask_covid19.blueprints.app_mq.application_workers import celery
-from flask_covid19 import RkiVaccinationData, RkiVaccinationDateReported
-from flask_covid19 import RkiVaccinationImport
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationData
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
diff --git a/src/flask_covid19/blueprints/who_test/who_test_service.py b/src/flask_covid19/blueprints/who_test/who_test_service.py
index aee9c222..e4e6f174 100644
--- a/src/flask_covid19/blueprints/who_test/who_test_service.py
+++ b/src/flask_covid19/blueprints/who_test/who_test_service.py
@@ -1,6 +1,6 @@
from database import app
from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
-from flask_covid19 import WhoDateReported, WhoData
+from flask_covid19.blueprints.who.who_model import WhoDateReported, WhoData
class WhoTestService:
diff --git a/src/flask_covid19/blueprints/who_test/who_test_views.py b/src/flask_covid19/blueprints/who_test/who_test_views.py
index 8a84d0f9..24cc8e92 100644
--- a/src/flask_covid19/blueprints/who_test/who_test_views.py
+++ b/src/flask_covid19/blueprints/who_test/who_test_views.py
@@ -8,10 +8,10 @@ from flask_covid19.blueprints.app_all.all_services import who_service
from flask_covid19.blueprints.app_mq.application_workers import celery
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
-from flask_covid19 import WhoImport
-from flask_covid19 import WhoData
+from flask_covid19.blueprints.who.who_model_import import WhoImport
+from flask_covid19.blueprints.who.who_model import WhoData
-from flask_covid19 import WhoTestService
+from flask_covid19.blueprints.who_test.who_test_service import WhoTestService
who_test_service = WhoTestService(db, who_service)
--
GitLab