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

firefighter/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.13'
-__version_tuple__ = version_tuple = (0, 0, 13)
+__version__ = version = '0.0.15'
+__version_tuple__ = version_tuple = (0, 0, 15)
+
+__commit_id__ = commit_id = None

firefighter/api/serializers.py

@@ -15,10 +15,10 @@ from rest_framework.fields import empty
 from taggit.serializers import TaggitSerializer, TagListSerializerField
 
 from firefighter.firefighter.utils import get_in
-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 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_membership import IncidentRole
@@ -157,11 +157,11 @@ class GroupSerializer(serializers.ModelSerializer[Group]):
         fields = "__all__"
 
 
-class ComponentSerializer(serializers.ModelSerializer[Component]):
+class IncidentCategorySerializer(serializers.ModelSerializer[IncidentCategory]):
     group = GroupSerializer()
 
     class Meta:
-        model = Component
+        model = IncidentCategory
         fields = "__all__"
 
 
@@ -210,14 +210,15 @@ class IncidentSerializer(TaggitSerializer, serializers.ModelSerializer[Incident]
     priority_id = serializers.PrimaryKeyRelatedField(
         source="priority", queryset=Priority.objects.all(), write_only=True
     )
-    component = ComponentSerializer(read_only=True)
-    component_id = serializers.PrimaryKeyRelatedField(
-        source="component", queryset=Component.objects.all(), write_only=True
+    incident_category = IncidentCategorySerializer(read_only=True)
+    incident_category_id = serializers.PrimaryKeyRelatedField(
+        source="incident_category", queryset=IncidentCategory.objects.all(), write_only=True
     )
 
     status = serializers.SerializerMethodField()
     created_by = UserSerializer(read_only=True)
     slack_channel_name = serializers.SerializerMethodField()
+    postmortem_url = serializers.SerializerMethodField()
 
     created_by_email = CreatableSlugRelatedField[User](
         source="created_by",
@@ -252,6 +253,13 @@ class IncidentSerializer(TaggitSerializer, serializers.ModelSerializer[Incident]
     def get_slack_channel_name(obj: Incident) -> str:
         return f"#{obj.slack_channel_name}" if obj.slack_channel_name else ""
 
+    @staticmethod
+    def get_postmortem_url(obj: Incident) -> str | None:
+        """Return the Confluence post-mortem page URL if it exists."""
+        if hasattr(obj, "postmortem_for"):
+            return obj.postmortem_for.page_url
+        return None
+
     def create(self, validated_data: dict[str, Any]) -> Incident:
         return Incident.objects.declare(**validated_data)
 
@@ -274,14 +282,15 @@ class IncidentSerializer(TaggitSerializer, serializers.ModelSerializer[Incident]
             "description",
             "created_at",
             "environment",
-            "component",
+            "incident_category",
             "priority",
             "status",
             "slack_channel_name",
             "status_page_url",
+            "postmortem_url",
             "status",
             "environment_id",
-            "component_id",
+            "incident_category_id",
             "priority_id",
             "created_by_email",
             "tags",

firefighter/api/urls.py

@@ -33,11 +33,18 @@ router.register(
     views.severities.PriorityViewSet,
     basename="priorities",
 )
+# Legacy endpoint for backward compatibility
 router.register(
     r"components",
-    views.components.ComponentViewSet,
+    views.components.IncidentCategoryViewSet,
     basename="components",
 )
+# New preferred endpoint
+router.register(
+    r"incident-categories",
+    views.components.IncidentCategoryViewSet,
+    basename="incident-categories",
+)
 router.register(
     r"groups",
     views.groups.GroupViewSet,

firefighter/api/views/_base.py

@@ -20,7 +20,7 @@ T_co = TypeVar("T_co", bound=Model, covariant=True)
             examples=[
                 OpenApiExample(
                     name="Comma separated list of fields",
-                    value="id,name,component.name,component.group.name",
+                    value="id,name,incident_category.name,incident_category.group.name",
                     request_only=True,
                 ),
                 OpenApiExample(

firefighter/api/views/components.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from firefighter.api.serializers import ComponentSerializer
+from firefighter.api.serializers import IncidentCategorySerializer
 from firefighter.api.views._base import ReadOnlyModelViewSet
-from firefighter.incidents.models.component import Component
+from firefighter.incidents.models.incident_category import IncidentCategory
 
 
-class ComponentViewSet(ReadOnlyModelViewSet[Component]):
-    queryset = Component.objects.all().select_related("group")
-    serializer_class = ComponentSerializer
+class IncidentCategoryViewSet(ReadOnlyModelViewSet[IncidentCategory]):
+    queryset = IncidentCategory.objects.all().select_related("group")
+    serializer_class = IncidentCategorySerializer

firefighter/api/views/incidents.py

@@ -44,7 +44,7 @@ class ProcessAfterResponse(Response):
             examples=[
                 OpenApiExample(
                     name="Comma separated list of fields",
-                    value="id,name,component.name,component.group.name",
+                    value="id,name,incident_category.name,incident_category.group.name",
                     request_only=True,
                 ),
                 OpenApiExample(
@@ -73,8 +73,8 @@ class IncidentViewSet(
         Incident.objects.all()
         .select_related(
             "priority",
-            "component__group",
-            "component",
+            "incident_category__group",
+            "incident_category",
             "environment",
             "conversation",
             "created_by",
@@ -113,8 +113,8 @@ class IncidentViewSet(
         "priority.name",
         "title",
         "description",
-        "component.name",
-        "component.group.name",
+        "incident_category.name",
+        "incident_category.group.name",
         "created_at",
         "slack_channel_name",
         "status_page_url",
@@ -154,12 +154,12 @@ class IncidentViewSet(
         OpenApiExample(
             "Create an incident",
             summary="Create an incident",
-            description="Create an incident, on INT, P4, with `Other` component and John Doe as creator. All fields are required. The email must be a valid email of a ManoMano employee, that has a Slack account or has already used FireFighter before.",
+            description="Create an incident, on INT, P4, with `Other` incident category and John Doe as creator. All fields are required. The email must be a valid email of a ManoMano employee, that has a Slack account or has already used FireFighter before.",
             value={
                 "title": "Title of the incident, limited to 128 characters.",
                 "description": "Longer description of the incident. No characters limit.",
                 "environment_id": "1b960430-995b-47e1-beab-23dbe3dbccbf",
-                "component_id": "390a993a-d273-4db8-b7d6-190ab294961a",
+                "incident_category_id": "390a993a-d273-4db8-b7d6-190ab294961a",
                 "priority_id": "b814c9d2-48a8-4ac4-9c71-ff844e1b77f1",
                 "created_by_email": "john.doe@mycompany.com",
             },
@@ -185,7 +185,7 @@ class IncidentViewSet(
                     "order": 3,
                     "default": False,
                 },
-                "component": {
+                "incident_category": {
                     "id": "390a993a-d273-4db8-b7d6-190ab294961a",
                     "name": "Other",
                     "description": "",
@@ -241,7 +241,7 @@ class CreateIncidentViewSet(
     viewsets.GenericViewSet[Incident],
 ):
     queryset: QuerySet[Incident] = Incident.objects.all().select_related(
-        "priority", "component__group", "component", "environment", "conversation"
+        "priority", "incident_category__group", "incident_category", "environment", "conversation"
     )
     serializer_class = IncidentSerializer
     filterset_class = IncidentFilterSet

firefighter/confluence/signals/incident_updated.py

@@ -39,7 +39,7 @@ def incident_updated_handler(
         if (
             "_status" in updated_fields
             and incident_update.status
-            in {IncidentStatus.FIXED, IncidentStatus.POST_MORTEM}
+            in {IncidentStatus.MITIGATED, IncidentStatus.POST_MORTEM}
             and incident.needs_postmortem
         ):
             if not hasattr(incident, "postmortem_for"):
@@ -48,7 +48,7 @@ def incident_updated_handler(
         elif (
             "_status" in updated_fields
             and incident_update.status
-            in {IncidentStatus.FIXED, IncidentStatus.POST_MORTEM}
+            in {IncidentStatus.MITIGATED, IncidentStatus.POST_MORTEM}
             and not incident.needs_postmortem
         ):
             publish_fixed_next_actions(incident)

firefighter/firefighter/settings/components/raid.py

@@ -20,3 +20,6 @@ if ENABLE_RAID:
 
     RAID_TOOLBOX_URL: str = config("RAID_TOOLBOX_URL")
     "Toolbox URL"
+
+    RAID_JIRA_INCIDENT_CATEGORY_FIELD: str = config("RAID_JIRA_INCIDENT_CATEGORY_FIELD", default="")
+    "Jira custom field ID for incident category (e.g. 'customfield_12345')"

firefighter/incidents/admin.py

@@ -19,10 +19,10 @@ from django.utils.translation import ngettext
 from slack_sdk.errors import SlackApiError
 
 from firefighter.incidents.models import (
-    Component,
     Environment,
     Group,
     Incident,
+    IncidentCategory,
     IncidentUpdate,
     Severity,
     User,
@@ -63,7 +63,7 @@ logger = logging.getLogger(__name__)
 
 # Append inlines to these objects, from other modules
 user_inlines: list[type[InlineModelAdmin[Any, User]]] = []
-component_inlines: list[type[InlineModelAdmin[Any, Component]]] = []
+incident_category_inlines: list[type[InlineModelAdmin[Any, IncidentCategory]]] = []
 
 
 class IncidentCostInline(admin.TabularInline[IncidentCost, Incident]):
@@ -97,9 +97,9 @@ class IncidentMembershipInline(admin.StackedInline[IncidentMembership, Incident]
 incident_inlines: MutableSequence[type[InlineModelAdmin[Any, Incident]]] = []
 
 
-@admin.register(Component)
-class ComponentAdmin(admin.ModelAdmin[Component]):
-    model = Component
+@admin.register(IncidentCategory)
+class IncidentCategoryAdmin(admin.ModelAdmin[IncidentCategory]):
+    model = IncidentCategory
     list_display = ["name", "group", "order", "private", "deploy_warning"]
     list_editable = ["order", "group", "private"]
     list_display_links = ["name"]
@@ -111,7 +111,7 @@ class ComponentAdmin(admin.ModelAdmin[Component]):
         "created_at",
         "updated_at",
     ]
-    inlines = component_inlines
+    inlines = incident_category_inlines
 
     fieldsets = (
         (
@@ -132,8 +132,8 @@ class ComponentAdmin(admin.ModelAdmin[Component]):
     )
 
 
-class ComponentInline(admin.StackedInline[Component, Component]):
-    model = Component
+class IncidentCategoryInline(admin.StackedInline[IncidentCategory, IncidentCategory]):
+    model = IncidentCategory
     fields = ["name", "order"]
 
 
@@ -218,7 +218,7 @@ class IncidentUpdateInline(admin.StackedInline[IncidentUpdate, Incident]):
         "_status",
         "priority",
         "message",
-        "component",
+        "incident_category",
         "created_by",
     ]
     extra = 0
@@ -226,7 +226,7 @@ class IncidentUpdateInline(admin.StackedInline[IncidentUpdate, Incident]):
         "priority",
         "message",
         "_status",
-        "component",
+        "incident_category",
         "created_by",
         "commander",
         "communication_lead",
@@ -239,11 +239,11 @@ class IncidentUpdateInline(admin.StackedInline[IncidentUpdate, Incident]):
             .get_queryset(request)
             .select_related(
                 "priority",
-                "component",
+                "incident_category",
                 "incident",
                 "incident__priority",
-                "incident__component",
-                "component__group",
+                "incident__incident_category",
+                "incident_category__group",
                 "created_by",
                 "commander",
                 "communication_lead",
@@ -398,7 +398,7 @@ class IncidentAdmin(admin.ModelAdmin[Incident]):
         # Return None to display the change list page again.
 
     date_hierarchy = "created_at"
-    autocomplete_fields = ["created_by", "component"]
+    autocomplete_fields = ["created_by", "incident_category"]
     actions: list[_ActionCallable[Any, Incident]] = [
         compute_metrics,
         compute_and_purge_metrics,
@@ -410,14 +410,14 @@ class IncidentAdmin(admin.ModelAdmin[Incident]):
         "short_description",
         "_status",
         "priority",
-        "component",
+        "incident_category",
         "environment",
         "created_at",
         "updated_at",
     ]
 
     list_display_links = ["id", "title"]
-    list_filter = ("_status", "priority", "component", "environment")
+    list_filter = ("_status", "priority", "incident_category", "environment")
     readonly_fields = (
         "created_at",
         "updated_at",
@@ -429,7 +429,7 @@ class IncidentAdmin(admin.ModelAdmin[Incident]):
 
     list_select_related = (
         "priority",
-        "component__group",
+        "incident_category__group",
         "environment",
     )
     list_max_show_all = 1000
@@ -450,7 +450,7 @@ class IncidentAdmin(admin.ModelAdmin[Incident]):
                 )
             },
         ),
-        (_("Relations"), {"fields": ("priority", "component", "environment")}),
+        (_("Relations"), {"fields": ("priority", "incident_category", "environment")}),
         (
             _("User Roles"),
             {
@@ -506,10 +506,10 @@ class IncidentAdmin(admin.ModelAdmin[Incident]):
     def _get_select_related(self) -> list[str]:
         select_related = [
             "priority",
-            "component__group",
+            "incident_category__group",
             "environment",
             "conversation",
-            "component",
+            "incident_category",
             "created_by",
         ]
         if apps.apps.is_installed("firefighter.confluence"):
@@ -525,13 +525,13 @@ class IncidentUpdateAdmin(admin.ModelAdmin[IncidentUpdate]):
         "_status",
         "priority",
         "message",
-        "component",
+        "incident_category",
         "created_by",
     ]
     list_display_links = ["_status"]
-    list_filter = ("_status", "priority", "component", "event_type")
+    list_filter = ("_status", "priority", "incident_category", "event_type")
     readonly_fields = ("created_at", "updated_at", "incident")
-    list_select_related = ("priority", "component", "incident", "created_by")
+    list_select_related = ("priority", "incident_category", "incident", "created_by")
     search_fields = ["description", "message"]
 
 
@@ -544,7 +544,7 @@ class GroupAdmin(admin.ModelAdmin[Group]):
     ]
     ordering = ["order"]
     list_display_links = ["name"]
-    inlines = [ComponentInline]
+    inlines = [IncidentCategoryInline]
     search_fields = ["name"]
 
 

firefighter/incidents/enums.py

@@ -6,8 +6,8 @@ from django.db import models
 class IncidentStatus(models.IntegerChoices):
     OPEN = 10, "Open"
     INVESTIGATING = 20, "Investigating"
-    FIXING = 30, "Mitigating"
-    FIXED = 40, "Mitigated"
+    MITIGATING = 30, "Mitigating"
+    MITIGATED = 40, "Mitigated"
     POST_MORTEM = 50, "Post-mortem"
     CLOSED = 60, "Closed"
 
@@ -30,3 +30,23 @@ class IncidentStatus(models.IntegerChoices):
     @staticmethod
     def choices_lt(val: int) -> list[tuple[int, str]]:
         return [i for i in IncidentStatus.choices if i[0] < val]
+
+    @staticmethod
+    def choices_lte(val: int) -> list[tuple[int, str]]:
+        return [i for i in IncidentStatus.choices if i[0] <= val]
+
+    @staticmethod
+    def choices_lte_skip_postmortem(val: int) -> list[tuple[int, str]]:
+        """Return choices up to val but excluding POST_MORTEM (for P3+ incidents)."""
+        return [i for i in IncidentStatus.choices if i[0] <= val and i[0] != IncidentStatus.POST_MORTEM]
+
+
+class ClosureReason(models.TextChoices):
+    """Reasons for direct incident closure bypassing normal workflow."""
+
+    RESOLVED = "resolved", "Resolved normally"
+    DUPLICATE = "duplicate", "Duplicate incident"
+    FALSE_POSITIVE = "false_positive", "False alarm - no actual issue"
+    SUPERSEDED = "superseded", "Superseded by another incident"
+    EXTERNAL = "external", "External dependency/known issue"
+    CANCELLED = "cancelled", "Cancelled - no longer relevant"

firefighter/incidents/factories.py

@@ -11,10 +11,10 @@ from factory.fuzzy import FuzzyChoice, FuzzyDateTime, FuzzyInteger
 
 from firefighter.incidents.enums import IncidentStatus
 from firefighter.incidents.models import (
-    Component,
     Environment,
     Group,
     Incident,
+    IncidentCategory,
     Priority,
     User,
 )
@@ -38,7 +38,12 @@ class GroupFactory(DjangoModelFactory[Group]):
     order = FuzzyInteger(100, 1000)  # type: ignore[no-untyped-call]
 
 
-class SeverityFactory(DjangoModelFactory[Priority]):
+class PriorityFactory(DjangoModelFactory[Priority]):
+    """Factory for creating Priority instances in tests.
+
+    Creates Priority objects with random values. Use specific values in tests
+    when testing priority-specific behavior (e.g., P1-P5 JIRA mapping).
+    """
     class Meta:
         model = Priority
 
@@ -47,6 +52,10 @@ class SeverityFactory(DjangoModelFactory[Priority]):
     order = FuzzyInteger(100, 1000)  # type: ignore[no-untyped-call]
 
 
+# Legacy alias - will be removed when Severity model is removed
+SeverityFactory = PriorityFactory
+
+
 class EnvironmentFactory(DjangoModelFactory[Environment]):
     class Meta:
         model = Environment
@@ -56,9 +65,9 @@ class EnvironmentFactory(DjangoModelFactory[Environment]):
     order = FuzzyInteger(100, 1000)  # type: ignore[no-untyped-call]
 
 
-class ComponentFactory(DjangoModelFactory[Component]):
+class IncidentCategoryFactory(DjangoModelFactory[IncidentCategory]):
     class Meta:
-        model = Component
+        model = IncidentCategory
 
     name = Faker("text", max_nb_chars=30)  # type: ignore[no-untyped-call]
     description = Faker("text", max_nb_chars=50)  # type: ignore[no-untyped-call]
@@ -86,7 +95,7 @@ class IncidentFactory(DjangoModelFactory[Incident]):
             tzinfo=timezone.get_current_timezone(),
         )
     )  # type: ignore[no-untyped-call]
-    component = Iterator(Component.objects.all())  # type: ignore[no-untyped-call]
+    incident_category = Iterator(IncidentCategory.objects.all())  # type: ignore[no-untyped-call]
     priority = Iterator(Priority.objects.all())  # type: ignore[no-untyped-call]
     environment = Iterator(Environment.objects.all())  # type: ignore[no-untyped-call]
 

firefighter/incidents/forms/close_incident.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from django import forms
 
 from firefighter.incidents.forms.utils import GroupedModelChoiceField
-from firefighter.incidents.models import Component
+from firefighter.incidents.models import IncidentCategory
 
 
 class CloseIncidentForm(forms.Form):
@@ -26,10 +26,10 @@ class CloseIncidentForm(forms.Form):
         max_length=1200,
         required=False,
     )
-    component = GroupedModelChoiceField(
+    incident_category = GroupedModelChoiceField(
         choices_groupby="group",
-        label="Issue category",
-        queryset=Component.objects.all()
+        label="Incident category",
+        queryset=IncidentCategory.objects.all()
         .select_related("group")
         .order_by(
             "group__order",

firefighter/incidents/forms/closure_reason.py

@@ -0,0 +1,45 @@
+"""Form for incident closure with reason when closing from early statuses."""
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from django import forms
+
+from firefighter.incidents.enums import ClosureReason
+
+if TYPE_CHECKING:
+    from firefighter.incidents.models import Incident
+
+
+class IncidentClosureReasonForm(forms.Form):
+    """Form for closing an incident with a mandatory reason from early statuses."""
+
+    closure_reason = forms.ChoiceField(
+        label="Closure Reason",
+        choices=ClosureReason.choices,
+        required=True,
+        help_text="Select the reason for closing this incident",
+    )
+    closure_reference = forms.CharField(
+        label="Reference (optional)",
+        max_length=100,
+        required=False,
+        help_text="Reference incident ID or external link for context (e.g., #1234 or URL)",
+    )
+    message = forms.CharField(
+        label="Closure Message",
+        widget=forms.Textarea,
+        required=True,
+        help_text="Brief explanation of why this incident is being closed",
+    )
+
+    def __init__(self, *args: Any, incident: Incident | None = None, **kwargs: Any) -> None:  # noqa: ARG002
+        super().__init__(*args, **kwargs)
+
+        # Exclude RESOLVED from choices as it's for normal workflow closure
+        closure_field = self.fields["closure_reason"]
+        if hasattr(closure_field, "choices"):
+            closure_field.choices = [
+                choice for choice in ClosureReason.choices
+                if choice[0] != ClosureReason.RESOLVED
+            ]

firefighter/incidents/forms/create_incident.py

@@ -6,7 +6,7 @@ from django import forms
 
 from firefighter.incidents.forms.select_impact import SelectImpactForm
 from firefighter.incidents.forms.utils import GroupedModelChoiceField
-from firefighter.incidents.models import Component, Environment, Priority
+from firefighter.incidents.models import Environment, IncidentCategory, Priority
 from firefighter.incidents.models.incident import Incident
 from firefighter.incidents.signals import create_incident_conversation
 
@@ -52,11 +52,11 @@ class CreateIncidentForm(CreateIncidentFormBase):
         max_length=1200,
     )
 
-    component = GroupedModelChoiceField(
+    incident_category = GroupedModelChoiceField(
         choices_groupby="group",
-        label="Issue category",
+        label="Incident category",
         queryset=(
-            Component.objects.all()
+            IncidentCategory.objects.all()
             .select_related("group")
             .order_by(
                 "group__order",