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

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 %}

firefighter/incidents/templates/pages/{component_detail.html → incident_category_detail.html}

@@ -7,13 +7,13 @@
       <div class="flex items-center space-x-5">
         <div>
           <h1 class="text-xl leading-6 font-bold text-neutral-900 dark:text-neutral-50">
-            {{ component.name }}
+            {{ incident_category.name }}
           </h1>
         </div>
       </div>
       <div class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
 
-        {% if perms.incidents.change_components %}
+        {% if perms.incidents.change_incident_categories %}
           <a href="{{ admin_edit_url }}" target="_blank" rel="noopener noreferrer" class="btn btn-primary gap-2 ">
             <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-5" viewBox="0 0 20 20" fill="currentColor">
               <path d="M17.414 2.586a2 2 0 00-2.828 0L7 10.172V13h2.828l7.586-7.586a2 2 0 000-2.828z" />
@@ -27,26 +27,26 @@
 
     <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-12">
       <div class="space-y-6 lg:col-start-1 lg:col-span-7">
-        {% component "card" card_title="Issue category information" id="component-information" %}
+        {% component "card" card_title="Incident category information" id="incident-category-information" %}
           {% fill "card_content" %}
             <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-              {% if component.description %}
+              {% if incident_category.description %}
                 <div class="sm:col-span-2">
                   <dt class="text-sm font-medium text-neutral-500 dark:text-neutral-300">Description</dt>
-                  <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"> {{ component.description|urlize|linebreaksbr }}</dd>
+                  <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"> {{ incident_category.description|urlize|linebreaksbr }}</dd>
                 </div>
               {% endif %}
               <div class="sm:col-span-1">
                 <dt class="text-sm font-medium text-neutral-500 dark:text-neutral-300">Group</dt>
-                <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"> {{ component.group.name }}</dd>
+                <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"> {{ incident_category.group.name }}</dd>
               </div>
             </dl>
           {% endfill %}
         {% endcomponent %}
-        {% component "card" card_title="Responders groups" card_subtitle="People from these groups will be added to incidents created with this component" id="incident-responders-groups" %}
+        {% component "card" card_title="Responders groups" card_subtitle="People from these groups will be added to incidents created with this incident category" id="incident-responders-groups" %}
           {% fill "card_content" %}
             <ul role="list" class="mt-3 grid grid-cols-1 gap-5 sm:grid-cols-2 sm:gap-6 lg:grid-cols-3">
-              {% for usergroup in component.usergroups.all %}
+              {% for usergroup in incident_category.usergroups.all %}
                 <li class="col-span-1 flex rounded-md shadow-sm">
                   <div class="flex flex-1 items-center justify-between truncate rounded-md border border-neutral-200 dark:border-neutral-700">
                     <div class="flex-1 truncate px-4 py-2 text-sm">
@@ -56,7 +56,7 @@
                   </div>
                 </li>
               {% endfor %}
-              {% for conversation in component.conversations.all %}
+              {% for conversation in incident_category.conversations.all %}
                 <li class="col-span-1 flex rounded-md shadow-sm">
                   <div class="flex flex-1 items-center justify-between truncate rounded-md border border-neutral-200 dark:border-neutral-700">
                     <div class="flex-1 truncate px-4 py-2 text-sm">
@@ -74,13 +74,13 @@
       <div class="lg:col-start-8 lg:col-span-5 space-y-6 ">
         {% component "card" card_title="Other components in the same group" id="incident-timeline" %}
           {% fill "card_title" %}
-            <h2 id="{{ id }}-title" class="text-lg leading-6 font-medium text-neutral-900 dark:text-neutral-50">Other components in "{{ component.group.name }}"</h2>
+            <h2 id="{{ id }}-title" class="text-lg leading-6 font-medium text-neutral-900 dark:text-neutral-50">Other incident categories in "{{ incident_category.group.name }}"</h2>
           {% endfill %}
           {% fill "card_content" %}
             <ul class="mx-6 list-disc">
-              {% for other_component in component.group.component_set.all %}
-                {% if other_component.id != component.id %}
-                  <li><a href="{{ other_component.get_absolute_url }}" class="link"> {{ other_component.name }}</a></li>
+              {% for other_incident_category in incident_category.group.incidentcategory_set.all %}
+                {% if other_incident_category.id != incident_category.id %}
+                  <li><a href="{{ other_incident_category.get_absolute_url }}" class="link"> {{ other_incident_category.name }}</a></li>
                 {% endif %}
               {% endfor %}
             </ul>

