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

firefighter/incidents/migrations/0021_copy_component_data_to_incident_category.py

@@ -0,0 +1,57 @@
+# Generated manually on 2025-08-19 - Step 2: Copy Component data to IncidentCategory
+
+from django.db import migrations
+
+
+def copy_component_data_to_incident_category(apps, schema_editor):
+    """Copy all data from Component to IncidentCategory"""
+    Component = apps.get_model("incidents", "Component")
+    IncidentCategory = apps.get_model("incidents", "IncidentCategory")
+
+    # Copy all components to incident categories with the same fields
+    for component in Component.objects.all():
+        IncidentCategory.objects.create(
+            id=component.id,  # Keep same UUID
+            name=component.name,
+            description=component.description,
+            order=component.order,
+            private=component.private,
+            deploy_warning=component.deploy_warning,
+            created_at=component.created_at,
+            updated_at=component.updated_at,
+            group=component.group,
+        )
+
+
+def reverse_copy_component_data_to_incident_category(apps, schema_editor):
+    """Reverse operation - copy IncidentCategory back to Component if needed"""
+    Component = apps.get_model("incidents", "Component")
+    IncidentCategory = apps.get_model("incidents", "IncidentCategory")
+
+    # This would only work if Component table still exists during rollback
+    for incident_category in IncidentCategory.objects.all():
+        Component.objects.create(
+            id=incident_category.id,
+            name=incident_category.name,
+            description=incident_category.description,
+            order=incident_category.order,
+            private=incident_category.private,
+            deploy_warning=incident_category.deploy_warning,
+            created_at=incident_category.created_at,
+            updated_at=incident_category.updated_at,
+            group=incident_category.group,
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0020_create_incident_category_model"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            copy_component_data_to_incident_category,
+            reverse_copy_component_data_to_incident_category,
+        ),
+    ]

firefighter/incidents/migrations/0022_add_incident_category_fields.py

@@ -0,0 +1,34 @@
+# Generated manually on 2025-08-19 - Step 3: Add incident_category fields (nullable initially)
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0021_copy_component_data_to_incident_category"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="incident",
+            name="incident_category",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="incidents.incidentcategory",
+            ),
+        ),
+        migrations.AddField(
+            model_name="incidentupdate",
+            name="incident_category",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="incidents.incidentcategory",
+            ),
+        ),
+    ]

firefighter/incidents/migrations/0023_populate_incident_category_references.py

@@ -0,0 +1,57 @@
+# Generated manually on 2025-08-19 - Step 4: Populate incident_category references from component
+
+from django.db import migrations
+
+
+def populate_incident_category_references(apps, schema_editor):
+    """Copy component references to incident_category references"""
+    Incident = apps.get_model("incidents", "Incident")
+    IncidentUpdate = apps.get_model("incidents", "IncidentUpdate")
+
+    # Update all incidents to point to the corresponding incident category
+    incidents_updated = 0
+    for incident in Incident.objects.select_related("component").all():
+        if incident.component:
+            # Find the corresponding incident category (same UUID)
+            incident.incident_category_id = incident.component_id
+            incident.save(update_fields=["incident_category"])
+            incidents_updated += 1
+
+    # Update all incident updates to point to the corresponding incident category
+    updates_updated = 0
+    for incident_update in IncidentUpdate.objects.select_related("component").all():
+        if incident_update.component:
+            incident_update.incident_category_id = incident_update.component_id
+            incident_update.save(update_fields=["incident_category"])
+            updates_updated += 1
+
+
+def reverse_populate_incident_category_references(apps, schema_editor):
+    """Reverse: copy incident_category references back to component references"""
+    Incident = apps.get_model("incidents", "Incident")
+    IncidentUpdate = apps.get_model("incidents", "IncidentUpdate")
+
+    # Restore component references from incident_category references
+    for incident in Incident.objects.select_related("incident_category").all():
+        if incident.incident_category:
+            incident.component_id = incident.incident_category_id
+            incident.save(update_fields=["component"])
+
+    for incident_update in IncidentUpdate.objects.select_related("incident_category").all():
+        if incident_update.incident_category:
+            incident_update.component_id = incident_update.incident_category_id
+            incident_update.save(update_fields=["component"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0022_add_incident_category_fields"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            populate_incident_category_references,
+            reverse_populate_incident_category_references,
+        ),
+    ]

firefighter/incidents/migrations/0024_remove_component_fields_and_model.py

@@ -0,0 +1,26 @@
+# Generated manually on 2025-08-19 - Step 5: Remove component fields and model
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0023_populate_incident_category_references"),
+    ]
+
+    operations = [
+        # Remove the component foreign key fields
+        migrations.RemoveField(
+            model_name="incident",
+            name="component",
+        ),
+        migrations.RemoveField(
+            model_name="incidentupdate",
+            name="component",
+        ),
+        # Remove the component model entirely
+        migrations.DeleteModel(
+            name="Component",
+        ),
+    ]

firefighter/incidents/migrations/0025_make_incident_category_required.py

@@ -0,0 +1,24 @@
+# Generated manually on 2025-08-19 - Step 6: Make incident_category field required
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0024_remove_component_fields_and_model"),
+        ("slack", "0007_remove_components_fields"),
+    ]
+
+    operations = [
+        # Make incident_category field required (not null)
+        migrations.AlterField(
+            model_name="incident",
+            name="incident_category",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                to="incidents.incidentcategory",
+            ),
+        ),
+    ]

