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

firefighter/raid/forms.py

@@ -3,12 +3,10 @@ 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.models.priority import Priority
 from firefighter.jira_app.client import (
@@ -21,15 +19,7 @@ from firefighter.raid.messages import (
     SlackMessageRaidCreatedIssue,
     SlackMessageRaidModifiedIssue,
 )
-from firefighter.raid.models import FeatureTeam, JiraTicket, RaidArea
-from firefighter.raid.service import (
-    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
 
@@ -60,204 +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"),
-        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 = [
-        "area",
-        "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):
-    area = forms.ModelChoiceField(queryset=RaidArea.objects.filter(area="Customers"))
-    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)
-        issue_data = create_issue_customer(
-            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"],
-            area=self.cleaned_data["area"].name,
-            zendesk_ticket_id=self.cleaned_data["zendesk_ticket_id"],
-            labels=[""],
-        )
-        process_jira_issue(
-            issue_data, creator, jira_user=jira_user, impacts_data=impacts_data
-        )
-
-
-class CreateRaidDocumentationRequestIncidentForm(CreateNormalIncidentFormBase):
-    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):
-    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):
-    area = forms.ModelChoiceField(
-        queryset=RaidArea.objects.filter(area="Internal").order_by("name")
-    )
-
-    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"],
-            area=self.cleaned_data["area"].name,
-            labels=[""],
-        )
-
-        process_jira_issue(
-            issue_data, creator, jira_user=jira_user, impacts_data=impacts_data
-        )
-
-
-class RaidCreateIncidentSellerForm(CreateNormalIncidentFormBase):
-    area = forms.ModelChoiceField(queryset=RaidArea.objects.filter(area="Sellers"))
-    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"],
-            area=self.cleaned_data["area"].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(
@@ -335,10 +132,15 @@ def alert_slack_new_jira_ticket(
                 message,
                 unfurl_links=False,
             )
-        except SlackApiError:
-            logger.exception(
-                f"Couldn't send private message to reporter {reporter_user.slack_user}"
-            )
+        except SlackApiError as e:
+            if e.response.get("error") == "messages_tab_disabled":
+                logger.warning(
+                    f"User {reporter_user.slack_user} has disabled private messages from bots"
+                )
+            else:
+                logger.exception(
+                    f"Couldn't send private message to reporter {reporter_user.slack_user}"
+                )
 
     # Get the right channels from tags
     channels = get_internal_alert_conversations(jira_ticket)
@@ -442,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/migrations/0003_delete_raidarea.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.23 on 2025-09-17 17:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("raid", "0002_featureteam_remove_qualifierrotation_jira_user_and_more"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="RaidArea",
+        ),
+    ]

firefighter/raid/models.py

@@ -58,25 +58,6 @@ class JiraTicketImpact(models.Model):
         return f"{self.jira_ticket.key}: {self.impact}"
 
 
-class RaidArea(models.Model):
-    id = models.AutoField(primary_key=True)
-    name = models.CharField(max_length=128)
-    area = models.CharField(
-        choices=(
-            ("Sellers", "Sellers"),
-            ("Internal", "Internal"),
-            ("Customers", "Customers"),
-        ),
-        max_length=32,
-    )
-
-    class Meta(TypedModelMeta):
-        unique_together = ("name", "area")
-
-    def __str__(self) -> str:
-        return self.name
-
-
 class FeatureTeam(models.Model):
     id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=80)
@@ -95,8 +76,8 @@ class FeatureTeam(models.Model):
 
     @property
     def get_team(self) -> str:
-        return "{self.name}  {self.jira_project_key}"
+        return f"{self.name}  {self.jira_project_key}"
 
     @property
     def get_key(self) -> str:
-        return "{self.jira_project_key}"
+        return f"{self.jira_project_key}"

firefighter/raid/serializers.py