firefighter/incidents/templates/pages/{component_list.html → incident_category_list.html}

@@ -1,7 +1,7 @@
 {% extends '../layouts/view_filters.html' %}
 
 {% block page_title %}
-  Issue category list <div role="status" class="hx-progress htmx-indicator inline">
+  Incident category list <div role="status" class="hx-progress htmx-indicator inline">
     <svg class="inline mr-2 w-6 h-6 text-gray-200 animate-spin dark:text-gray-600 fill-primary" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
       <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
@@ -12,7 +12,7 @@
 
 {% block page_actions %}
   {{ block.super }}
-  {% component "export_button" base_url="api:components-list" %}{% endcomponent %}
+  {% component "export_button" base_url="api:incident-categories-list" %}{% endcomponent %}
 {% endblock page_actions %}
 
 {% block page_content %}

firefighter/incidents/templates/pages/incident_detail.html

@@ -52,16 +52,16 @@
                 <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"> {% include "../layouts/partials/environment_pill.html" with environment=incident.environment only %}
                 </dd>
               </div>
-              {% if incident.component is not none %}
+              {% if incident.incident_category is not none %}
                 <div class="sm:col-span-1">
                   <dt class="text-sm font-medium text-neutral-500 dark:text-neutral-300">Group</dt>
-                  <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"> {{ incident.component.group }}</dd>
+                  <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"> {{ incident.incident_category.group }}</dd>
                 </div>
               {% endif %}
 
               <div class="sm:col-span-1">
                 <dt class="text-sm font-medium text-neutral-500 dark:text-neutral-300">Component</dt>
-                <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"><a class="link" href="{{ incident.component.get_absolute_url }}">{{ incident.component }}</a></dd>
+                <dd class="mt-1 text-sm text-neutral-900 dark:text-neutral-100"><a class="link" href="{{ incident.incident_category.get_absolute_url }}">{{ incident.incident_category }}</a></dd>
               </div>
 
 

firefighter/incidents/urls.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from django.urls import path
 
 from firefighter.incidents.views import views
