firefighter-incident 0.0.13__py3-none-any.whl → 0.0.14__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/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

@@ -30,9 +30,9 @@ from firefighter.firefighter.fields_forms_widgets import (
 )
 from firefighter.incidents import signals
 from firefighter.incidents.enums import IncidentStatus
-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.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
@@ -545,7 +545,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 +564,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 +582,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,
@@ -628,12 +628,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 +663,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")

firefighter/incidents/models/{component.py → incident_category.py}

@@ -40,18 +40,18 @@ logger = logging.getLogger(__name__)
 TZ = timezone.get_current_timezone()
 
 
-class ComponentManager(models.Manager["Component"]):
-    model: type[Component]
+class IncidentCategoryManager(models.Manager["IncidentCategory"]):
+    model: type[IncidentCategory]
 
     def queryset_with_mtbf(
         self,
         date_from: datetime,
         date_to: datetime,
-        queryset: QuerySet[Component] | None = None,
+        queryset: QuerySet[IncidentCategory] | None = None,
         metric_type: str = "time_to_fix",
         field_name: str = "mtbf",
-    ) -> QuerySet[Component]:
-        """Returns a queryset of components with an additional `mtbf` field."""
+    ) -> QuerySet[IncidentCategory]:
+        """Returns a queryset of incident categories with an additional `mtbf` field."""
         date_to = min(date_to, datetime.now(tz=TZ))
 
         date_interval = date_to - date_from
@@ -62,12 +62,12 @@ class ComponentManager(models.Manager["Component"]):
             .annotate(
                 metric_subquery=Subquery(
                     IncidentMetric.objects.filter(
-                        incident__component=OuterRef("pk"),
+                        incident__incident_category=OuterRef("pk"),
                         metric_type__type=metric_type,
                         incident__created_at__gte=date_from,
                         incident__created_at__lte=date_to,
                     )
-                    .values("incident__component")
+                    .values("incident__incident_category")
                     .annotate(sum_downtime=Sum("duration"))
                     .values("sum_downtime")
                 )
@@ -95,11 +95,11 @@ class ComponentManager(models.Manager["Component"]):
 
     @staticmethod
     def search(
-        queryset: QuerySet[Component] | None, search_term: str
-    ) -> tuple[QuerySet[Component], bool]:
+        queryset: QuerySet[IncidentCategory] | None, search_term: str
+    ) -> tuple[QuerySet[IncidentCategory], bool]:
         # XXX Common search method
         if queryset is None:
-            queryset = Component.objects.all()
+            queryset = IncidentCategory.objects.all()
 
         # If not search, return the original queryset
         if search_term is None or search_term.strip() == "":
@@ -135,24 +135,24 @@ class ComponentManager(models.Manager["Component"]):
         return queryset, False
 
 
-class Component(models.Model):
-    objects: ComponentManager = ComponentManager()
+class IncidentCategory(models.Model):
+    objects: IncidentCategoryManager = IncidentCategoryManager()
 
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     name = models.CharField(max_length=128)
     description = models.TextField(blank=True)
     order = models.IntegerField(
         default=0,
-        help_text="Order of the component in the list. Should be unique per `Group`.",
+        help_text="Order of the incident category in the list. Should be unique per `Group`.",
     )
     group = models.ForeignKey(Group, on_delete=models.PROTECT)
     private = models.BooleanField(
         default=False,
-        help_text="If true, incident created with this component won't be communicated, and conversations will be made private. This is useful for sensitive components. In the future, private incidents may be visible only to its members.",
+        help_text="If true, incident created with this incident category won't be communicated, and conversations will be made private. This is useful for sensitive incident categories. In the future, private incidents may be visible only to its members.",
     )
     deploy_warning = models.BooleanField(
         default=True,
-        help_text="If true, a warning will be sent when creating an incident of high severity with this component.",
+        help_text="If true, a warning will be sent when creating an incident of high severity with this incident category.",
     )
 
     created_at = models.DateTimeField(auto_now_add=True)
@@ -169,16 +169,17 @@ class Component(models.Model):
 
     class Meta(TypedModelMeta):
         ordering = ["order"]
+        verbose_name_plural = "incident categories"
 
     def __str__(self) -> str:
         return f"{'🔒 ' if self.private else ''}{self.name}"
 
     def get_absolute_url(self) -> str:
-        return reverse("incidents:component-detail", kwargs={"component_id": self.id})
+        return reverse("incidents:incident-category-detail", kwargs={"incident_category_id": self.id})
 
 
-class ComponentFilterSet(django_filters.FilterSet):
-    """Set of filters for Component, share by Web UI and API."""
+class IncidentCategoryFilterSet(django_filters.FilterSet):
+    """Set of filters for IncidentCategory, share by Web UI and API."""
 
     id = django_filters.CharFilter(lookup_expr="iexact")
     private = django_filters.BooleanFilter()
@@ -194,30 +195,30 @@ class ComponentFilterSet(django_filters.FilterSet):
         label="MTBF period",
     )
     search = django_filters.CharFilter(
-        field_name="search", method="component_search", label="Search"
+        field_name="search", method="incident_category_search", label="Search"
     )
 
     @staticmethod
-    def component_search(
-        queryset: QuerySet[Component], _name: str, value: str
-    ) -> QuerySet[Component]:
-        """Search incidents by title, description, and ID.
+    def incident_category_search(
+        queryset: QuerySet[IncidentCategory], _name: str, value: str
+    ) -> QuerySet[IncidentCategory]:
+        """Search incident categories by title, description, and ID.
 
         Args:
