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

firefighter/raid/apps.py

@@ -20,35 +20,18 @@ class RaidConfig(AppConfig):
             incident_created,
             incident_updated,
         )
-        from firefighter.raid.views.open_normal import (
-            OpeningRaidCustomerModal,
-            OpeningRaidDocumentationRequestModal,
-            OpeningRaidFeatureRequestModal,
-            OpeningRaidInternalModal,
-            OpeningRaidSellerModal,
-        )
         from firefighter.slack.views.modals.open import INCIDENT_TYPES
+        from firefighter.slack.views.modals.opening.details.unified import (
+            OpeningUnifiedModal,
+        )
 
+        # Use unified form for all normal incidents (P4-P5)
+        # This replaces the previous 5 separate forms (Customer/Seller/Internal/Doc/Feature)
+        # STEP 3 (incident type selection) will be automatically hidden since len() == 1
         INCIDENT_TYPES["normal"] = {
-            "CUSTOMER": {
-                "label": "Customer",
-                "slack_form": OpeningRaidCustomerModal,
-            },
-            "SELLER": {
-                "label": "Seller",
-                "slack_form": OpeningRaidSellerModal,
-            },
-            "INTERNAL": {
-                "label": "Internal",
-                "slack_form": OpeningRaidInternalModal,
-            },
-            "DOCUMENTATION_REQUEST": {
-                "label": "Documentation request",
-                "slack_form": OpeningRaidDocumentationRequestModal,
-            },
-            "FEATURE_REQUEST": {
-                "label": "Feature request",
-                "slack_form": OpeningRaidFeatureRequestModal,
+            "normal": {
+                "label": "Normal",
+                "slack_form": OpeningUnifiedModal,
             },
         }
 

firefighter/raid/client.py

@@ -77,9 +77,9 @@ class RaidJiraClient(JiraClient):
                 f"Seller link to TOOLBOX: {TOOLBOX_URL}?seller_id={seller_contract_id}"
             )
             extra_args["customfield_10908"] = str(seller_contract_id)
-        if is_seller_in_golden_list:
+        if is_seller_in_golden_list is True:
             labels = [*labels, "goldenList"]