firefighter/incidents/migrations/0026_alter_incidentcategory_options_and_more.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.2.23 on 2025-09-17 17:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0025_make_incident_category_required"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="incidentcategory",
+            options={
+                "ordering": ["order"],
+                "verbose_name_plural": "incident categories",
+            },
+        ),
+        migrations.AlterField(
+            model_name="impactlevel",
+            name="description",
+            field=models.TextField(
+                blank=True,
+                help_text="Detailed multi-line description for this impact level.",
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="impactlevel",
+            name="emoji",
+            field=models.CharField(default="▶", max_length=5),
+        ),
+        migrations.AlterField(
+            model_name="impacttype",
+            name="emoji",
+            field=models.CharField(default="▶", max_length=5),
+        ),
+    ]

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/__init__.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from firefighter.incidents.models.component import Component
 from firefighter.incidents.models.environment import Environment
 from firefighter.incidents.models.group import Group
 from firefighter.incidents.models.impact import Impact
 from firefighter.incidents.models.incident import Incident
+from firefighter.incidents.models.incident_category import IncidentCategory
 from firefighter.incidents.models.incident_cost import IncidentCost
 from firefighter.incidents.models.incident_cost_type import IncidentCostType
 from firefighter.incidents.models.incident_role_type import IncidentRoleType

firefighter/incidents/models/group.py

@@ -7,7 +7,7 @@ from django.db.models.manager import Manager
 
 
 class Group(models.Model):
-    """Group of [firefighter.incidents.models.component.Component]. Not a group of users."""
+    """Group of [firefighter.incidents.models.incident_category.IncidentCategory]. Not a group of users."""
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     name = models.CharField(max_length=128, unique=True)
     description = models.TextField(blank=True)

firefighter/incidents/models/incident.py

@@ -29,10 +29,10 @@ from firefighter.firefighter.fields_forms_widgets import (
     GroupedCheckboxSelectMultiple,
 )
 from firefighter.incidents import signals
-from firefighter.incidents.enums import IncidentStatus
-from firefighter.incidents.models.component import Component
+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
 from firefighter.incidents.models.incident_membership import (
     IncidentMembership,
     IncidentRole,
@@ -90,7 +90,7 @@ class IncidentManager(models.Manager["Incident"]):
         """
         with transaction.atomic():
             if "private" not in kwargs:
-                kwargs["private"] = kwargs["component"].private
+                kwargs["private"] = kwargs["incident_category"].private
             if "severity" not in kwargs and "priority" in kwargs:
                 kwargs["severity"] = Severity.objects.get(
                     value=kwargs["priority"].value
@@ -110,7 +110,7 @@ class IncidentManager(models.Manager["Incident"]):
                 description=incident.description,
                 status=incident.status,  # type: ignore[misc]
                 priority=incident.priority,
-                component=incident.component,
+                incident_category=incident.incident_category,
                 created_by=incident.created_by,
                 commander=incident.created_by,
                 incident=incident,
@@ -212,8 +212,8 @@ class Incident(models.Model):
         on_delete=models.PROTECT,
         help_text="Priority",
     )
-    component = models.ForeignKey(
-        Component, on_delete=models.PROTECT
+    incident_category = models.ForeignKey(
+        IncidentCategory, on_delete=models.PROTECT
     )
     environment = models.ForeignKey(
         Environment, on_delete=models.PROTECT
@@ -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()
@@ -545,7 +572,7 @@ class Incident(models.Model):
         message: str | None = None,
         status: int | None = None,
         priority_id: UUID | None = None,
-        component_id: UUID | None = None,
+        incident_category_id: UUID | None = None,
         created_by: User | None = None,
         event_type: str | None = None,
         title: str | None = None,
@@ -564,7 +591,7 @@ class Incident(models.Model):
 
         _update_incident_field(self, "_status", status, updated_fields)
         _update_incident_field(self, "priority_id", priority_id, updated_fields)
-        _update_incident_field(self, "component_id", component_id, updated_fields)
+        _update_incident_field(self, "incident_category_id", incident_category_id, updated_fields)
         _update_incident_field(self, "title", title, updated_fields)
         _update_incident_field(self, "description", description, updated_fields)
         _update_incident_field(self, "environment_id", environment_id, updated_fields)
@@ -582,7 +609,7 @@ class Incident(models.Model):
                 status=status,  # type: ignore
                 priority_id=priority_id,
                 environment_id=environment_id,
-                component_id=component_id,
+                incident_category_id=incident_category_id,
                 message=message,
                 created_by=created_by,
                 title=title,
@@ -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",
@@ -628,12 +655,12 @@ class Incident(models.Model):
         incidentupdate_set: QuerySet[IncidentUpdate]
 
 
-def component_filter_choices_queryset(_: Any) -> QuerySet[Component]:
-    """Queryset for choices of Components in IncidentFilterSet.
+def incident_category_filter_choices_queryset(_: Any) -> QuerySet[IncidentCategory]:
+    """Queryset for choices of IncidentCategories in IncidentFilterSet.
     Moved it as a function because models are not loaded when creating filters.
     """
     return (
-        Component.objects.all()
+        IncidentCategory.objects.all()
         .select_related("group")
         .order_by(
             "group__order",
@@ -663,11 +690,11 @@ class IncidentFilterSet(django_filters.FilterSet):
         widget=CustomCheckboxSelectMultiple,
     )
     group = ModelMultipleChoiceFilter(
-        queryset=Group.objects.all(), field_name="component__group_id", label="Group"
+        queryset=Group.objects.all(), field_name="incident_category__group_id", label="Group"
     )
-    component = ModelMultipleChoiceFilter(
-        queryset=component_filter_choices_queryset,
-        label="Issue category",
+    incident_category = ModelMultipleChoiceFilter(
+        queryset=incident_category_filter_choices_queryset,
+        label="Incident category",
         widget=GroupedCheckboxSelectMultiple,
     )
     created_at = FFDateRangeSingleFilter(field_name="created_at")