@@ -114,7 +114,7 @@ class LandbotIssueRequestSerializer(serializers.ModelSerializer[JiraTicket]):
         ),
         help_text="List of labels to be added to the ticket. Labels cannot contain spaces and must not exceed 255 characters.",
     )
-    impacted_area = serializers.CharField(
+    incident_category = serializers.CharField(
         max_length=128,
         write_only=True,
         allow_null=True,
@@ -131,7 +131,8 @@ class LandbotIssueRequestSerializer(serializers.ModelSerializer[JiraTicket]):
         ],
     )
     priority = serializers.IntegerField(
-        min_value=1, max_value=4, write_only=True, allow_null=True
+        min_value=1, max_value=5, write_only=True, allow_null=True,
+        help_text="Priority level 1-5 (1=Critical, 2=High, 3=Medium, 4=Low, 5=Lowest)"
     )
     business_impact = serializers.ChoiceField(
         write_only=True, choices=["High", "Medium", "Low"], allow_null=True
@@ -198,7 +199,7 @@ class LandbotIssueRequestSerializer(serializers.ModelSerializer[JiraTicket]):
             seller_contract_id=validated_data["seller_contract_id"],
             zoho_desk_ticket_id=validated_data["zoho"],
             platform=validated_data["platform"],
-            area=validated_data["impacted_area"],
+            incident_category=validated_data["incident_category"],
             business_impact=validated_data["business_impact"],
             environments=validated_data["environments"],
             suggested_team_routing=validated_data["suggested_team_routing"],
@@ -239,7 +240,7 @@ class LandbotIssueRequestSerializer(serializers.ModelSerializer[JiraTicket]):
             "zoho",
             "platform",
             "reporter_email",
-            "impacted_area",
+            "incident_category",
             "labels",
             "environments",
             "issue_type",

firefighter/raid/service.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 from django.conf import settings
@@ -133,7 +134,7 @@ def create_issue_internal(
     platform: str,
     business_impact: str | None,
     team_to_be_routed: str | None,
-    area: str | None,
+    incident_category: str | None,
 ) -> JiraObject:
     """Creates a Jira Incident Issue of type Internal.
 
@@ -146,7 +147,7 @@ def create_issue_internal(
         platform (str): Platform of the issue
         business_impact (str): Business impact of the issue
         team_to_be_routed (str): Team to be routed
-        area (str): Area of the issue
+        incident_category (str): Incident category of the issue
     """
     issue = jira_client.create_issue(
         issuetype="Incident",
@@ -159,23 +160,30 @@ def create_issue_internal(
         platform=platform,
         business_impact=business_impact,
         suggested_team_routing=team_to_be_routed,
-        area=area,
+        incident_category=incident_category,
     )
     check_issue_id(issue, title=title, reporter=reporter)
     return issue
 
 
+@dataclass
+class CustomerIssueData:
+    """Data container for customer issue creation parameters."""
+    priority: int | None
+    labels: list[str] | None
+    platform: str
+    business_impact: str | None
+    team_to_be_routed: str | None
+    area: str | None
+    zendesk_ticket_id: str | None
+    incident_category: str | None = None
+
+
 def create_issue_customer(
     title: str,
     description: str,
     reporter: str,
-    priority: int | None,
-    labels: list[str] | None,
-    platform: str,
-    business_impact: str | None,
-    team_to_be_routed: str | None,
-    area: str | None,
-    zendesk_ticket_id: str | None,
+    issue_data: CustomerIssueData,
 ) -> JiraObject:
     """Creates a Jira Incident issue of type Customer.
 
@@ -183,13 +191,7 @@ def create_issue_customer(
         title (str): Summary of the issue
         description (str): Description of the issue
         reporter (str): Jira account id of the reporter
-        priority (int): Priority of the issue
-        labels (list[str]): Labels to add to the issue
-        platform (str): Platform of the issue
-        business_impact (str): Business impact of the issue
-        team_to_be_routed (str): Team to be routed
-        area (str): Area of the issue
-        zendesk_ticket_id (str): Zendesk ticket id
+        issue_data (CustomerIssueData): Container with issue parameters
     """
     issue = jira_client.create_issue(
         issuetype="Incident",
@@ -197,13 +199,13 @@ def create_issue_customer(
         description=description,
         assignee=None,
         reporter=reporter,
-        priority=priority,
-        labels=labels,
-        platform=platform,
-        business_impact=business_impact,
-        suggested_team_routing=team_to_be_routed,
-        area=area,
-        zendesk_ticket_id=zendesk_ticket_id,
+        priority=issue_data.priority,
+        labels=issue_data.labels,
+        platform=issue_data.platform,
+        business_impact=issue_data.business_impact,
+        suggested_team_routing=issue_data.team_to_be_routed,
+        zendesk_ticket_id=issue_data.zendesk_ticket_id,
+        incident_category=issue_data.incident_category,
     )
     check_issue_id(issue, title=title, reporter=reporter)
     return issue
@@ -218,7 +220,7 @@ def create_issue_seller(  # noqa: PLR0913, PLR0917
     platform: str,
     business_impact: str | None,
     team_to_be_routed: str | None,
-    area: str | None,
+    incident_category: str | None,
     seller_contract_id: str | None,
     is_key_account: bool | None,  # noqa: FBT001
     is_seller_in_golden_list: bool | None,  # noqa: FBT001
@@ -235,7 +237,7 @@ def create_issue_seller(  # noqa: PLR0913, PLR0917
         platform (str): Platform of the issue
         business_impact (str): Business impact of the issue
         team_to_be_routed (str): Team to be routed
-        area (str): Area of the issue
+        incident_category (str): Incident category of the issue
         seller_contract_id (str): Seller contract id
         is_key_account (bool): Is key account
         is_seller_in_golden_list (bool): Is seller in golden list
@@ -252,11 +254,11 @@ def create_issue_seller(  # noqa: PLR0913, PLR0917
         platform=platform,
         business_impact=business_impact,
         suggested_team_routing=team_to_be_routed,
-        area=area,
         seller_contract_id=seller_contract_id,
         is_key_account=is_key_account,
         is_seller_in_golden_list=is_seller_in_golden_list,
         zoho_desk_ticket_id=zoho_desk_ticket_id,
+        incident_category=incident_category,
     )
     check_issue_id(issue, title=title, reporter=reporter)
     return issue

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,29 +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?
-    priority: int = incident.priority.value if 1 <= incident.priority.value <= 4 else 1
-    issue = client.create_issue(
-        issuetype="Incident",
-        summary=incident.title,
-        description=f"""{incident.description}\n
+
+    # 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
+
+    # 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
-📦 Issue category: {incident.component.name} ({incident.component.group.name})\n
-{incident.priority.emoji} Priority: {incident.priority.name}\n""",
-        assignee=None,
-        reporter=account_id,
+📦 Incident category: {incident.incident_category.name} ({incident.incident_category.group.name})\n
+{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/raid/utils.py

@@ -33,7 +33,7 @@ def get_domain_from_email(email: str) -> str:
     if email.count("@") != 1:
         msg = f"Invalid email: {email}"
         raise ValueError(msg)
-    domain = email.split("@")[-1]
+    domain = email.rsplit("@", maxsplit=1)[-1]
     if not domain:
         msg = f"Invalid email: {email}"
         raise ValueError(msg)

firefighter/raid/views/__init__.py

@@ -37,7 +37,7 @@ if TYPE_CHECKING:
                 "zoho": "https://crmplus.zoho.eu/mycrmlink/index.do/cxapp/agent/mycompany/all/tickets/details/123456789",
                 "platform": "FR",
                 "reporter_email": "john.doe@mycompany.com",
-                "impacted_area": "Sellers>MF Stock Replenishment",
+                "incident_category": "Payment Processing",
                 "project": "SBI",
                 "labels": ["originBot", "ProductsMerge"],
                 "environments": ["PRD", "STG"],