Remove is_active, is_stood_down from SurgeAlert model.

Author: Rup-Narayan-Rajbanshi

api/management/commands/sync_molnix.py

@@ -490,7 +490,7 @@ def sync_open_positions(molnix_positions, molnix_api, countries):
             successful_updates += 1
 
     # Find existing active alerts that are not in the current list from Molnix
-    existing_alerts = SurgeAlert.objects.filter(SurgeAlertStatus.OPEN).exclude(molnix_id__isnull=True)
+    existing_alerts = SurgeAlert.objects.filter(molnix_status=SurgeAlertStatus.OPEN).exclude(molnix_id__isnull=True)
     existing_alert_ids = [e.molnix_id for e in existing_alerts]
     inactive_alerts = list(set(existing_alert_ids) - set(molnix_ids))
 
@@ -502,7 +502,7 @@ def sync_open_positions(molnix_positions, molnix_api, countries):
         position = molnix_api.get_position(alert.molnix_id)
         if not position:
             warnings.append("Position id %d not found in Molnix API" % alert.molnix_id)
-        if position and position["status"].lower():
+        if position and position["status"]:
             alert.molnix_status = SurgeAlert.parse_molnix_status(position["status"])
         if position and position["closes"]:
             alert.closes = get_datetime(position["closes"])

notifications/admin.py

@@ -11,7 +11,7 @@ class SurgeAlertAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdm
 
     @admin.display(description="std")
     def std(self, obj):
-        return obj.is_stood_down
+        return obj.molnix_status == models.SurgeAlertStatus.STOOD_DOWN
 
     std.boolean = True
     country_in = "event__countries__in"
@@ -22,9 +22,9 @@ def std(self, obj):
         "message",
         "event__name",
     )
-    readonly_fields = ("molnix_id", "is_stood_down")
+    readonly_fields = ("molnix_id",)
     list_display = ("__str__", "message", "start", "molnix_id", "molnix_status", "std")
-    list_filter = ("molnix_status", "is_stood_down")
+    list_filter = ("molnix_status",)
 
 
 class SubscriptionAdmin(CompareVersionAdmin):

notifications/drf_views.py

@@ -49,7 +49,6 @@ class Meta:
             "created_at": ("exact", "gt", "gte", "lt", "lte"),
             "start": ("exact", "gt", "gte", "lt", "lte"),
             "end": ("exact", "gt", "gte", "lt", "lte"),
-            "is_stood_down": ("exact",),
             "molnix_id": ("exact", "in"),
             "message": ("exact", "in"),
             "country": ("exact", "in"),
@@ -67,7 +66,7 @@ class SurgeAlertViewset(viewsets.ReadOnlyModelViewSet):
     authentication_classes = (TokenAuthentication,)
     queryset = SurgeAlert.objects.prefetch_related("molnix_tags", "molnix_tags__groups").select_related("event", "country").all()
     filterset_class = SurgeAlertFilter
-    ordering_fields = ("created_at", "atype", "category", "event", "is_stood_down", "molnix_status", "opens")
+    ordering_fields = ("created_at", "atype", "category", "event", "molnix_status", "opens")
     search_fields = (
         "operation",
         "message",
@@ -80,6 +79,10 @@ def get_serializer_class(self):
         # return UnauthenticatedSurgeAlertSerializer
         return SurgeAlertSerializer
 
+    def get_queryset(self):
+        queryset = self.get_queryset()
+        return queryset.filter(molnix_id__isnull=False).exclude(molnix_tags__name="NO_GO")
+
 
 #   def get_queryset(self):
 #       # limit = 14  # days

notifications/factories.py

@@ -9,6 +9,7 @@ class Meta:
         model = SurgeAlert
 
     message = fuzzy.FuzzyText(length=100)
+    molnix_id = fuzzy.FuzzyInteger(low=1)
     atype = fuzzy.FuzzyInteger(low=1)
     category = fuzzy.FuzzyInteger(low=1)
     molnix_status = fuzzy.FuzzyChoice(choices=SurgeAlertStatus)

notifications/migrations/0015_rename_molnix_status_surgealert_molnix_status_old.py

@@ -19,4 +19,12 @@ class Migration(migrations.Migration):
             old_name="status",
             new_name="molnix_status",
         ),
+        migrations.RemoveField(
+            model_name="surgealert",
+            name="is_active",
+        ),
+        migrations.RemoveField(
+            model_name="surgealert",
+            name="is_stood_down",
+        ),
     ]

notifications/models.py

@@ -49,17 +49,12 @@ class SurgeAlert(models.Model):
     # ID in Molnix system, if parsed from Molnix.
     molnix_id = models.IntegerField(blank=True, null=True)
 
-    # It depends on molnix_status. Check "save" method below.
-    is_stood_down = models.BooleanField(verbose_name=_("is stood down?"), default=False)
     opens = models.DateTimeField(blank=True, null=True)
     closes = models.DateTimeField(blank=True, null=True)
     start = models.DateTimeField(blank=True, null=True)
     end = models.DateTimeField(blank=True, null=True)
     molnix_tags = models.ManyToManyField(MolnixTag, blank=True)
 
-    # Set to inactive when position is no longer in Molnix
-    is_active = models.BooleanField(default=True)
-
     # Don't set `auto_now_add` so we can modify it on save
     created_at = models.DateTimeField(verbose_name=_("created at"))
     molnix_status = models.IntegerField(

notifications/serializers.py

@@ -41,7 +41,6 @@ class Meta:
             "closes",
             "start",
             "end",
-            "is_stood_down",
             "molnix_status",
             "molnix_status_display",
         )