firefighter-incident 0.0.14__py3-none-any.whl → 0.0.15__py3-none-any.whl

firefighter/incidents/migrations/0027_add_closure_fields.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.2.23 on 2025-09-26 12:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0026_alter_incidentcategory_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="incident",
+            name="closure_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("resolved", "Resolved normally"),
+                    ("duplicate", "Duplicate incident"),
+                    ("false_positive", "False alarm - no actual issue"),
+                    ("superseded", "Superseded by another incident"),
+                    ("external", "External dependency/known issue"),
+                    ("cancelled", "Cancelled - no longer relevant"),
+                ],
+                help_text="Reason for direct incident closure bypassing normal workflow",
+                max_length=50,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="incident",
+            name="closure_reference",
+            field=models.CharField(
+                blank=True,
+                help_text="Reference incident ID or external link for closure context",
+                max_length=100,
+            ),
+        ),
+    ]

firefighter/incidents/migrations/0028_add_closure_reason_constraint.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.23 on 2025-09-26 12:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0027_add_closure_fields"),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name="incident",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    (
+                        "closure_reason__in",
+                        [
+                            "resolved",
+                            "duplicate",
+                            "false_positive",
+                            "superseded",
+                            "external",
+                            "cancelled",
+                            None,
+                        ],
+                    )
+                ),
+                name="incidents_incident_closure_reason_valid",
+            ),
+        ),
+    ]

firefighter/incidents/migrations/0029_add_custom_fields_to_incident.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.21 on 2025-10-13 13:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0028_add_closure_reason_constraint"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="incident",
+            name="custom_fields",
+            field=models.JSONField(
+                blank=True,
+                default=dict,
+                help_text="Custom fields for incident (zendesk_ticket_id, seller_contract_id, etc.)",
+            ),
+        ),
+    ]

firefighter/incidents/models/incident.py

@@ -29,7 +29,7 @@ from firefighter.firefighter.fields_forms_widgets import (
     GroupedCheckboxSelectMultiple,
 )
 from firefighter.incidents import signals
-from firefighter.incidents.enums import IncidentStatus
+from firefighter.incidents.enums import ClosureReason, IncidentStatus
 from firefighter.incidents.models.environment import Environment
 from firefighter.incidents.models.group import Group
 from firefighter.incidents.models.incident_category import IncidentCategory
@@ -230,6 +230,24 @@ class Incident(models.Model):
     closed_at = models.DateTimeField(
         null=True, blank=True
     )  # XXX-ZOR make this an event
+    closure_reason = models.CharField(
+        max_length=50,
+        choices=ClosureReason.choices,
+        null=True,
+        blank=True,
+        help_text="Reason for direct incident closure bypassing normal workflow",
+    )
+    closure_reference = models.CharField(
+        max_length=100,
+        blank=True,
+        help_text="Reference incident ID or external link for closure context",
+    )
+
+    custom_fields = models.JSONField(
+        default=dict,
+        blank=True,
+        help_text="Custom fields for incident (zendesk_ticket_id, seller_contract_id, etc.)",
+    )
 
     # XXX-ZOR pick a more meaningful name. maybe 'hidden'
     # XXX-ZOR document intent and impl. status
@@ -268,7 +286,11 @@ class Incident(models.Model):
             models.CheckConstraint(
                 name="%(app_label)s_%(class)s__status_valid",
                 check=models.Q(_status__in=IncidentStatus.values),
-            )
+            ),
+            models.CheckConstraint(
+                name="%(app_label)s_%(class)s_closure_reason_valid",
+                check=models.Q(closure_reason__in=[*ClosureReason.values, None]),
+            ),
         ]
 
     def __str__(self) -> str:
@@ -331,6 +353,11 @@ class Incident(models.Model):
     def can_be_closed(self) -> tuple[bool, list[tuple[str, str]]]:
         # XXX-ZOR we should use a proper FSM abstraction
         cant_closed_reasons: list[tuple[str, str]] = []
+
+        # Allow direct closure when closure_reason is provided (bypasses normal workflow)
+        if self.closure_reason:
+            return True, []
+
         if self.ignore:
             return True, []
         if self.needs_postmortem:
@@ -341,11 +368,11 @@ class Incident(models.Model):
                         f"Incident is not in PostMortem status, and needs one because of its priority and environment ({self.priority.name}/{self.environment.value}).",
                     )
                 )
-        elif self.status.value < IncidentStatus.FIXED:
+        elif self.status.value < IncidentStatus.MITIGATED:
             cant_closed_reasons.append(
                 (
                     "STATUS_NOT_MITIGATED",
-                    f"Incident is not in {IncidentStatus.FIXED.label} status (currently {self.status.label}).",
+                    f"Incident is not in {IncidentStatus.MITIGATED.label} status (currently {self.status.label}).",
                 )
             )
         missing_milestones = self.missing_milestones()
@@ -592,7 +619,7 @@ class Incident(models.Model):
             )
             incident_update.save()
 
-            if status == IncidentStatus.FIXED:
+            if status == IncidentStatus.MITIGATED:
                 IncidentUpdate.objects.update_or_create(
                     incident_id=self.id,
                     event_type="recovered",