From 96e252b6587692f4eb7f680e57ff47e97c99c874 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 20 May 2021 08:15:03 +0200
Subject: [PATCH] Refactoring: rename covid19 to flask_covid19
---
.../blueprints/app_admin/app_admin_views.py | 5 +----
src/flask_covid19/blueprints/app_all/all_views.py | 5 +----
src/flask_covid19/blueprints/app_user/user_service.py | 2 +-
src/flask_covid19/blueprints/app_user/user_views.py | 5 +++--
src/flask_covid19/blueprints/divi/divi_service.py | 5 +++--
src/flask_covid19/blueprints/divi/divi_service_import.py | 2 +-
src/flask_covid19/blueprints/divi/divi_service_update.py | 2 +-
src/flask_covid19/blueprints/divi/divi_views.py | 5 +++--
.../blueprints/divi_test/divi_test_service.py | 2 +-
.../blueprints/divi_test/divi_test_views.py | 6 +++---
src/flask_covid19/blueprints/ecdc/ecdc_service.py | 4 ++--
src/flask_covid19/blueprints/ecdc/ecdc_service_import.py | 2 +-
src/flask_covid19/blueprints/ecdc/ecdc_service_update.py | 2 +-
src/flask_covid19/blueprints/ecdc/ecdc_views.py | 5 ++---
.../blueprints/ecdc_test/ecdc_test_service.py | 2 +-
.../blueprints/ecdc_test/ecdc_test_views.py | 9 +++------
src/flask_covid19/blueprints/owid/owid_service.py | 5 ++---
src/flask_covid19/blueprints/owid/owid_service_import.py | 2 +-
src/flask_covid19/blueprints/owid/owid_service_update.py | 2 +-
src/flask_covid19/blueprints/owid/owid_views.py | 7 ++-----
.../blueprints/owid_test/owid_test_service.py | 2 +-
.../blueprints/owid_test/owid_test_views.py | 9 +++------
src/flask_covid19/blueprints/rki_cases/rki_service.py | 4 ++--
.../blueprints/rki_cases/rki_service_import.py | 2 +-
.../blueprints/rki_cases/rki_service_update.py | 2 +-
src/flask_covid19/blueprints/rki_cases/rki_views.py | 7 ++-----
.../blueprints/rki_cases_test/rki_test_service.py | 2 +-
.../blueprints/rki_cases_test/rki_test_views.py | 6 +++---
.../rki_vaccination/rki_vaccination_service.py | 4 ++--
.../rki_vaccination/rki_vaccination_service_import.py | 2 +-
.../rki_vaccination/rki_vaccination_service_update.py | 2 +-
.../blueprints/rki_vaccination/rki_vaccination_views.py | 7 ++-----
.../blueprints/who_test/who_test_service.py | 2 +-
src/flask_covid19/blueprints/who_test/who_test_views.py | 6 +++---
34 files changed, 58 insertions(+), 78 deletions(-)
diff --git a/src/flask_covid19/blueprints/app_admin/app_admin_views.py b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
index c60f681c..d36c748c 100644
--- a/src/flask_covid19/blueprints/app_admin/app_admin_views.py
+++ b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
@@ -3,10 +3,7 @@ from celery import states
from celery.utils.log import get_task_logger
from database import app
-from flask_covid19.blueprints.app_all.all_services import who_service, owid_service
-from flask_covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service
-from flask_covid19.blueprints.app_all.all_services import ecdc_service, divi_service
-from flask_covid19.blueprints.app_all.all_services import app_admin_service, app_user_service
+from flask_covid19.blueprints.app_all.all_services import app_admin_service
from flask_covid19.blueprints.app_mq.application_workers import celery
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
diff --git a/src/flask_covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py
index e27c882a..3ad0c974 100644
--- a/src/flask_covid19/blueprints/app_all/all_views.py
+++ b/src/flask_covid19/blueprints/app_all/all_views.py
@@ -3,10 +3,7 @@ from celery import states
from celery.utils.log import get_task_logger
from database import app
-from flask_covid19.blueprints.app_all.all_services import who_service, owid_service
-from flask_covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service
-from flask_covid19.blueprints.app_all.all_services import ecdc_service, divi_service
-from flask_covid19.blueprints.app_all.all_services import app_admin_service, app_user_service, all_service
+from flask_covid19.blueprints.app_all.all_services import app_admin_service, all_service
from flask_covid19.blueprints.app_mq.application_workers import celery
from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
diff --git a/src/flask_covid19/blueprints/app_user/user_service.py b/src/flask_covid19/blueprints/app_user/user_service.py
index e592ca3f..5b7bf7c5 100644
--- a/src/flask_covid19/blueprints/app_user/user_service.py
+++ b/src/flask_covid19/blueprints/app_user/user_service.py
@@ -1,5 +1,5 @@
from database import app
-from flask_covid19 import User, LoginForm
+from flask_covid19.blueprints.app_user.user_model import User, LoginForm
class UserService:
diff --git a/src/flask_covid19/blueprints/app_user/user_views.py b/src/flask_covid19/blueprints/app_user/user_views.py
index 242e228f..acaf6e2c 100644
--- a/src/flask_covid19/blueprints/app_user/user_views.py
+++ b/src/flask_covid19/blueprints/app_user/user_views.py
@@ -8,8 +8,9 @@ import flask
from database import admin, db, login_manager
-from flask_covid19 import ApplicationPage
-from flask_covid19 import User, LoginForm
+
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_user.user_model import User, LoginForm
blueprint_app_user = Blueprint('usr', __name__, template_folder='templates', url_prefix='/app/usr')
diff --git a/src/flask_covid19/blueprints/divi/divi_service.py b/src/flask_covid19/blueprints/divi/divi_service.py
index 8d74cadd..7128d2fb 100644
--- a/src/flask_covid19/blueprints/divi/divi_service.py
+++ b/src/flask_covid19/blueprints/divi/divi_service.py
@@ -1,7 +1,8 @@
from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+
+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 DiviServiceImport
from flask_covid19 import DiviServiceUpdate, DiviServiceUpdateFull
diff --git a/src/flask_covid19/blueprints/divi/divi_service_import.py b/src/flask_covid19/blueprints/divi/divi_service_import.py
index d90dbe02..a12206e4 100644
--- a/src/flask_covid19/blueprints/divi/divi_service_import.py
+++ b/src/flask_covid19/blueprints/divi/divi_service_import.py
@@ -3,7 +3,7 @@ import csv
import psycopg2
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import DiviImport
diff --git a/src/flask_covid19/blueprints/divi/divi_service_update.py b/src/flask_covid19/blueprints/divi/divi_service_update.py
index b0f1ab60..6bbbdc87 100644
--- a/src/flask_covid19/blueprints/divi/divi_service_update.py
+++ b/src/flask_covid19/blueprints/divi/divi_service_update.py
@@ -1,5 +1,5 @@
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import DiviRegion, DiviDateReported, DiviCountry, DiviData
from flask_covid19 import DiviImport
diff --git a/src/flask_covid19/blueprints/divi/divi_views.py b/src/flask_covid19/blueprints/divi/divi_views.py
index e1d26020..17be23f1 100644
--- a/src/flask_covid19/blueprints/divi/divi_views.py
+++ b/src/flask_covid19/blueprints/divi/divi_views.py
@@ -6,9 +6,10 @@ from flask_admin.contrib.sqla import ModelView
from flask_login import login_required
from database import app, admin, db
-from flask_covid19 import divi_service
+
+from flask_covid19.blueprints.app_all.all_services import divi_service
from flask_covid19.blueprints.app_mq.application_workers import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
from flask_covid19 import DiviRegion, DiviDateReported, DiviCountry, DiviData
from flask_covid19 import DiviImport
diff --git a/src/flask_covid19/blueprints/divi_test/divi_test_service.py b/src/flask_covid19/blueprints/divi_test/divi_test_service.py
index 06a61752..af86c7a1 100644
--- a/src/flask_covid19/blueprints/divi_test/divi_test_service.py
+++ b/src/flask_covid19/blueprints/divi_test/divi_test_service.py
@@ -1,5 +1,5 @@
from database import app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import DiviDateReported, DiviData
diff --git a/src/flask_covid19/blueprints/divi_test/divi_test_views.py b/src/flask_covid19/blueprints/divi_test/divi_test_views.py
index 5bc85130..c0b9cf07 100644
--- a/src/flask_covid19/blueprints/divi_test/divi_test_views.py
+++ b/src/flask_covid19/blueprints/divi_test/divi_test_views.py
@@ -4,9 +4,9 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from flask_covid19 import divi_service
-from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_all.all_services import divi_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 DiviImport
from flask_covid19 import DiviData
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service.py b/src/flask_covid19/blueprints/ecdc/ecdc_service.py
index bcedfa24..19d157a1 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service.py
@@ -1,6 +1,6 @@
from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+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
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py b/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
index 734674ef..bbe88482 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
@@ -2,7 +2,7 @@ import csv
import psycopg2
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import EcdcDateReported
from flask_covid19 import EcdcImport
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py b/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
index aa040927..fdaa8d8d 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
@@ -1,5 +1,5 @@
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import EcdcImport
from flask_covid19 import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
index f32728bf..8aa83048 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
@@ -4,13 +4,12 @@ from celery.utils.log import get_task_logger
from flask_admin.contrib.sqla import ModelView
from database import admin, db
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import ecdc_service
+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 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
app_ecdc = Blueprint('ecdc', __name__, template_folder='templates', url_prefix='/ecdc')
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 a3522388..56de2f8d 100644
--- a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py
+++ b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py
@@ -1,5 +1,5 @@
from database import app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import EcdcDateReported, EcdcData
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 93a74f17..ebc01f8f 100644
--- a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py
+++ b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py
@@ -4,12 +4,9 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import rki_service, rki_vaccination_service
-from flask_covid19 import ecdc_service, divi_service
-from flask_covid19 import app_admin_service, app_user_service
-from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+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
diff --git a/src/flask_covid19/blueprints/owid/owid_service.py b/src/flask_covid19/blueprints/owid/owid_service.py
index 3e3026fe..7bc458f7 100644
--- a/src/flask_covid19/blueprints/owid/owid_service.py
+++ b/src/flask_covid19/blueprints/owid/owid_service.py
@@ -1,9 +1,8 @@
from flask import flash
from database import app
-
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+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
diff --git a/src/flask_covid19/blueprints/owid/owid_service_import.py b/src/flask_covid19/blueprints/owid/owid_service_import.py
index 29020bc3..8633efd1 100644
--- a/src/flask_covid19/blueprints/owid/owid_service_import.py
+++ b/src/flask_covid19/blueprints/owid/owid_service_import.py
@@ -1,7 +1,7 @@
import csv
import psycopg2
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import OwidDateReported
from flask_covid19 import OwidImport
diff --git a/src/flask_covid19/blueprints/owid/owid_service_update.py b/src/flask_covid19/blueprints/owid/owid_service_update.py
index 1d1c4980..b2582920 100644
--- a/src/flask_covid19/blueprints/owid/owid_service_update.py
+++ b/src/flask_covid19/blueprints/owid/owid_service_update.py
@@ -1,5 +1,5 @@
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
from flask_covid19 import OwidImport
diff --git a/src/flask_covid19/blueprints/owid/owid_views.py b/src/flask_covid19/blueprints/owid/owid_views.py
index b9302b97..66e53d1b 100644
--- a/src/flask_covid19/blueprints/owid/owid_views.py
+++ b/src/flask_covid19/blueprints/owid/owid_views.py
@@ -5,12 +5,9 @@ from celery.utils.log import get_task_logger
from flask_admin.contrib.sqla import ModelView
from database import app, admin, db
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import rki_service, rki_vaccination_service
-from flask_covid19 import ecdc_service, divi_service
-from flask_covid19 import app_admin_service, app_user_service
+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 ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
from flask_covid19 import OwidImport
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 8cbddfa1..2e725ea5 100644
--- a/src/flask_covid19/blueprints/owid_test/owid_test_service.py
+++ b/src/flask_covid19/blueprints/owid_test/owid_test_service.py
@@ -1,5 +1,5 @@
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
from flask_covid19 import OwidImport
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 eb7e44f9..4fae00e8 100644
--- a/src/flask_covid19/blueprints/owid_test/owid_test_views.py
+++ b/src/flask_covid19/blueprints/owid_test/owid_test_views.py
@@ -4,14 +4,11 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import rki_service, rki_vaccination_service
-from flask_covid19 import ecdc_service, divi_service
-from flask_covid19 import app_admin_service, app_user_service
-from flask_covid19 import celery
+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 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
from flask_covid19.blueprints.owid_test import OwidTestService
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_service.py b/src/flask_covid19/blueprints/rki_cases/rki_service.py
index 16a767ce..ab713def 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service.py
@@ -1,8 +1,8 @@
from flask import flash
from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+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
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 e40e9461..6914fc09 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service_import.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service_import.py
@@ -2,7 +2,7 @@ import csv
import psycopg2
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import RkiImport
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 8f72ccf5..a68c83d2 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service_update.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service_update.py
@@ -1,6 +1,6 @@
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import RkiData, RkiMeldedatum
from flask_covid19 import RkiImport
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_views.py b/src/flask_covid19/blueprints/rki_cases/rki_views.py
index 48fc58b0..7b224760 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_views.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_views.py
@@ -5,13 +5,10 @@ from celery import states
from database import app, admin, db
from flask_covid19.blueprints.app_mq.application_workers import celery
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import rki_service, rki_vaccination_service
-from flask_covid19 import ecdc_service, divi_service
-from flask_covid19 import app_admin_service, app_user_service
+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 import ApplicationPage
+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 f6084f34..fba73417 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,5 +1,5 @@
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import RkiData, RkiDateReported, RkiCountryRegion, RkiCountry
from flask_covid19 import RkiImport
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 28b780aa..03dbe134 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
@@ -5,11 +5,11 @@ from flask_login import login_required
from database import app, db
-from flask_covid19 import rki_service
-from flask_covid19 import celery
+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 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
from flask_covid19.blueprints.owid_test import OwidTestService
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 8a778a20..b9a0bf5c 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py
@@ -1,8 +1,8 @@
from flask import flash
from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+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
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 bdb5cdea..ce5bf42a 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
@@ -2,10 +2,10 @@ import csv
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 import ApplicationServiceConfig
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 378595bc..689f2741 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,6 +1,6 @@
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import RkiVaccinationImport
from flask_covid19 import RkiVaccinationDateReported, RkiVaccinationData
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 ff67dc8a..85147e02 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
@@ -4,15 +4,12 @@ from celery.utils.log import get_task_logger
from flask_admin.contrib.sqla import ModelView
from database import admin, db
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import rki_service, rki_vaccination_service
-from flask_covid19 import ecdc_service, divi_service
-from flask_covid19 import app_admin_service, app_user_service
+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 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
app_rki_vaccination = Blueprint('rki_vaccination', __name__, template_folder='templates', url_prefix='/rki/vaccination')
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 b2301214..aee9c222 100644
--- a/src/flask_covid19/blueprints/who_test/who_test_service.py
+++ b/src/flask_covid19/blueprints/who_test/who_test_service.py
@@ -1,5 +1,5 @@
from database import app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
from flask_covid19 import WhoDateReported, WhoData
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 925eaf84..8a84d0f9 100644
--- a/src/flask_covid19/blueprints/who_test/who_test_views.py
+++ b/src/flask_covid19/blueprints/who_test/who_test_views.py
@@ -4,9 +4,9 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from flask_covid19 import who_service
-from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+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
--
GitLab