modify mqtt api

src/mqtt_methods.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 import logging
 from mqtt_flask_instance import mqtt
+import config
 from db import db
-from schemas import DeviceSchema
+from schemas import DeviceSchema, SensorSchema
 
 """
 MQTT Stuff
@@ -14,7 +15,7 @@ __module_name__ = "mqtt_methods"
 __version__text__ = "1"
 
 deviceschema = DeviceSchema(many=False)
-
+sensorschema = SensorSchema(many=False)
 
 LOGGER = logging.getLogger(__name__)
 
@@ -26,9 +27,19 @@ def handle_status_message(client, userdata, message):
         payload=message.payload.decode()
     )
     try:
-        status_message = deviceschema.load(data['payload'], session=db.session, transient=True).data
-        LOGGER.info(f"Recieved status message from {data['payload']['id']}, persisting to db.")
-        db.session.merge(status_message)
+        ids = data['topic'].replace(f"{config.MQTT_STATUS_TOPIC}/", "").split("/")
+        if len(ids) == 1:
+            data['payload']['deviceID'] = ids[0]
+            status_message = deviceschema.load(data['payload'], session=db.session, transient=True).data
+            LOGGER.info(f"Recieved status message from {data['payload']['deviceID']}, persisting to db.")
+            db.session.merge(status_message)
+        else:
+            if len(ids) == 2:
+                data['payload']['deviceID'] = ids[0]
+                data['payload']['sensorID'] = ids[1]
+                status_message = sensorschema.load(data['payload'], session=db.session, transient=True).data
+                LOGGER.info(f"Recieved status message from sensor {data['payload']['sensorID']}, persisting to db.")
+                db.session.merge(status_message)
     except Exception as e:
         db.session.rollback()
         LOGGER.exception(e)