From ca0153bffc4bb3f741c0229a8a29509f1b259461 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 3 May 2020 10:28:49 +0200
Subject: [PATCH] api: refactoring

---
 api/RoadmapAPIServer.py             | 8 ++++----
 api/blueprints/MilestoneAPI.py      | 4 ++--
 api/blueprints/RoadmapAPI.py        | 5 ++---
 api/blueprints/SubTaskAPI.py        | 2 +-
 api/blueprints/TaskAPI.py           | 2 +-
 api/{ => logic}/Constants.py        | 0
 api/{ => logic}/Database.py         | 0
 api/{ => logic}/DateFormatter.py    | 0
 api/{ => logic}/RequestValidator.py | 0
 api/{ => logic}/UserService.py      | 0
 api/logic/__init__.py               | 0
 client/RoadmapClient.py             | 2 +-
 12 files changed, 11 insertions(+), 12 deletions(-)
 rename api/{ => logic}/Constants.py (100%)
 rename api/{ => logic}/Database.py (100%)
 rename api/{ => logic}/DateFormatter.py (100%)
 rename api/{ => logic}/RequestValidator.py (100%)
 rename api/{ => logic}/UserService.py (100%)
 create mode 100644 api/logic/__init__.py

diff --git a/api/RoadmapAPIServer.py b/api/RoadmapAPIServer.py
index c27fabc..8d3da52 100644
--- a/api/RoadmapAPIServer.py
+++ b/api/RoadmapAPIServer.py
@@ -10,10 +10,10 @@ from flask_jwt_extended import (
     JWTManager, create_access_token
 )
 
-import Constants
-from Database import Database
-from RequestValidator import RequestValidator, ValidationError
-from UserService import UserService
+from logic import Constants
+from logic.Database import Database
+from logic.RequestValidator import RequestValidator, ValidationError
+from logic.UserService import UserService
 from blueprints import SubTaskAPI, MilestoneAPI, TaskAPI, RoadmapAPI
 
 LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
diff --git a/api/blueprints/MilestoneAPI.py b/api/blueprints/MilestoneAPI.py
index 5cbf5c7..e22ad8d 100644
--- a/api/blueprints/MilestoneAPI.py
+++ b/api/blueprints/MilestoneAPI.py
@@ -3,8 +3,8 @@ from enum import Enum
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
 
-from DateFormatter import DateFormatter
-from RequestValidator import RequestValidator, ValidationError
+from logic.DateFormatter import DateFormatter
+from logic.RequestValidator import RequestValidator, ValidationError
 from blueprints.SubTaskAPI import SubTaskParameters
 from blueprints.TaskAPI import TaskParameters
 
diff --git a/api/blueprints/RoadmapAPI.py b/api/blueprints/RoadmapAPI.py
index 9700411..c803acc 100644
--- a/api/blueprints/RoadmapAPI.py
+++ b/api/blueprints/RoadmapAPI.py
@@ -1,11 +1,10 @@
-from datetime import datetime, date
 from enum import Enum
 
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
 
-from DateFormatter import DateFormatter
-from RequestValidator import RequestValidator, ValidationError
+from logic.DateFormatter import DateFormatter
+from logic.RequestValidator import RequestValidator, ValidationError
 
 
 class RoadmapParameters(Enum):
diff --git a/api/blueprints/SubTaskAPI.py b/api/blueprints/SubTaskAPI.py
index 895170e..094f1c7 100644
--- a/api/blueprints/SubTaskAPI.py
+++ b/api/blueprints/SubTaskAPI.py
@@ -3,7 +3,7 @@ from enum import Enum
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
 
-from RequestValidator import RequestValidator, ValidationError
+from logic.RequestValidator import RequestValidator, ValidationError
 
 
 class SubTaskParameters(Enum):
diff --git a/api/blueprints/TaskAPI.py b/api/blueprints/TaskAPI.py
index 49cf091..3bd552f 100644
--- a/api/blueprints/TaskAPI.py
+++ b/api/blueprints/TaskAPI.py
@@ -3,7 +3,7 @@ from enum import Enum
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
 
-from RequestValidator import RequestValidator, ValidationError
+from logic.RequestValidator import RequestValidator, ValidationError
 
 
 class TaskParameters(Enum):
diff --git a/api/Constants.py b/api/logic/Constants.py
similarity index 100%
rename from api/Constants.py
rename to api/logic/Constants.py
diff --git a/api/Database.py b/api/logic/Database.py
similarity index 100%
rename from api/Database.py
rename to api/logic/Database.py
diff --git a/api/DateFormatter.py b/api/logic/DateFormatter.py
similarity index 100%
rename from api/DateFormatter.py
rename to api/logic/DateFormatter.py
diff --git a/api/RequestValidator.py b/api/logic/RequestValidator.py
similarity index 100%
rename from api/RequestValidator.py
rename to api/logic/RequestValidator.py
diff --git a/api/UserService.py b/api/logic/UserService.py
similarity index 100%
rename from api/UserService.py
rename to api/logic/UserService.py
diff --git a/api/logic/__init__.py b/api/logic/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/client/RoadmapClient.py b/client/RoadmapClient.py
index 71a3672..9c982ad 100644
--- a/client/RoadmapClient.py
+++ b/client/RoadmapClient.py
@@ -7,7 +7,7 @@ from TheCodeLabs_BaseUtils import DefaultLogger
 from TheCodeLabs_FlaskUtils import FlaskBaseApp
 from flask import render_template, redirect
 
-import Constants
+from logic import Constants
 from Localization import LOCALIZATION
 from UrlBuilder import UrlBuilder
 from blueprints import Roadmaps, Authentication, Milestones, Tasks, SubTasks
-- 
GitLab