From 05a266dde981ce50eeaca0372eca4e29a528bb84 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 20 May 2021 06:45:52 +0200
Subject: [PATCH] Refactoring: rename covid19 to flask_covid19
---
src/flask_covid19/__init__.py | 4 +--
.../blueprints/app_admin/app_admin_views.py | 10 +++----
.../blueprints/app_all/all_service.py | 12 ++++----
.../blueprints/app_all/all_service_config.py | 12 ++++----
.../app_all/all_service_download.py | 2 +-
.../blueprints/app_all/all_services.py | 18 +++++------
.../blueprints/app_all/all_views.py | 10 +++----
.../app_application/application_views.py | 30 +++++++++----------
src/flask_covid19/blueprints/who/who_model.py | 2 +-
.../blueprints/who/who_model_import.py | 1 +
.../blueprints/who/who_service.py | 8 ++---
.../blueprints/who/who_service_import.py | 6 ++--
.../blueprints/who/who_service_update.py | 6 ++--
src/flask_covid19/blueprints/who/who_views.py | 8 ++---
14 files changed, 65 insertions(+), 64 deletions(-)
diff --git a/src/flask_covid19/__init__.py b/src/flask_covid19/__init__.py
index c5688473..a1ae0839 100644
--- a/src/flask_covid19/__init__.py
+++ b/src/flask_covid19/__init__.py
@@ -1,8 +1,8 @@
from database import app, run_run_with_debug, port, db
import flask_covid19.blueprints.app_application.application_views
-from flask_covid19 import app_user_service
-from flask_covid19 import ApplicationService
+from flask_covid19.blueprints.app_all.all_services import app_user_service
+from flask_covid19.blueprints.app_application.application_service import ApplicationService
def run_web():
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 f76d1209..51d11777 100644
--- a/src/flask_covid19/blueprints/app_admin/app_admin_views.py
+++ b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
@@ -3,12 +3,12 @@ from celery import states
from celery.utils.log import get_task_logger
from database import app
-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 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 import celery
-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/app_all/all_service.py b/src/flask_covid19/blueprints/app_all/all_service.py
index 2faae911..a1aa0d6c 100644
--- a/src/flask_covid19/blueprints/app_all/all_service.py
+++ b/src/flask_covid19/blueprints/app_all/all_service.py
@@ -1,11 +1,11 @@
from database import app
-from flask_covid19 import EcdcService
-from flask_covid19 import OwidService
-from flask_covid19 import RkiVaccinationService
-from flask_covid19 import WhoService
-from flask_covid19 import DiviService
-from flask_covid19 import RkiService
+from flask_covid19.blueprints.ecdc.ecdc_service import EcdcService
+from flask_covid19.blueprints.owid.owid_service import OwidService
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_service import RkiVaccinationService
+from flask_covid19.blueprints.who.who_service import WhoService
+from flask_covid19.blueprints.divi.divi_service import DiviService
+from flask_covid19.blueprints.rki_cases.rki_service import RkiService
class AllService:
diff --git a/src/flask_covid19/blueprints/app_all/all_service_config.py b/src/flask_covid19/blueprints/app_all/all_service_config.py
index 57671edc..8e7d273a 100644
--- a/src/flask_covid19/blueprints/app_all/all_service_config.py
+++ b/src/flask_covid19/blueprints/app_all/all_service_config.py
@@ -1,10 +1,10 @@
import os
-from flask_covid19 import EcdcImport
-from flask_covid19 import WhoImport
-from flask_covid19 import RkiVaccinationImport
-from flask_covid19 import OwidImport
-from flask_covid19 import RkiImport
-from flask_covid19 import DiviImport
+from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
+from flask_covid19.blueprints.who.who_service_import import WhoImport
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
+from flask_covid19.blueprints.owid.owid_model_import import OwidImport
+from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
+from flask_covid19.blueprints.divi.divi_model_import import DiviImport
class ApplicationServiceConfig:
diff --git a/src/flask_covid19/blueprints/app_all/all_service_download.py b/src/flask_covid19/blueprints/app_all/all_service_download.py
index f0974b9e..7d2d1d95 100644
--- a/src/flask_covid19/blueprints/app_all/all_service_download.py
+++ b/src/flask_covid19/blueprints/app_all/all_service_download.py
@@ -2,7 +2,7 @@ import os
import wget
import subprocess
from database import app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
class ApplicationServiceDownload:
diff --git a/src/flask_covid19/blueprints/app_all/all_services.py b/src/flask_covid19/blueprints/app_all/all_services.py
index 0f62f722..0caffeb0 100644
--- a/src/flask_covid19/blueprints/app_all/all_services.py
+++ b/src/flask_covid19/blueprints/app_all/all_services.py
@@ -1,14 +1,14 @@
from database import db
-from flask_covid19 import AdminService
-from flask_covid19 import AllService
-from flask_covid19 import UserService
-from flask_covid19 import EcdcService
-from flask_covid19 import OwidService
-from flask_covid19 import RkiVaccinationService
-from flask_covid19 import WhoService
-from flask_covid19 import DiviService
-from flask_covid19 import RkiService
+from flask_covid19.blueprints.app_admin.app_admin_service import AdminService
+from flask_covid19.blueprints.app_all.all_service import AllService
+from flask_covid19.blueprints.app_user.user_service import UserService
+from flask_covid19.blueprints.ecdc.ecdc_service import EcdcService
+from flask_covid19.blueprints.owid.owid_service import OwidService
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_service import RkiVaccinationService
+from flask_covid19.blueprints.who.who_service import WhoService
+from flask_covid19.blueprints.divi.divi_service import DiviService
+from flask_covid19.blueprints.rki_cases.rki_service import RkiService
############################################################################################
#
diff --git a/src/flask_covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py
index ee63dce4..e926eb25 100644
--- a/src/flask_covid19/blueprints/app_all/all_views.py
+++ b/src/flask_covid19/blueprints/app_all/all_views.py
@@ -3,12 +3,12 @@ from celery import states
from celery.utils.log import get_task_logger
from database import app
-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, all_service
+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 import celery
-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/app_application/application_views.py b/src/flask_covid19/blueprints/app_application/application_views.py
index b6e7cf96..c2ed1acf 100644
--- a/src/flask_covid19/blueprints/app_application/application_views.py
+++ b/src/flask_covid19/blueprints/app_application/application_views.py
@@ -1,25 +1,25 @@
from flask import render_template, redirect, url_for, Blueprint
from database import app
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
-from flask_covid19 import blueprint_app_user
-from flask_covid19 import blueprint_app_admin
-from flask_covid19 import blueprint_app_all
+from flask_covid19.blueprints.app_user.user_views import blueprint_app_user
+from flask_covid19.blueprints.app_admin.app_admin_views import blueprint_app_admin
+from flask_covid19.blueprints.app_all.all_views import blueprint_app_all
-from flask_covid19 import app_who
-from flask_covid19 import app_owid
-from flask_covid19 import app_ecdc
-from flask_covid19 import app_rki_vaccination
-from flask_covid19 import app_rki
-from flask_covid19 import app_divi
+from flask_covid19.blueprints.who.who_views import app_who
+from flask_covid19.blueprints.owid.owid_views import app_owid
+from flask_covid19.blueprints.ecdc.ecdc_views import app_ecdc
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_views import app_rki_vaccination
+from flask_covid19.blueprints.rki_cases.rki_views import app_rki
+from flask_covid19.blueprints.divi.divi_views import app_divi
-from flask_covid19 import app_who_test
-from flask_covid19.blueprints.owid_test import app_owid_test
-from flask_covid19 import app_ecdc_test
-from flask_covid19 import app_rki_test
-from flask_covid19 import app_divi_test
+from flask_covid19.blueprints.who_test.who_test_views import app_who_test
+from flask_covid19.blueprints.owid_test.owid_test_views import app_owid_test
+from flask_covid19.blueprints.ecdc_test.ecdc_test_views import app_ecdc_test
+from flask_covid19.blueprints.rki_cases_test.rki_test_views import app_rki_test
+from flask_covid19.blueprints.divi_test.divi_test_views import app_divi_test
blueprint_application = Blueprint('application', __name__, template_folder='templates', url_prefix='/')
diff --git a/src/flask_covid19/blueprints/who/who_model.py b/src/flask_covid19/blueprints/who/who_model.py
index 6b016cb7..5ce85f0b 100644
--- a/src/flask_covid19/blueprints/who/who_model.py
+++ b/src/flask_covid19/blueprints/who/who_model.py
@@ -2,7 +2,7 @@ from sqlalchemy import and_
from datetime import date
from sqlalchemy.orm import joinedload, subqueryload
from database import db, cache, ITEMS_PER_PAGE
-from flask_covid19 import ApplicationDateReported, ApplicationRegion
+from flask_covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion
class WhoDateReported(ApplicationDateReported):
diff --git a/src/flask_covid19/blueprints/who/who_model_import.py b/src/flask_covid19/blueprints/who/who_model_import.py
index 28bf4e5d..a8217130 100644
--- a/src/flask_covid19/blueprints/who/who_model_import.py
+++ b/src/flask_covid19/blueprints/who/who_model_import.py
@@ -1,6 +1,7 @@
from sqlalchemy.orm import Bundle
from database import db, ITEMS_PER_PAGE
+
class WhoImport(db.Model):
__tablename__ = 'application__import__who'
diff --git a/src/flask_covid19/blueprints/who/who_service.py b/src/flask_covid19/blueprints/who/who_service.py
index d9c63fca..c9c53021 100644
--- a/src/flask_covid19/blueprints/who/who_service.py
+++ b/src/flask_covid19/blueprints/who/who_service.py
@@ -1,10 +1,10 @@
from flask import flash
from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
-from flask_covid19 import WhoServiceImport
-from flask_covid19 import WhoServiceUpdate, WhoServiceUpdateFull
+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.blueprints.who.who_service_import import WhoServiceImport
+from flask_covid19.blueprints.who.who_service_update import WhoServiceUpdate, WhoServiceUpdateFull
class WhoService:
diff --git a/src/flask_covid19/blueprints/who/who_service_import.py b/src/flask_covid19/blueprints/who/who_service_import.py
index 6e30124c..20e474fa 100644
--- a/src/flask_covid19/blueprints/who/who_service_import.py
+++ b/src/flask_covid19/blueprints/who/who_service_import.py
@@ -2,9 +2,9 @@ import sys
import csv
import psycopg2
from database import db, app
-from flask_covid19 import WhoDateReported
-from flask_covid19 import WhoImport
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
+from flask_covid19.blueprints.who.who_model import WhoDateReported
+from flask_covid19.blueprints.who.who_model_import import WhoImport
class WhoServiceImport:
diff --git a/src/flask_covid19/blueprints/who/who_service_update.py b/src/flask_covid19/blueprints/who/who_service_update.py
index 26de9ba0..3ec71214 100644
--- a/src/flask_covid19/blueprints/who/who_service_update.py
+++ b/src/flask_covid19/blueprints/who/who_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import WhoCountryRegion, WhoDateReported, WhoCountry, WhoData
-from flask_covid19 import WhoImport
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
+from flask_covid19.blueprints.who.who_model import WhoCountryRegion, WhoDateReported, WhoCountry, WhoData
+from flask_covid19.blueprints.who.who_model_import import WhoImport
class WhoServiceUpdateBase:
diff --git a/src/flask_covid19/blueprints/who/who_views.py b/src/flask_covid19/blueprints/who/who_views.py
index ebda6358..1430f5e3 100644
--- a/src/flask_covid19/blueprints/who/who_views.py
+++ b/src/flask_covid19/blueprints/who/who_views.py
@@ -6,12 +6,12 @@ from flask_admin.contrib.sqla import ModelView
from flask_login import login_required
from database import app, admin, db
-from flask_covid19 import who_service
+from flask_covid19.blueprints.app_all.all_services import who_service
from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
-from flask_covid19 import WhoImport
-from flask_covid19 import WhoCountryRegion, WhoCountry, WhoDateReported, WhoData
+from flask_covid19.blueprints.who.who_model_import import WhoImport
+from flask_covid19.blueprints.who.who_model import WhoCountryRegion, WhoCountry, WhoDateReported, WhoData
app_who = Blueprint('who', __name__, template_folder='templates', url_prefix='/who')
--
GitLab