-        if is_key_account:
+        if is_key_account is True:
             labels = [*labels, "keyAccount"]
         if suggested_team_routing and suggested_team_routing != "SBI":
             description_addendum.append(

firefighter/raid/forms.py

@@ -3,15 +3,11 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Any, Never
 
-from django import forms
 from django.conf import settings
 from django.db import models
 from slack_sdk.errors import SlackApiError
 
-from firefighter.incidents.forms.create_incident import CreateIncidentFormBase
 from firefighter.incidents.forms.select_impact import SelectImpactForm
-from firefighter.incidents.forms.utils import GroupedModelChoiceField
-from firefighter.incidents.models import IncidentCategory
 from firefighter.incidents.models.priority import Priority
 from firefighter.jira_app.client import (
     JiraAPIError,
@@ -23,16 +19,7 @@ from firefighter.raid.messages import (
     SlackMessageRaidCreatedIssue,
     SlackMessageRaidModifiedIssue,
 )
-from firefighter.raid.models import FeatureTeam, JiraTicket
-from firefighter.raid.service import (
-    CustomerIssueData,
-    create_issue_customer,
-    create_issue_documentation_request,
-    create_issue_feature_request,
-    create_issue_internal,
-    create_issue_seller,
-    get_jira_user_from_user,
-)
+from firefighter.raid.models import JiraTicket
 from firefighter.raid.utils import get_domain_from_email
 from firefighter.slack.models.conversation import Conversation
 
@@ -63,230 +50,11 @@ def initial_priority() -> Priority:
     return Priority.objects.get(default=True)
 
 
-class CreateNormalIncidentFormBase(CreateIncidentFormBase):
-    platform = forms.ChoiceField(
-        label="Platform",
-        choices=PlatformChoices.choices,
-    )
-    title = forms.CharField(
-        label="Title",
-        max_length=128,
-        min_length=10,
-        widget=forms.TextInput(attrs={"placeholder": "What's going on?"}),
-    )
-    description = forms.CharField(
-        label="Summary",
-        min_length=10,
-        max_length=1200,
-    )
-    suggested_team_routing = forms.ModelChoiceField(
-        queryset=FeatureTeam.objects.only("name").order_by("name"),
-        label="Feature Team or Train",
-        required=True,
-    )
-    priority = forms.ModelChoiceField(
-        label="Priority",
-        queryset=Priority.objects.filter(enabled_create=True),
-        initial=initial_priority,
-        widget=forms.HiddenInput(),
-    )
-
-    field_order = [
-        "incident_category",
-        "platform",
-        "title",
-        "description",
-        "seller_contract_id",
-        "is_key_account",
-        "is_seller_in_golden_list",
-        "zoho_desk_ticket_id",
-        "zendesk_ticket_id",
-        "suggested_team_routing",
-    ]
-
-    def trigger_incident_workflow(
-        self,
-        creator: User,
-        impacts_data: dict[str, ImpactLevel],
-        *args: Any,
-        **kwargs: Any,
-    ) -> Any:
-        raise NotImplementedError
-
-
-class CreateNormalCustomerIncidentForm(CreateNormalIncidentFormBase):
-    incident_category = GroupedModelChoiceField(
-        choices_groupby="group",
-        queryset=IncidentCategory.objects.all().select_related("group").order_by("group__order", "name"),
-        label="Incident category"
-    )
-    zendesk_ticket_id = forms.CharField(
-        label="Zendesk Ticket ID", max_length=128, min_length=2, required=False
-    )
-
-    # XXX business impact: infer from impact/add in impact modal?
-    def trigger_incident_workflow(
-        self,
-        creator: User,
-        impacts_data: dict[str, ImpactLevel],
-        *args: Never,
-        **kwargs: Never,
-    ) -> None:
-        jira_user: JiraUser = get_jira_user_from_user(creator)
-        customer_data = CustomerIssueData(
-            priority=self.cleaned_data["priority"].value,
-            labels=[""],
-            platform=self.cleaned_data["platform"],
-            business_impact=str(get_business_impact(impacts_data)),
-            team_to_be_routed=self.cleaned_data["suggested_team_routing"],
-            area=None,
-            zendesk_ticket_id=self.cleaned_data["zendesk_ticket_id"],
-            incident_category=self.cleaned_data["incident_category"].name,
-        )
-        issue_data = create_issue_customer(
-            title=self.cleaned_data["title"],
-            description=self.cleaned_data["description"],
-            reporter=jira_user.id,
-            issue_data=customer_data,
-        )
-        process_jira_issue(
-            issue_data, creator, jira_user=jira_user, impacts_data=impacts_data
-        )
-
-
-class CreateRaidDocumentationRequestIncidentForm(CreateNormalIncidentFormBase):
-    incident_category = GroupedModelChoiceField(
-        choices_groupby="group",
-        queryset=IncidentCategory.objects.all().select_related("group").order_by("group__order", "name"),
-        label="Incident category"
-    )
-
-    def trigger_incident_workflow(
-        self,
-        creator: User,
-        impacts_data: dict[str, ImpactLevel],
-        *args: Never,
-        **kwargs: Never,
-    ) -> None:
-        jira_user: JiraUser = get_jira_user_from_user(creator)
-        issue_data = create_issue_documentation_request(
-            title=self.cleaned_data["title"],
-            description=self.cleaned_data["description"],
-            priority=self.cleaned_data["priority"].value,
-            reporter=jira_user.id,
-            platform=self.cleaned_data["platform"],
-            labels=[""],
-        )
-
-        process_jira_issue(
-            issue_data, creator, jira_user=jira_user, impacts_data=impacts_data
-        )
-
-
-class CreateRaidFeatureRequestIncidentForm(CreateNormalIncidentFormBase):
-    incident_category = GroupedModelChoiceField(
-        choices_groupby="group",
-        queryset=IncidentCategory.objects.all().select_related("group").order_by("group__order", "name"),
-        label="Incident category"
-    )
-
-    def trigger_incident_workflow(
-        self,
-        creator: User,
-        impacts_data: dict[str, ImpactLevel],
-        *args: Never,
-        **kwargs: Never,
-    ) -> None:
-        jira_user: JiraUser = get_jira_user_from_user(creator)
-        issue_data = create_issue_feature_request(
-            title=self.cleaned_data["title"],
-            description=self.cleaned_data["description"],
-            priority=self.cleaned_data["priority"].value,
-            reporter=jira_user.id,
-            platform=self.cleaned_data["platform"],
-            labels=[""],
-        )
-
-        process_jira_issue(
-            issue_data, creator, jira_user=jira_user, impacts_data=impacts_data
-        )
-
-
-class CreateRaidInternalIncidentForm(CreateNormalIncidentFormBase):
-    incident_category = GroupedModelChoiceField(
-        choices_groupby="group",
-        queryset=IncidentCategory.objects.all().select_related("group").order_by("group__order", "name"),
-        label="Incident category"
-    )
-
-    def trigger_incident_workflow(
-        self,
-        creator: User,
-        impacts_data: dict[str, ImpactLevel],
-        *args: Never,
-        **kwargs: Never,
-    ) -> None:
-        jira_user: JiraUser = get_jira_user_from_user(creator)
-        issue_data = create_issue_internal(
-            title=self.cleaned_data["title"],
-            description=self.cleaned_data["description"],
-            priority=self.cleaned_data["priority"].value,
-            reporter=jira_user.id,
-            platform=self.cleaned_data["platform"],
-            business_impact=str(get_business_impact(impacts_data)),
-            team_to_be_routed=self.cleaned_data["suggested_team_routing"],
-            incident_category=self.cleaned_data["incident_category"].name,
-            labels=[""],
-        )
-
-        process_jira_issue(
-            issue_data, creator, jira_user=jira_user, impacts_data=impacts_data
-        )
-
-
-class RaidCreateIncidentSellerForm(CreateNormalIncidentFormBase):
-    incident_category = GroupedModelChoiceField(
-        choices_groupby="group",
-        queryset=IncidentCategory.objects.all().select_related("group").order_by("group__order", "name"),
-        label="Incident category"
-    )
-    seller_contract_id = forms.CharField(
-        label="Seller Contract ID", max_length=128, min_length=0
-    )
-    is_key_account = forms.BooleanField(label="Is it a Key Account?", required=False)
-    is_seller_in_golden_list = forms.BooleanField(
-        label="Is the seller in the Golden List?", required=False
-    )
-    zoho_desk_ticket_id = forms.CharField(
-        required=False, label="Zoho Desk Ticket ID", max_length=128, min_length=1
-    )
-
-    def trigger_incident_workflow(
-        self,
-        creator: User,
-        impacts_data: dict[str, ImpactLevel],
-        *args: Never,
-        **kwargs: Never,
-    ) -> None:
-        jira_user: JiraUser = get_jira_user_from_user(creator)
-        issue_data = create_issue_seller(
-            title=self.cleaned_data["title"],
-            description=self.cleaned_data["description"],
-            priority=self.cleaned_data["priority"].value,
-            reporter=jira_user.id,
-            platform=self.cleaned_data["platform"],
-            business_impact=str(get_business_impact(impacts_data)),
-            team_to_be_routed=self.cleaned_data["suggested_team_routing"],
-            incident_category=self.cleaned_data["incident_category"].name,
-            zoho_desk_ticket_id=self.cleaned_data["zoho_desk_ticket_id"],
-            is_key_account=self.cleaned_data["is_key_account"],
-            is_seller_in_golden_list=self.cleaned_data["is_seller_in_golden_list"],
-            seller_contract_id=self.cleaned_data["seller_contract_id"],
-            labels=[""],
-        )
-        process_jira_issue(
-            issue_data, creator, jira_user=jira_user, impacts_data=impacts_data
-        )
+# NOTE: Incident creation forms have been unified and moved to:
+# firefighter.incidents.forms.unified_incident.UnifiedIncidentForm
+# This handles all incident types (P1-P5) with dynamic field visibility.
+# The following utility functions remain here as they are used by the unified form
+# and by JIRA webhook handlers.
 
 
 def process_jira_issue(
@@ -476,6 +244,75 @@ def get_business_impact(impacts_data: dict[str, ImpactLevel]) -> str | None:
     return impact_form.business_impact_new
 
 
+def prepare_jira_fields(
+    *,
+    title: str,
+    description: str,
+    priority: int,
+    reporter: str,
+    incident_category: str,
+    environments: list[str],
+    platforms: list[str],
+    impacts_data: dict[str, ImpactLevel],
+    optional_fields: dict[str, Any] | None = None,
+) -> dict[str, Any]:
+    """Prepare all fields for jira_client.create_issue().
+
+    This function centralizes Jira field preparation for both P1-P3 and P4-P5 incidents,
+    ensuring all custom fields are properly passed.
+
+    Args:
+        title: Incident title
+        description: Incident description
+        priority: Priority value (1-5)
+        reporter: Jira user account ID
+        incident_category: Category name
+        environments: List of environment values (e.g. ["PRD", "STG"])
+        platforms: List of platform values (e.g. ["platform-FR", "platform-DE"])
+        impacts_data: Dictionary of impact data for business_impact computation
+        optional_fields: Optional dictionary containing:
+            - zendesk_ticket_id: Zendesk ticket ID (customer-specific)
+            - seller_contract_id: Seller contract ID (seller-specific)
+            - zoho_desk_ticket_id: Zoho Desk ticket ID (seller-specific)
+            - is_key_account: Key account flag (seller-specific)
+            - is_seller_in_golden_list: Golden list flag (seller-specific)
+            - suggested_team_routing: Suggested team routing (P4-P5 only)
+
+    Returns:
+        Dictionary of kwargs ready for jira_client.create_issue()
+    """
+    business_impact = get_business_impact(impacts_data)
+    platform = platforms[0] if platforms else PlatformChoices.ALL.value
+
+    # Extract optional fields with defaults
+    opt = optional_fields or {}
+    zendesk_ticket_id = opt.get("zendesk_ticket_id", "")
+    seller_contract_id = opt.get("seller_contract_id", "")
+    zoho_desk_ticket_id = opt.get("zoho_desk_ticket_id", "")
+    is_key_account = opt.get("is_key_account")
+    is_seller_in_golden_list = opt.get("is_seller_in_golden_list")
+    suggested_team_routing = opt.get("suggested_team_routing")
+
+    return {
+        "issuetype": "Incident",
+        "summary": title,
+        "description": description,
+        "priority": priority,
+        "reporter": reporter,
+        "assignee": None,
+        "incident_category": incident_category,
+        "environments": environments,  # ✅ Always pass environments list
+        "platform": platform,
+        "business_impact": business_impact,
+        "zendesk_ticket_id": zendesk_ticket_id,
+        "seller_contract_id": seller_contract_id,
+        "zoho_desk_ticket_id": zoho_desk_ticket_id,
+        "is_key_account": is_key_account if is_key_account is not None else False,
+        "is_seller_in_golden_list": is_seller_in_golden_list if is_seller_in_golden_list is not None else False,
+        "suggested_team_routing": suggested_team_routing,
+    }
+
+
 def get_partner_alert_conversations(user_domain: str) -> QuerySet[Conversation]:
     # Get the right channel from tags
     return Conversation.objects.filter(tag__contains=f"raid_alert__{user_domain}")

firefighter/raid/signals/incident_created.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any, Never
+from typing import TYPE_CHECKING, Any
 
 from django.conf import settings
 from django.dispatch.dispatcher import receiver
 
 from firefighter.jira_app.client import JiraAPIError, JiraUserNotFoundError
 from firefighter.raid.client import client
+from firefighter.raid.forms import prepare_jira_fields
 from firefighter.raid.models import JiraTicket
 from firefighter.raid.service import get_jira_user_from_user
 from firefighter.slack.messages.slack_messages import (
@@ -26,31 +27,55 @@ APP_DISPLAY_NAME: str = settings.APP_DISPLAY_NAME
 
 @receiver(signal=incident_channel_done)
 def create_ticket(
-    sender: Any, incident: Incident, channel: IncidentChannel, **kwargs: Never
+    sender: Any, incident: Incident, channel: IncidentChannel, **kwargs: Any
 ) -> JiraTicket:
     # pylint: disable=unused-argument
 
+    # Extract jira_extra_fields and impacts_data from kwargs (passed from unified incident form)
+    jira_extra_fields = kwargs.get("jira_extra_fields", {})
+    impacts_data = kwargs.get("impacts_data", {})
+    logger.info(f"CREATE_TICKET - kwargs keys: {list(kwargs.keys())}")
+    logger.info(f"CREATE_TICKET - jira_extra_fields received: {jira_extra_fields}")
+
     jira_user = get_jira_user_from_user(incident.created_by)
     account_id = jira_user.id
-    # XXX Better description
-    # XXX Custom field with FireFighter ID/link?
-    # XXX Set affected environment custom field
-    # XXX Set custom field impacted area to group/domain?
+
     # Map Impact priority (1-5) to JIRA priority (1-5), fallback to P1 for invalid values
     priority: int = incident.priority.value if 1 <= incident.priority.value <= 5 else 1
-    issue = client.create_issue(
-        issuetype="Incident",
-        summary=incident.title,
-        description=f"""{incident.description}\n
+
+    # Build enhanced description with incident metadata
+    description = f"""{incident.description}\n
 \n
 🧯 This incident has been created for a critical incident. Links below to Slack and {APP_DISPLAY_NAME}.\n
 📦 Incident category: {incident.incident_category.name} ({incident.incident_category.group.name})\n
-{incident.priority.emoji} Priority: {incident.priority.name}\n""",
-        assignee=None,
-        reporter=account_id,
+{incident.priority.emoji} Priority: {incident.priority.name}\n"""
+
+    # Prepare all Jira fields using the common function
+    # P1-P3 use first environment only (for backward compatibility)
+    environments = jira_extra_fields.get("environments", [incident.environment.value])
+    platforms = jira_extra_fields.get("platforms", ["platform-All"])
+
+    jira_fields = prepare_jira_fields(
+        title=incident.title,
+        description=description,
         priority=priority,
+        reporter=account_id,
         incident_category=incident.incident_category.name,
+        environments=[environments[0]] if environments else [incident.environment.value],  # P1-P3: first only
+        platforms=platforms,
+        impacts_data=impacts_data,
+        optional_fields={
+            "zendesk_ticket_id": jira_extra_fields.get("zendesk_ticket_id", ""),
+            "seller_contract_id": jira_extra_fields.get("seller_contract_id", ""),
+            "zoho_desk_ticket_id": jira_extra_fields.get("zoho_desk_ticket_id", ""),
+            "is_key_account": jira_extra_fields.get("is_key_account"),
+            "is_seller_in_golden_list": jira_extra_fields.get("is_seller_in_golden_list"),
+            "suggested_team_routing": jira_extra_fields.get("suggested_team_routing"),
+        },
     )
+
+    # Create Jira issue with all prepared fields
+    issue = client.create_issue(**jira_fields)
     issue_id = issue.get("id")
     if issue_id is None:
         logger.error(f"Could not create Jira ticket for incident {incident.id}")

firefighter/raid/signals/incident_updated.py

@@ -24,10 +24,11 @@ def incident_updated_close_ticket_when_mitigated_or_postmortem(
     updated_fields: list[str],
     **kwargs: Any,
 ) -> None:
-    # Close Jira ticket if mitigated or postmortem
+    # Close Jira ticket if mitigated, postmortem, or closed
     if "_status" in updated_fields and incident_update.status in {
-        IncidentStatus.FIXED,
+        IncidentStatus.MITIGATED,
         IncidentStatus.POST_MORTEM,
+        IncidentStatus.CLOSED,
     }:
         if not hasattr(incident, "jira_ticket") or incident.jira_ticket is None:
             logger.warning(

firefighter/slack/messages/slack_messages.py

@@ -217,6 +217,21 @@ class SlackMessageIncidentDeclaredAnnouncement(SlackMessageSurface):
         ]
         if hasattr(self.incident, "jira_ticket") and self.incident.jira_ticket:
             fields.append(f":jira_new: <{self.incident.jira_ticket.url}|*Jira ticket*>")
+
+        # Add custom fields if present
+        if hasattr(self.incident, "custom_fields") and self.incident.custom_fields:
+            custom_fields = self.incident.custom_fields
+            if custom_fields.get("zendesk_ticket_id"):
+                fields.append(f":ticket: *Zendesk Ticket:* {custom_fields['zendesk_ticket_id']}")
+            if custom_fields.get("seller_contract_id"):
+                fields.append(f":memo: *Seller Contract:* {custom_fields['seller_contract_id']}")
+            if custom_fields.get("zoho_desk_ticket_id"):
+                fields.append(f":ticket: *Zoho Desk Ticket:* {custom_fields['zoho_desk_ticket_id']}")
+            if custom_fields.get("is_key_account") is True:
+                fields.append(":star: *Key Account*")
+            if custom_fields.get("is_seller_in_golden_list") is True:
+                fields.append(":medal: *Golden List Seller*")
+
         blocks: list[Block] = [
             SectionBlock(
                 text=f"{self.incident.priority.emoji} {self.incident.priority.name} - A new incident has been declared:"
@@ -442,7 +457,7 @@ class SlackMessageIncidentStatusUpdated(SlackMessageSurface):
 
         if self.in_channel:
             self.title_text = "A new incident update has been posted"
-        elif incident.status == IncidentStatus.FIXED and status_changed:
+        elif incident.status == IncidentStatus.MITIGATED and status_changed:
             self.title_text = f":large_green_circle:  Incident #{incident.slack_channel_name} has been {incident.status.label}.  :large_green_circle:"
         elif old_priority is not None and old_priority.value > 3:
             self.title_text = f"Incident #{incident.slack_channel_name} has escalated from {old_priority.name} to {incident.priority.name}."
@@ -509,7 +524,7 @@ class SlackMessageIncidentStatusUpdated(SlackMessageSurface):
                                 value=str(self.incident.id),
                                 action_id=UpdateStatusModal.open_action,
                             )
-                            if self.in_channel
+                            if self.in_channel and self.incident.status != IncidentStatus.CLOSED
                             else None
                         ),
                     ),
@@ -691,7 +706,7 @@ class SlackMessageDeployWarning(SlackMessageSurface):
         blocks = [
             HeaderBlock(
                 text=PlainTextObject(
-                    text=f":warning: Deploy warning {'(Mitigated) ' if self.incident.status == IncidentStatus.FIXED else ''}:warning:",
+                    text=f":warning: Deploy warning {'(Mitigated) ' if self.incident.status == IncidentStatus.MITIGATED else ''}:warning:",
                     emoji=True,
                 )
             ),
@@ -702,7 +717,7 @@ class SlackMessageDeployWarning(SlackMessageSurface):
             ),
         ]
 
-        if self.incident.status >= IncidentStatus.FIXED:
+        if self.incident.status >= IncidentStatus.MITIGATED:
             blocks.extend(
                 [
                     SectionBlock(

firefighter/slack/rules.py

@@ -31,7 +31,7 @@ def should_publish_in_general_channel(
     ):
         # If it has just been Mitigated
         if (
-            incident.status == IncidentStatus.FIXED
+            incident.status == IncidentStatus.MITIGATED
             and incident_update is not None
             and incident_update.status is not None
         ):

firefighter/slack/signals/create_incident_conversation.py

@@ -45,7 +45,12 @@ def create_incident_slack_conversation(
     Args:
         incident (Incident): The incident to open. It should be saved before calling this function, and have its first incident update created.
 
+    Kwargs:
+        jira_extra_fields (dict): Optional dictionary of customer/seller fields for Jira ticket
+
     """
+    # Extract jira_extra_fields from kwargs
+    jira_extra_fields = _kwargs.get("jira_extra_fields", {})
     channel: IncidentChannel | None = IncidentChannel.objects.create_incident_channel(
         incident=incident
     )
@@ -131,5 +136,6 @@ def create_incident_slack_conversation(
         sender=__name__,
         incident=incident,
         channel=channel,
+        jira_extra_fields=jira_extra_fields,
     )
     return None

firefighter/slack/signals/incident_updated.py

@@ -159,6 +159,11 @@ def incident_key_events_updated_handler(
     **kwargs: Any,
 ) -> None:
     logger.info("Received incident_key_events_updated signal")
+    # Skip key events for incidents closed directly
+    if incident.closure_reason:
+        logger.info(f"Skipping key events update for incident {incident.id} (direct closure)")
+        return
+
     # Everything in Slack views trigger the Slack handshake, so we delay the import
     from firefighter.slack.views.modals.key_event_message import (  # noqa: PLC0415
         SlackMessageKeyEvents,
@@ -196,7 +201,8 @@ def publish_status_update(
     if (
         incident.ask_for_milestones
         and status_changed
-        and incident.status >= IncidentStatus.FIXED
+        and incident.status >= IncidentStatus.MITIGATED
+        and not incident.closure_reason  # Don't show key events for direct closures
     ):
         from firefighter.slack.views.modals.key_event_message import (  # noqa: PLC0415
             SlackMessageKeyEvents,

firefighter/slack/views/modals/__init__.py

@@ -3,6 +3,10 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from firefighter.slack.views.modals.close import CloseModal, modal_close
+from firefighter.slack.views.modals.closure_reason import (
+    ClosureReasonModal,
+    modal_closure_reason,
+)
 from firefighter.slack.views.modals.downgrade_workflow import (
     DowngradeWorkflowModal,
     modal_dowgrade_workflow,