modify mqtt api
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2020-07-26 17:45:19 +02:00
parent 08f652d189
commit 040c9f2399
3 changed files with 69 additions and 26 deletions

View File

@@ -21,7 +21,7 @@ LOGGER = logging.getLogger(__name__)
class AllDevicesResource(Resource):
"""
Query and control all known devices
Query all known devices
"""
alldeviceschema = schemas.DeviceSchema(many=True)
@@ -33,25 +33,29 @@ class AllDevicesResource(Resource):
alldevices = models.Device.query.all()
return self.alldeviceschema.dump(list(alldevices)), 200
def delete(self):
class AllDevicesOfflineResource(Resource):
"""
Shut down all devices
"""
def post(self):
"""
Shut down every device
:return:
"""
query_ids = db.session.query(models.Device.id).filter(models.Device.status != models.DeviceStatusEnum.offline)
ids = [value for value, in query_ids]
for d_id in ids:
mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": d_id, "command": "offline"})
mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/+", {"command": "offline"})
class AllDevicesOnlineResource(Resource):
"""
Bring every device online
"""
def post(self):
"""
Bring every device online
:return:
"""
query_ids = db.session.query(models.Device.id).filter(models.Device.status != models.DeviceStatusEnum.online)
ids = [value for value, in query_ids]
for d_id in ids:
mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": d_id, "command": "online"})
mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/+", {"command": "online"})
class DeviceResource(Resource):
@@ -69,15 +73,25 @@ class DeviceResource(Resource):
device = models.Device.query.filter_by(id=deviceid).first_or_404()
return self.deviceschema.dump(device), 200
def delete(self, deviceid: str):
class DeviceOfflineResrouce(Resource):
"""
Bring a device offline
"""
def post(self, deviceid: str):
"""
Shut down a device
:param deviceid: UUID of device
:return:
"""
device = db.session.query(models.Device.id).filter(str(models.Device.id) == deviceid).first_or_404()[0]
mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": device, "command": "offline"})
mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{device}", {"command": "offline"})
class DeviceOnlineResrouce(Resource):
"""
Bring a device online
"""
def post(self, deviceid: str):
"""
Bring a device online
@@ -85,7 +99,7 @@ class DeviceResource(Resource):
:return:
"""
device = db.session.query(models.Device.id).filter(str(models.Device.id) == deviceid).first_or_404()[0]
mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": device, "command": "offline"})
mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{device}", {"command": "online"})
class SensorResource(Resource):
@@ -104,7 +118,12 @@ class SensorResource(Resource):
sensor = models.Sensor.query.filter_by(device_id=deviceid, sensorid=sensorid).first_or_404()
return self.sensorschema.dump(sensor)
def delete(self, deviceid: str, sensorid: str):
class SensorOfflineResource(Resource):
"""
Bring a sensor offline
"""
def post(self, deviceid: str, sensorid: str):
"""
Shut down a sensor of a device
:param deviceid: UUID of device
@@ -113,8 +132,13 @@ class SensorResource(Resource):
"""
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(config.MQTT_COMMAND_TOPIC, {"deviceID": sensor[0], "sensorID": sensor[1], "command": "offline"})
mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{sensor[0]}/{sensor[1]}", {"command": "offline"})
class SensorOnlineResource(Resource):
"""
Bring a sensor online
"""
def post(self, deviceid: str, sensorid: str):
"""
Bring a sensor online
@@ -124,4 +148,4 @@ class SensorResource(Resource):
"""
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(config.MQTT_COMMAND_TOPIC, {"deviceID": sensor[0], "sensorID": sensor[1], "command": "online"})
mqtt.publish(f"{config.MQTT_COMMAND_TOPIC}/{sensor[0]}/{sensor[1]}", {"command": "online"})