From b863ed71d81e854772b8c956483a13d9c315b99e Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Fri, 25 Sep 2020 12:37:38 +0200
Subject: [PATCH] refactoring
---
src/blueprints/Devices.py | 2 +-
src/blueprints/Measurements.py | 2 +-
src/blueprints/Sensors.py | 2 +-
src/logic/{ => database}/Database.py | 8 +++-----
src/logic/{ => database}/DatabaseAccess.py | 0
src/logic/{ => database}/DeviceAccess.py | 2 +-
src/logic/{ => database}/MeasurementAccess.py | 2 +-
src/logic/{ => database}/SensorAccess.py | 2 +-
src/logic/database/__init__.py | 0
9 files changed, 9 insertions(+), 11 deletions(-)
rename src/logic/{ => database}/Database.py (79%)
rename src/logic/{ => database}/DatabaseAccess.py (100%)
rename src/logic/{ => database}/DeviceAccess.py (94%)
rename src/logic/{ => database}/MeasurementAccess.py (97%)
rename src/logic/{ => database}/SensorAccess.py (96%)
create mode 100644 src/logic/database/__init__.py
diff --git a/src/blueprints/Devices.py b/src/blueprints/Devices.py
index 370884e..4b8520d 100644
--- a/src/blueprints/Devices.py
+++ b/src/blueprints/Devices.py
@@ -1,6 +1,6 @@
from flask import Blueprint, jsonify
-from logic.Database import Database
+from logic.database.Database import Database
def construct_blueprint(settings):
diff --git a/src/blueprints/Measurements.py b/src/blueprints/Measurements.py
index fe9cae4..932d9fa 100644
--- a/src/blueprints/Measurements.py
+++ b/src/blueprints/Measurements.py
@@ -3,7 +3,7 @@ from typing import Dict
from flask import Blueprint, jsonify, request
from logic.AuthenticationWrapper import require_api_key
-from logic.Database import Database
+from logic.database.Database import Database
from logic.Parameters import DeviceParameters, SensorParameters
from logic.RequestValidator import RequestValidator, ValidationError
diff --git a/src/blueprints/Sensors.py b/src/blueprints/Sensors.py
index 34cff35..e9e9f97 100644
--- a/src/blueprints/Sensors.py
+++ b/src/blueprints/Sensors.py
@@ -1,6 +1,6 @@
from flask import Blueprint, jsonify
-from logic.Database import Database
+from logic.database.Database import Database
def construct_blueprint(settings):
diff --git a/src/logic/Database.py b/src/logic/database/Database.py
similarity index 79%
rename from src/logic/Database.py
rename to src/logic/database/Database.py
index 2951ce2..f1cd645 100644
--- a/src/logic/Database.py
+++ b/src/logic/database/Database.py
@@ -1,11 +1,9 @@
-from enum import Enum
-
from TheCodeLabs_BaseUtils import DefaultLogger
from logic import Constants
-from logic.DeviceAccess import DeviceAccess
-from logic.MeasurementAccess import MeasurementAccess
-from logic.SensorAccess import SensorAccess
+from logic.database.DeviceAccess import DeviceAccess
+from logic.database.MeasurementAccess import MeasurementAccess
+from logic.database.SensorAccess import SensorAccess
LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
diff --git a/src/logic/DatabaseAccess.py b/src/logic/database/DatabaseAccess.py
similarity index 100%
rename from src/logic/DatabaseAccess.py
rename to src/logic/database/DatabaseAccess.py
diff --git a/src/logic/DeviceAccess.py b/src/logic/database/DeviceAccess.py
similarity index 94%
rename from src/logic/DeviceAccess.py
rename to src/logic/database/DeviceAccess.py
index 8be7f86..f42517e 100644
--- a/src/logic/DeviceAccess.py
+++ b/src/logic/database/DeviceAccess.py
@@ -3,7 +3,7 @@ from typing import Dict, List
from TheCodeLabs_BaseUtils import DefaultLogger
from logic import Constants
-from logic.DatabaseAccess import DatabaseAccess, FetchType
+from logic.database.DatabaseAccess import DatabaseAccess, FetchType
LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
diff --git a/src/logic/MeasurementAccess.py b/src/logic/database/MeasurementAccess.py
similarity index 97%
rename from src/logic/MeasurementAccess.py
rename to src/logic/database/MeasurementAccess.py
index d156a3c..0ff97c5 100644
--- a/src/logic/MeasurementAccess.py
+++ b/src/logic/database/MeasurementAccess.py
@@ -4,7 +4,7 @@ from typing import Dict, List
from TheCodeLabs_BaseUtils import DefaultLogger
from logic import Constants
-from logic.DatabaseAccess import DatabaseAccess, FetchType
+from logic.database.DatabaseAccess import DatabaseAccess, FetchType
LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
diff --git a/src/logic/SensorAccess.py b/src/logic/database/SensorAccess.py
similarity index 96%
rename from src/logic/SensorAccess.py
rename to src/logic/database/SensorAccess.py
index 59cedfd..68b3f90 100644
--- a/src/logic/SensorAccess.py
+++ b/src/logic/database/SensorAccess.py
@@ -3,7 +3,7 @@ from typing import Dict, List
from TheCodeLabs_BaseUtils import DefaultLogger
from logic import Constants
-from logic.DatabaseAccess import DatabaseAccess, FetchType
+from logic.database.DatabaseAccess import DatabaseAccess, FetchType
LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
diff --git a/src/logic/database/__init__.py b/src/logic/database/__init__.py
new file mode 100644
index 0000000..e69de29
--
GitLab