externalized device routes

src/StorageLeaf.py

@@ -3,7 +3,7 @@ import os
 from TheCodeLabs_BaseUtils.DefaultLogger import DefaultLogger
 from TheCodeLabs_FlaskUtils.FlaskBaseApp import FlaskBaseApp
 
-from blueprints import Routes
+from blueprints import Routes, Devices
 from logic import Constants
 
 LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
@@ -15,6 +15,8 @@ class StorageLeaf(FlaskBaseApp):
 
     def _register_blueprints(self, app):
         app.register_blueprint(Routes.construct_blueprint(self._settings, self._version))
+        app.register_blueprint(Devices.construct_blueprint(self._settings))
+
         return app
 
 

src/blueprints/Devices.py

+from enum import Enum
+
+from flask import Blueprint, jsonify
+
+from logic.Database import Database
+
+
+class DeviceParameters(Enum):
+    DEVICE = 'device'
+    SENSORS = 'sensors'
+
+    @staticmethod
+    def get_values():
+        return [m.value for m in DeviceParameters]
+
+
+def construct_blueprint(settings):
+    devices = Blueprint('devices', __name__)
+
+    @devices.route('/devices', methods=['GET'])
+    def get_all_devices():
+        database = Database(settings['database']['databasePath'])
+        return jsonify(database.deviceAccess.get_all_devices())
+
+    @devices.route('/device/<int:deviceID>', methods=['GET'])
+    def get_device(deviceID):
+        database = Database(settings['database']['databasePath'])
+        return jsonify(database.deviceAccess.get_device(deviceID))
+
+    @devices.route('/device/<int:deviceID>/sensors/', methods=['GET'])
+    def get_all_sensors_for_device(deviceID):
+        database = Database(settings['database']['databasePath'])
+        device = database.deviceAccess.get_device(deviceID)
+        if not device:
+            return jsonify({'success': False, 'msg': f'No device with id "{deviceID}" existing'})
+
+        return jsonify(database.sensorAccess.get_all_sensors_for_device(deviceID))
+
+    return devices

src/blueprints/Routes.py

@@ -48,16 +48,6 @@ def construct_blueprint(settings, version):
                                appName=Constants.APP_NAME,
                                openApiSpecification=specification)
 
-    @routes.route('/devices', methods=['GET'])
-    def get_all_devices():
-        database = Database(settings['database']['databasePath'])
-        return jsonify(database.deviceAccess.get_all_devices())
-
-    @routes.route('/device/<int:deviceID>', methods=['GET'])
-    def get_device(deviceID):
-        database = Database(settings['database']['databasePath'])
-        return jsonify(database.deviceAccess.get_device(deviceID))
-
     @routes.route('/sensors', methods=['GET'])
     def get_all_sensors():
         database = Database(settings['database']['databasePath'])
@@ -68,15 +58,6 @@ def construct_blueprint(settings, version):
         database = Database(settings['database']['databasePath'])
         return jsonify(database.sensorAccess.get_sensor(sensorID))
 
-    @routes.route('/device/<int:deviceID>/sensors/', methods=['GET'])
-    def get_all_sensors_for_device(deviceID):
-        database = Database(settings['database']['databasePath'])
-        device = database.deviceAccess.get_device(deviceID)
-        if not device:
-            return jsonify({'success': False, 'msg': f'No device with id "{deviceID}" existing'})
-
-        return jsonify(database.sensorAccess.get_all_sensors_for_device(deviceID))
-
     @routes.route('/measurements', methods=['GET'])
     def get_all_measurements():
         database = Database(settings['database']['databasePath'])