-from firefighter.incidents.views.components.details import ComponentDetailView
-from firefighter.incidents.views.components.list import ComponentsViewList
+from firefighter.incidents.views.components.details import IncidentCategoryDetailView
+from firefighter.incidents.views.components.list import IncidentCategoriesViewList
 from firefighter.incidents.views.docs.metrics import MetricsView
 from firefighter.incidents.views.docs.role_types import (
     RoleTypeDetailView,
@@ -37,11 +37,11 @@ urlpatterns = [
         views.IncidentStatisticsView.as_view(),
         name="incident-statistics",
     ),
-    path("component/", ComponentsViewList.as_view(), name="component-list"),
+    path("incident-category/", IncidentCategoriesViewList.as_view(), name="incident-category-list"),
     path(
-        "component/<uuid:component_id>/",
-        ComponentDetailView.as_view(),
-        name="component-detail",
+        "incident-category/<uuid:incident_category_id>/",
+        IncidentCategoryDetailView.as_view(),
+        name="incident-category-detail",
     ),
     path(
         "user/<uuid:user_id>/",

firefighter/incidents/views/components/details.py

@@ -6,28 +6,28 @@ from typing import Any
 from django.db.models.query import Prefetch
 
 from firefighter.firefighter.views import CustomDetailView
-from firefighter.incidents.models import Component
+from firefighter.incidents.models import IncidentCategory
 
 logger = logging.getLogger(__name__)
 
 
-class ComponentDetailView(CustomDetailView[Component]):
-    template_name = "pages/component_detail.html"
-    context_object_name = "component"
-    pk_url_kwarg = "component_id"
-    model = Component
+class IncidentCategoryDetailView(CustomDetailView[IncidentCategory]):
+    template_name = "pages/incident_category_detail.html"
+    context_object_name = "incident_category"
+    pk_url_kwarg = "incident_category_id"
+    model = IncidentCategory
     select_related = ["group"]
 
-    queryset = Component.objects.select_related(*select_related).prefetch_related(
+    queryset = IncidentCategory.objects.select_related(*select_related).prefetch_related(
         Prefetch("usergroups")
     )
 
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         context = super().get_context_data(**kwargs)
-        component: Component = context["component"]
+        incident_category: IncidentCategory = context["incident_category"]
 
         additional_context = {
-            "page_title": f"{component.name} Component",
+            "page_title": f"{incident_category.name} Incident Category",
         }
 
         return {**context, **additional_context}

firefighter/incidents/views/components/list.py

@@ -7,9 +7,9 @@ from django.utils import timezone
 from django_filters.views import FilterView
 from django_tables2.views import SingleTableMixin
 
-from firefighter.incidents.models import Component
-from firefighter.incidents.models.component import ComponentFilterSet
-from firefighter.incidents.tables import ComponentsTable
+from firefighter.incidents.models import IncidentCategory
+from firefighter.incidents.models.incident_category import IncidentCategoryFilterSet
+from firefighter.incidents.tables import IncidentCategoriesTable
 
 if TYPE_CHECKING:
     from django_tables2.tables import Table
@@ -21,11 +21,11 @@ logger = logging.getLogger(__name__)
 TZ = timezone.get_current_timezone()
 
 
-class ComponentsViewList(SingleTableMixin, FilterView):
-    table_class = ComponentsTable
-    context_object_name = "components"
-    filterset_class = ComponentFilterSet
-    model = Component
+class IncidentCategoriesViewList(SingleTableMixin, FilterView):
+    table_class = IncidentCategoriesTable
+    context_object_name = "incident_categories"
+    filterset_class = IncidentCategoryFilterSet
+    model = IncidentCategory
 
     paginate_by = 150
     paginate_orphans = 20
@@ -46,7 +46,7 @@ class ComponentsViewList(SingleTableMixin, FilterView):
         if request.htmx and not request.htmx.boosted:
             template_name = "layouts/partials/partial_table_list_paginated.html"
         else:
-            template_name = "pages/component_list.html"
+            template_name = "pages/incident_category_list.html"
 
         return [template_name]
 

firefighter/incidents/views/reports.py

@@ -359,8 +359,8 @@ class _IncidentByDomainAnnotation(TypedDict):
 def get_incidents_by_domain(
     incidents: QuerySet[Incident],
 ) -> QuerySet[WithAnnotations[Group, _IncidentByDomainAnnotation]]:
-    return Group.objects.filter(component__incident__in=incidents).annotate(
-        incidents_nb=Count("component__incident", output_field=FloatField()),
+    return Group.objects.filter(incidentcategory__incident__in=incidents).annotate(
+        incidents_nb=Count("incidentcategory__incident", output_field=FloatField()),
     )
 
 

firefighter/incidents/views/users/details.py

@@ -34,13 +34,13 @@ class UserDetailView(CustomDetailView[User]):
             "conversation_set",
             queryset=Conversation.objects.not_incident_channel()
             .exclude(tag="")
-            .filter(components__isnull=False)
+            .filter(incident_categories__isnull=False)
             .distinct()
             .prefetch_related(Prefetch("members")),
         ),
         Prefetch(
             "usergroup_set",
-            queryset=UserGroup.objects.filter(components__isnull=False)
+            queryset=UserGroup.objects.filter(incident_categories__isnull=False)
             .distinct()
             .prefetch_related(Prefetch("members")),
         ),

firefighter/incidents/views/views.py

@@ -44,7 +44,7 @@ class IncidentListView(SingleTableMixin, FilterView):
     paginate_by = 125
     paginate_orphans = 15
     queryset = Incident.objects.select_related(
-        "priority", "component__group", "environment"
+        "priority", "incident_category__group", "environment"
     ).order_by("-id")
 
     def get_template_names(self) -> list[str]:
@@ -69,7 +69,7 @@ class IncidentListView(SingleTableMixin, FilterView):
             "status",
             "environment",
             "priority",
-            "component",
+            "incident_category",
         ]
 
         context["page_title"] = "Incidents List"
@@ -82,7 +82,7 @@ class IncidentStatisticsView(FilterView):
     filterset_class = IncidentFilterSet
     model = Incident
     queryset = (
-        Incident.objects.select_related("priority", "component__group", "environment")
+        Incident.objects.select_related("priority", "incident_category__group", "environment")
         .all()
         .order_by("-id")
     )
@@ -105,7 +105,7 @@ class IncidentStatisticsView(FilterView):
             "status",
             "environment",
             "priority",
-            "component",
+            "incident_category",
         ]
         context_data = weekly_dashboard_context(
             self.request, context.get("incidents_filtered", [])
@@ -123,7 +123,7 @@ class DashboardView(generic.ListView[Incident]):
     )
     queryset = (
         Incident.objects.filter(_status__lt=IncidentStatus.CLOSED)
-        .select_related("priority", "component__group", "environment", "created_by")
+        .select_related("priority", "incident_category__group", "environment", "created_by")
         .order_by("_status", "priority__value")
         .annotate(latest_event_ts=Subquery(sub.values("event_ts")))
     )
@@ -144,7 +144,7 @@ class IncidentDetailView(CustomDetailView[Incident]):
     select_related = [
         "priority",
         "environment",
-        "component__group",
+        "incident_category__group",
         "conversation",
         "created_by",
     ]
@@ -155,7 +155,7 @@ class IncidentDetailView(CustomDetailView[Incident]):
             "incidentupdate_set",
             queryset=IncidentUpdate.objects.select_related(
                 "priority",
-                "component__group",
+                "incident_category__group",
                 "created_by__slack_user",
                 "created_by",
                 "commander",

firefighter/jira_app/client.py

@@ -273,7 +273,7 @@ class JiraClient:
         name = jira_api_user.raw.get("displayName")
         if not name or not isinstance(name, str):
             logger.warning("User %s has no display name, using email as name", email)
-            name = email.split("@")[0]
+            name = email.split("@", maxsplit=1)[0]
         try:
             user: User = User.objects.create(
                 name=name,

firefighter/logging/custom_json_formatter.py

@@ -7,7 +7,8 @@ from socket import socket
 from typing import TYPE_CHECKING, Any
 
 from django.conf import settings
-from pythonjsonlogger.jsonlogger import RESERVED_ATTRS, JsonEncoder, JsonFormatter
+from pythonjsonlogger.core import RESERVED_ATTRS
+from pythonjsonlogger.json import JsonEncoder, JsonFormatter
 
 if TYPE_CHECKING:
     from logging import LogRecord

firefighter/pagerduty/tasks/trigger_oncall.py

@@ -38,7 +38,7 @@ def trigger_oncall(
         details = f"""Triggered from {APP_DISPLAY_NAME} incident #{incident.id} {f"by {triggered_by.full_name}" if triggered_by else ""}
 Priority: {incident.priority}
 Environment: {incident.environment}
-Issue category: {incident.component.group.name} - {incident.component.name}
+Incident category: {incident.incident_category.group.name} - {incident.incident_category.name}
 FireFighter page: {incident.status_page_url + "?utm_medium=FireFighter+PagerDuty&utm_source=PagerDuty+Incident&utm_campaign=OnCall+Message+In+Channel"}
 Slack channel #{incident.slack_channel_name}: {incident.slack_channel_url}
 

firefighter/raid/admin.py

@@ -8,7 +8,6 @@ from firefighter.raid.models import (
     FeatureTeam,
     JiraTicket,
     JiraTicketImpact,
-    RaidArea,
 )
 from firefighter.raid.resources import FeatureTeamResource
 
@@ -31,16 +30,6 @@ class JiraTicketAdmin(JiraIssueAdmin):
     inlines = [JiraTicketImpactInline]
 
 
-@admin.register(RaidArea)
-class RaidAreaAdmin(admin.ModelAdmin[RaidArea]):
-    model = RaidArea
-    list_display = ["id", "name", "area"]
-    list_display_links = ["id", "name"]
-    list_filter = ["area"]
-    search_fields = ["id", "name"]
-    ordering = ["area", "name"]
-
-
 @admin.register(FeatureTeam)
 class FeatureTeamAdmin(ImportExportModelAdmin):
     resource_class = FeatureTeamResource

firefighter/raid/client.py

@@ -52,8 +52,8 @@ class RaidJiraClient(JiraClient):
         suggested_team_routing: str | None = None,
         business_impact: str | None = None,
         platform: str | None = None,
-        area: str | None = None,
         environments: list[str] | None = None,
+        incident_category: str | None = None,
         project: str | None = None,
     ) -> JiraObject:
         description_addendum: list[str] = []
@@ -68,8 +68,6 @@ class RaidJiraClient(JiraClient):
             if not 1 <= priority <= 5:
                 raise ValueError("Priority must be between 1 and 5")
             priority_value = str(priority)
-        if area:
-            extra_args["customfield_10920"] = str(area)
         if zoho_desk_ticket_id:
             extra_args["customfield_10896"] = str(zoho_desk_ticket_id)
         if zendesk_ticket_id:
@@ -96,6 +94,8 @@ class RaidJiraClient(JiraClient):
             extra_args["customfield_10201"] = {"value": platform}
         if environments:
             extra_args["customfield_11049"] = [{"value": e} for e in environments]
+        if incident_category and settings.RAID_JIRA_INCIDENT_CATEGORY_FIELD:
+            extra_args[settings.RAID_JIRA_INCIDENT_CATEGORY_FIELD] = {"value": incident_category}
         if len(description_addendum) > 0:
             description_addendum_str = "\n *Additional Information* \n" + "\n".join(
                 description_addendum

firefighter/raid/forms.py

@@ -10,6 +10,8 @@ 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,
@@ -21,8 +23,9 @@ from firefighter.raid.messages import (
     SlackMessageRaidCreatedIssue,
     SlackMessageRaidModifiedIssue,
 )
-from firefighter.raid.models import FeatureTeam, JiraTicket, RaidArea
+from firefighter.raid.models import FeatureTeam, JiraTicket
 from firefighter.raid.service import (
+    CustomerIssueData,
     create_issue_customer,
     create_issue_documentation_request,
     create_issue_feature_request,
@@ -77,7 +80,7 @@ class CreateNormalIncidentFormBase(CreateIncidentFormBase):
         max_length=1200,
     )
     suggested_team_routing = forms.ModelChoiceField(
-        queryset=FeatureTeam.objects.only("name"),
+        queryset=FeatureTeam.objects.only("name").order_by("name"),
         label="Feature Team or Train",
         required=True,
     )
@@ -89,7 +92,7 @@ class CreateNormalIncidentFormBase(CreateIncidentFormBase):
     )
 
     field_order = [
-        "area",
+        "incident_category",
         "platform",
         "title",
         "description",
@@ -112,7 +115,11 @@ class CreateNormalIncidentFormBase(CreateIncidentFormBase):
 
 
 class CreateNormalCustomerIncidentForm(CreateNormalIncidentFormBase):
-    area = forms.ModelChoiceField(queryset=RaidArea.objects.filter(area="Customers"))
+    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
     )
@@ -126,17 +133,21 @@ class CreateNormalCustomerIncidentForm(CreateNormalIncidentFormBase):
         **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"],
+        customer_data = CustomerIssueData(
             priority=self.cleaned_data["priority"].value,
-            reporter=jira_user.id,
+            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=self.cleaned_data["area"].name,
+            area=None,
             zendesk_ticket_id=self.cleaned_data["zendesk_ticket_id"],
-            labels=[""],
+            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
@@ -144,6 +155,12 @@ class CreateNormalCustomerIncidentForm(CreateNormalIncidentFormBase):
 
 
 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,
@@ -167,6 +184,12 @@ class CreateRaidDocumentationRequestIncidentForm(CreateNormalIncidentFormBase):
 
 
 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,
@@ -190,8 +213,10 @@ class CreateRaidFeatureRequestIncidentForm(CreateNormalIncidentFormBase):
 
 
 class CreateRaidInternalIncidentForm(CreateNormalIncidentFormBase):
-    area = forms.ModelChoiceField(
-        queryset=RaidArea.objects.filter(area="Internal").order_by("name")
+    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(
@@ -210,7 +235,7 @@ class CreateRaidInternalIncidentForm(CreateNormalIncidentFormBase):
             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,
+            incident_category=self.cleaned_data["incident_category"].name,
             labels=[""],
         )
 
@@ -220,7 +245,11 @@ class CreateRaidInternalIncidentForm(CreateNormalIncidentFormBase):
 
 
 class RaidCreateIncidentSellerForm(CreateNormalIncidentFormBase):
-    area = forms.ModelChoiceField(queryset=RaidArea.objects.filter(area="Sellers"))
+    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
     )
@@ -248,7 +277,7 @@ class RaidCreateIncidentSellerForm(CreateNormalIncidentFormBase):
             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,
+            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"],
@@ -335,10 +364,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)

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}"