remove state capabilities

src/resources.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python3
 from flask_restful import Resource
-from db import db
 from mqtt_flask_instance import mqtt
 import config
-import models
-import schemas
 
 """
 Flask Restful endpoints
@@ -16,21 +13,6 @@ __module_name__ = "resources"
 __version__text__ = "1"
 
 
-class AllDevicesResource(Resource):
-    """
-    Query all known devices
-    """
-    alldeviceschema = schemas.DeviceSchema(many=True)
-
-    def get(self):
-        """
-        Get all stored items
-        :return:
-        """
-        alldevices = models.Device.query.all()
-        return self.alldeviceschema.dump(list(alldevices)), 200
-
-
 class AllDevicesOfflineResource(Resource):
     """
     Shut down all devices
@@ -55,22 +37,6 @@ class AllDevicesOnlineResource(Resource):
         mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/+", {"command": "online"})
 
 
-class DeviceResource(Resource):
-    """
-    Query and control a particular device
-    """
-    deviceschema = schemas.DeviceSchema(many=False)
-
-    def get(self, deviceid: str):
-        """
-        Query a device
-        :param deviceid: UUID of device
-        :return:
-        """
-        device = models.Device.query.filter_by(id=deviceid).first_or_404()
-        return self.deviceschema.dump(device), 200
-
-
 class DeviceOfflineResrouce(Resource):
     """
     Bring a device offline
@@ -78,11 +44,10 @@ class DeviceOfflineResrouce(Resource):
     def post(self, deviceid: str):
         """
         Shut down a device
-        :param deviceid: UUID of device
+        :param deviceid: ID of device
         :return:
         """
-        device = db.session.query(models.Device.id).filter(str(models.Device.id) == deviceid).first_or_404()[0]
-        mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{device}", {"command": "offline"})
+        mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{deviceid}", {"command": "offline"})
 
 
 class DeviceOnlineResrouce(Resource):
@@ -92,28 +57,10 @@ class DeviceOnlineResrouce(Resource):
     def post(self, deviceid: str):
         """
         Bring a device online
-        :param deviceid: UUID of device
+        :param deviceid: ID of device
         :return:
         """
-        device = db.session.query(models.Device.id).filter(str(models.Device.id) == deviceid).first_or_404()[0]
-        mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{device}", {"command": "online"})
-
-
-class SensorResource(Resource):
-    """
-    Query and control a particular sensor of a device
-    """
-    sensorschema = schemas.SensorSchema(many=False)
-
-    def get(self, deviceid: str, sensorid: str):
-        """
-        Query a sensor
-        :param deviceid: UUID of device
-        :param sensorid: UUID of sensor
-        :return:
-        """
-        sensor = models.Sensor.query.filter_by(device_id=deviceid, sensorid=sensorid).first_or_404()
-        return self.sensorschema.dump(sensor)
+        mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{deviceid}", {"command": "online"})
 
 
 class SensorOfflineResource(Resource):
@@ -123,13 +70,11 @@ class SensorOfflineResource(Resource):
     def post(self, deviceid: str, sensorid: str):
         """
         Shut down a sensor of a device
-        :param deviceid: UUID of device
-        :param sensorid: UUID of sensor
+        :param deviceid: ID of device
+        :param sensorid: ID of sensor
         :return:
         """
-        sensor = db.session.query(models.Sensor.device_id, models.Sensor.id).filter(
-            str(models.Sensor.device_id) == deviceid and str(models.Sensor.id) == sensorid).first_or_404()
-        mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{sensor[0]}/{sensor[1]}", {"command": "offline"})
+        mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{deviceid}/{sensorid}", {"command": "offline"})
 
 
 class SensorOnlineResource(Resource):
@@ -139,10 +84,8 @@ class SensorOnlineResource(Resource):
     def post(self, deviceid: str, sensorid: str):
         """
         Bring a sensor online
-        :param deviceid: UUID of device
-        :param sensorid: UUID of sensor
+        :param deviceid: ID of device
+        :param sensorid: ID of sensor
         :return:
         """
-        sensor = db.session.query(models.Sensor.device_id, models.Sensor.id).filter(
-            str(models.Sensor.device_id) == deviceid and str(models.Sensor.id) == sensorid).first_or_404()
-        mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{sensor[0]}/{sensor[1]}", {"command": "online"})
+        mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{deviceid}/{sensorid}", {"command": "online"})