-            queryset (QuerySet[Component]): Queryset to search in.
+            queryset (QuerySet[IncidentCategory]): Queryset to search in.
             _name:
             value (str): Value to search for.
 
         Returns:
-            QuerySet[Component]: Search results.
+            QuerySet[IncidentCategory]: Search results.
         """
-        return Component.objects.search(queryset=queryset, search_term=value)[0]
+        return IncidentCategory.objects.search(queryset=queryset, search_term=value)[0]
 
     @staticmethod
     def metrics_period_filter(
-        queryset: QuerySet[Component],
+        queryset: QuerySet[IncidentCategory],
         _name: str,
         value: tuple[datetime, datetime, Any, Any],
-    ) -> QuerySet[Component]:
+    ) -> QuerySet[IncidentCategory]:
         gte, lte, _, _ = value
-        return Component.objects.queryset_with_mtbf(gte, lte, queryset=queryset)
+        return IncidentCategory.objects.queryset_with_mtbf(gte, lte, queryset=queryset)

firefighter/incidents/models/incident_update.py

@@ -11,8 +11,8 @@ from django.utils import timezone
 from django_stubs_ext.db.models import TypedModelMeta
 
 from firefighter.incidents.enums import IncidentStatus
-from firefighter.incidents.models.component import Component
 from firefighter.incidents.models.environment import Environment
+from firefighter.incidents.models.incident_category import IncidentCategory
 from firefighter.incidents.models.priority import Priority
 from firefighter.incidents.models.severity import Severity
 from firefighter.incidents.models.user import User
@@ -75,8 +75,8 @@ class IncidentUpdate(models.Model):
     incident = models.ForeignKey(
         "Incident", on_delete=models.CASCADE
     )
-    component = models.ForeignKey(
-        Component, null=True, blank=True, on_delete=models.SET_NULL
+    incident_category = models.ForeignKey(
+        IncidentCategory, null=True, blank=True, on_delete=models.SET_NULL
     )
     created_by = models.ForeignKey(
         User, null=True, blank=True, on_delete=models.SET_NULL

firefighter/incidents/tables.py

@@ -6,7 +6,7 @@ import django_tables2 as tables
 from django.conf import settings
 
 from firefighter.firefighter.tables_utils import BASE_TABLE_ATTRS
-from firefighter.incidents.models import Component, Incident
+from firefighter.incidents.models import Incident, IncidentCategory
 from firefighter.incidents.models.incident import IncidentStatus
 
 if TYPE_CHECKING:
@@ -23,8 +23,8 @@ class IncidentTable(tables.Table):
             "priority",
             "status",
             "environment",
-            "component",
-            "component__group",
+            "incident_category",
+            "incident_category__group",
             "created_at",
         )
         order_by = "-id"
@@ -63,13 +63,13 @@ class IncidentTable(tables.Table):
         attrs={"td": {"class": "table-td text-center"}},
     )
     environment = tables.Column(attrs={"td": {"class": "table-td text-center"}})
-    component = tables.Column(attrs={"td": {"class": "table-td text-center"}})
-    component__group = tables.Column(attrs={"td": {"class": "table-td text-center"}})
+    incident_category = tables.Column(attrs={"td": {"class": "table-td text-center"}})
+    incident_category__group = tables.Column(attrs={"td": {"class": "table-td text-center"}})
 
 
-class ComponentsTable(tables.Table):
+class IncidentCategoriesTable(tables.Table):
     class Meta:
-        model = Component
+        model = IncidentCategory
         template_name = "incidents/table.html"
         fields = (
             "name",
@@ -93,12 +93,12 @@ class ComponentsTable(tables.Table):
     )
 
     @staticmethod
-    def render_mtbf(record: Component, *args: Any) -> str:
+    def render_mtbf(record: IncidentCategory, *args: Any) -> str:
         mtbf: timedelta | None = record.mtbf  # type: ignore[attr-defined]
         return str(mtbf).split(".", maxsplit=1)[0] if mtbf else "N/A"
 
     @staticmethod
-    def render_incident_count(record: Component, *args: Any) -> int:
+    def render_incident_count(record: IncidentCategory, *args: Any) -> int:
         return int(record.incident_count) if record.incident_count else 0  # type: ignore[attr-defined]
 
     group__name = tables.Column(verbose_name="Group")

firefighter/incidents/templates/layouts/partials/incident_card.html

@@ -14,7 +14,7 @@
           {% include "./environment_pill.html" with environment=incident.environment only %}
         {% endif %}
         <span class="inline-flex font-semibold rounded-full px-2 text-xs leading-5 bg-neutral-300 text-neutral-600 ">
-          {{ incident.component.name }} ({{ incident.component.group.name }})
+          {{ incident.incident_category.name }} ({{ incident.incident_category.group.name }})
         </span>
         {% include "./priority_pill.html" with priority=incident.priority only %}
         <p class="mt-2 text-neutral-500 dark:text-neutral-200 text-sm line-clamp-3">{{ incident.description|truncatechars:150 }}</p>

firefighter/incidents/templates/layouts/partials/incident_timeline.html

@@ -111,13 +111,13 @@
                       Priority changed to: {{ incident_update.priority }}
                     </p>
                   {% endif %}
-                  {% if incident_update.component %}
+                  {% if incident_update.incident_category %}
                     <p class="mt-0.5">
                       Component update
                     </p>
                     <p class="pl-2 mt-0.5 text-sm text-neutral-500 dark:text-neutral-300">
                       Component impacted changed to:
-                      {{ incident_update.component }}
+                      {{ incident_update.incident_category }}
                     </p>
                   {% endif %}
                   {% if incident_update.communication_lead or incident_update.commander %}