birbnetes/cnc-service
4
0
Fork 0
Code Pull Requests Releases Wiki Activity

fix touples
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Torma Kristóf
2020-07-20 18:26:49 +02:00
parent 422a7efa6f
commit 08f652d189
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/resources.py
View File

@@ -38,7 +38,8 @@ class AllDevicesResource(Resource):
Shut down every device Shut down every device
:return: :return:
""" """
ids = db.session.query(models.Device.id).filter(models.Device.status != models.DeviceStatusEnum.offline) 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: for d_id in ids:
mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": d_id, "command": "offline"}) mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": d_id, "command": "offline"})
@@ -47,7 +48,8 @@ class AllDevicesResource(Resource):
Bring every device online Bring every device online
:return: :return:
""" """
ids = db.session.query(models.Device.id).filter(models.Device.status != models.DeviceStatusEnum.online) 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: for d_id in ids:
mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": d_id, "command": "online"}) mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": d_id, "command": "online"})
@@ -73,7 +75,7 @@ class DeviceResource(Resource):
:param deviceid: UUID of device :param deviceid: UUID of device
:return: :return:
""" """
device = db.session.query(models.Device.id).filter(str(models.Device.id) == deviceid).first() 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(config.MQTT_COMMAND_TOPIC, {"deviceID": device, "command": "offline"})
def post(self, deviceid: str): def post(self, deviceid: str):
@@ -82,7 +84,7 @@ class DeviceResource(Resource):
:param deviceid: UUID of device :param deviceid: UUID of device
:return: :return:
""" """
device = db.session.query(models.Device.id).filter(str(models.Device.id) == deviceid).first() 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(config.MQTT_COMMAND_TOPIC, {"deviceID": device, "command": "offline"})
@@ -110,8 +112,8 @@ class SensorResource(Resource):
:return: :return:
""" """
sensor = db.session.query(models.Sensor.device_id, models.Sensor.id).filter( sensor = db.session.query(models.Sensor.device_id, models.Sensor.id).filter(
str(models.Sensor.device_id) == deviceid & & str(models.Sensor.id) == sensorid) str(models.Sensor.device_id) == deviceid and str(models.Sensor.id) == sensorid).first_or_404()
mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": sensor, "sensorID": sensor, "command": "offline"}) mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": sensor[0], "sensorID": sensor[1], "command": "offline"})
def post(self, deviceid: str, sensorid: str): def post(self, deviceid: str, sensorid: str):
""" """
@@ -121,5 +123,5 @@ class SensorResource(Resource):
:return: :return:
""" """
sensor = db.session.query(models.Sensor.device_id, models.Sensor.id).filter( sensor = db.session.query(models.Sensor.device_id, models.Sensor.id).filter(
str(models.Sensor.device_id) == deviceid & & str(models.Sensor.id) == sensorid) str(models.Sensor.device_id) == deviceid and str(models.Sensor.id) == sensorid).first_or_404()
mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": sensor, "sensorID": sensor, "command": "online"}) mqtt.publish(config.MQTT_COMMAND_TOPIC, {"deviceID": sensor[0], "sensorID": sensor[1], "command": "online"})