fix(alerts): add alert log admin, fixes some issues with script. (#243)

apps/alerts/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from alerts.models import Alert
+from alerts.models import Alert, AlertLog
 
 
 # Register your models here.
@@ -27,3 +27,26 @@ class AlertAdmin(admin.ModelAdmin):
             },
         ),
     ]
+
+
+@admin.register(AlertLog)
+class AlertLogAdmin(admin.ModelAdmin):
+    list_filter = ["user", "addressed"]
+    readonly_fields = ["created", "updated"]
+    list_display = ["alert", "created", "updated", "addressed"]
+
+    fieldsets = [
+        (
+            "Alert Log Info",
+            {
+                "fields": ["user", "alert", "addressed"],
+            },
+        ),
+        (
+            "Meta Data",
+            {
+                "classes": ["collapse"],
+                "fields": ["created", "updated"],
+            },
+        ),
+    ]

apps/alerts/management/commands/scan_for_alerts.py

@@ -15,13 +15,18 @@ def handle(self, *args, **options):
         alert_logs = []
         # TODO have a way of automatically resolving logs if condition is "unmet"
         for alert in Alert.objects.all().select_related("user", "plant", "sensor"):
-            if alert.lower_threshold and alert.latest_data_point <= alert.latest_data_point.data:
-                if alert.alert_logs.order_by("created").addressed is True:
-                    logger.info(f"Condition met for alert {alert}")
+            self.stdout.write(f"Checking condition on {alert}")
+            if alert.lower_threshold and alert.latest_data_point.data <= alert.lower_threshold:
+                latest_log = alert.alert_logs.order_by("-created").first()
+                if not latest_log or latest_log.addressed:
+                    self.stdout.write(f"Condition met for alert {alert}")
                     alert_logs.append(AlertLog(user=alert.user, alert=alert))
-            elif alert.lower_threshold and alert.latest_data_point >= alert.latest_data_point.data:
-                if alert.alert_logs.order_by("created").addressed is True:
-                    logger.info(f"Condition met for alert {alert}")
+            elif alert.upper_threshold and alert.latest_data_point.data >= alert.upper_threshold:
+                latest_log = alert.alert_logs.order_by("-created").first()
+                if not latest_log or latest_log.addressed:
+                    self.stdout.write(f"Condition met for alert {alert}")
                     alert_logs.append(AlertLog(user=alert.user, alert=alert))
+            else:
+                self.stdout.write(f"No conditions met for {alert}")
 
         AlertLog.objects.bulk_create(alert_logs)

apps/alerts/models.py

@@ -26,7 +26,7 @@ class Alert(models.Model):
 
     @cached_property
     def latest_data_point(self):
-        return self.sensor.data_points.order_by("time").first()
+        return self.sensor.plant_data.order_by("time").first()
 
     def __str__(self):
         return self.name