Refactored mqtt toggle

Author: qoda

iotserver/apps/device/admin.py

@@ -8,15 +8,15 @@
 
 def toggle_devices_on(modeladmin, request, queryset):
     for obj in queryset:
-        obj.mqtt_toggle(1)
+        obj.mqtt_toggle('on')
 
     message = 'All selected device have been toggled on.'
     messages.add_message(request, level=messages.SUCCESS, message=message)
 
 
 def toggle_devices_off(modeladmin, request, queryset):
     for obj in queryset:
-        obj.mqtt_toggle(0)
+        obj.mqtt_toggle('off')
 
     message = 'All selected device have been toggled off.'
     messages.add_message(request, level=messages.SUCCESS, message=message)

iotserver/apps/device/constants.py

@@ -0,0 +1,4 @@
+DEVICE_TOGGLE_STATE = {
+    'on': 1,
+    'off': 0
+}

iotserver/apps/device/models.py

@@ -10,6 +10,7 @@
 from django.utils import timezone
 from django.utils.functional import cached_property
 
+from iotserver.apps.device import constants
 from iotserver.apps.device.utils import mqtt, webrepl
 
 
@@ -86,8 +87,12 @@ def full_config(self):
         ]
         return config
 
-    def mqtt_toggle(self, state: int):
-        mqtt.toggle(self.id, str(state), settings.MQTT)
+    @cached_property
+    def last_status(self):
+        return self.statuses.first()
+    
+    def mqtt_toggle(self, state: str):
+        mqtt.toggle(self.id, str(constants.DEVICE_TOGGLE_STATE[state]))
 
 
 class DevicePin(models.Model):

iotserver/apps/device/utils/mqtt.py

@@ -1,13 +1,17 @@
+from typing import Dict, Optional
+
 import paho.mqtt.subscribe as mqtt_subscribe
 import paho.mqtt.publish as mqtt_publish
+from django.conf import settings
 
 
-def toggle(device_id, state, mqtt_settings):
+def toggle(device_id: str, state: int, mqtt_settings: Optional[Dict] = None) -> None:
     """
     Toggle the device on/off via mqtt if the rule has been applied to one of it's 
     pins.
     """
     topic = f'iot-devices/{device_id}/toggle'
+    mqtt_settings = mqtt_settings or settings.MQTT
 
     # Switch to the new toggle state
     mqtt_publish.single(