firefighter-incident 0.0.10__tar.gz → 0.0.12__tar.gz

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.10
+Version: 0.0.12
 Summary: Incident Management tool made for Slack using Django
 Project-URL: Repository, https://github.com/ManoManoTech/firefighter-incident
 Project-URL: Documentation, https://manomanotech.github.io/firefighter-incident/latest/

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/firefighter/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.10'
-__version_tuple__ = version_tuple = (0, 0, 10)
+__version__ = version = '0.0.12'
+__version_tuple__ = version_tuple = (0, 0, 12)

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/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}
-Component: {incident.component}
+Issue category: {incident.component.group.name} - {incident.component.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_incident-0.0.10 → firefighter_incident-0.0.12}/firefighter/raid/client.py

@@ -65,8 +65,8 @@ class RaidJiraClient(JiraClient):
         if priority is None:
             priority_value = "-"
         else:
-            if not 1 <= priority <= 4:
-                raise ValueError("Priority must be between 1 and 4")
+            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)

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/firefighter/raid/signals/incident_created.py

@@ -43,7 +43,7 @@ def create_ticket(
         description=f"""{incident.description}\n
 \n
 🧯 This incident has been created for a critical incident. Links below to Slack and {APP_DISPLAY_NAME}.\n
-📦 Component: {incident.component.name} ({incident.component.group.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,

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/firefighter/slack/messages/slack_messages.py

@@ -210,7 +210,7 @@ class SlackMessageIncidentDeclaredAnnouncement(SlackMessageSurface):
     def get_blocks(self) -> list[Block]:
         fields = [
             f"{self.incident.priority.emoji} *Priority:* {self.incident.priority.name}",
-            f":package: *Component:* {self.incident.component.name}",
+            f":package: *Issue category:* {self.incident.component.name}",
             f":speaking_head_in_silhouette: *Opened by:* {user_slack_handle_or_name(self.incident.created_by)}",
             f":calendar: *Created at:* {date_time(self.incident.created_at)}",
             f"{SLACK_APP_EMOJI} <{self.incident.status_page_url + '?utm_medium=FireFighter+Slack&utm_source=Slack+Message&utm_campaign=Announcement+Message+In+Channel'}|*{APP_DISPLAY_NAME} Status Page*>",
@@ -270,7 +270,7 @@ class SlackMessageIncidentDeclaredAnnouncementGeneral(SlackMessageSurface):
     def get_blocks(self) -> list[Block]:
         fields = [
             f"{self.incident.priority.emoji} *Priority:* {self.incident.priority.name}",
-            f":package: *Component:* {self.incident.component.name}",
+            f":package: *Issue category:* {self.incident.component.name}",
             f"{SLACK_APP_EMOJI} <{self.incident.status_page_url + '?utm_medium=FireFighter+Slack&utm_source=Slack+Message&utm_campaign=Announcement+Message+General'}|*{APP_DISPLAY_NAME} Status Page*>",
             f":speaking_head_in_silhouette: *Opened by:* {user_slack_handle_or_name(self.incident.created_by)}",
             f":calendar: *Created at:* {date_time(self.incident.created_at)}",
@@ -486,7 +486,7 @@ class SlackMessageIncidentStatusUpdated(SlackMessageSurface):
             if self.incident_update.component:
                 fields.append(
                     MarkdownTextObject(
-                        text=f":package: *Component:* {self.incident.component.group.name} - {self.incident.component.name}"
+                        text=f":package: *Issue category:* {self.incident.component.group.name} - {self.incident.component.name}"
                     )
                 )
             if self.incident_update.environment:

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/firefighter/slack/views/events/home.py

@@ -148,7 +148,7 @@ def _home_incident_element(
                     text=f":rotating_light: *Priority:* {incident.priority.emoji} {incident.priority.name}"
                 ),
                 MarkdownTextObject(
-                    text=f":package: *Component:* {incident.component.group.name} - {incident.component.name}"
+                    text=f":package: *Issue category:* {incident.component.group.name} - {incident.component.name}"
                 ),
                 MarkdownTextObject(
                     text=f":speaking_head_in_silhouette: *Last update:* {date_time(incident.updated_at)}"

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/firefighter/slack/views/modals/open.py

@@ -12,7 +12,6 @@ from django.utils.translation import ngettext
 from slack_sdk.models.blocks.basic_components import MarkdownTextObject, Option
 from slack_sdk.models.blocks.block_elements import ButtonElement, StaticSelectElement
 from slack_sdk.models.blocks.blocks import (
-    ActionsBlock,
     Block,
     ContextBlock,
     DividerBlock,
@@ -74,7 +73,9 @@ class OpenModal(SlackModal):
         # 1. Check if impact form is good
         is_impact_form_valid: bool = self._check_impact_form(open_incident_context)
 
-        # 2. Check if we have a normal incident type
+        # 2. Auto-determine response type based on priority
+        self._auto_set_response_type(open_incident_context)
+
         incident_type_value: str | None = open_incident_context.get(
             "incident_type", None
         )
@@ -181,11 +182,18 @@ class OpenModal(SlackModal):
             SelectImpactModal,
         )
 
+        # Check if we have actual impacts (not all "NO") by checking if response_type is set
+        has_real_impacts = open_incident_context.get("response_type") is not None
+
+        # Show ✅ only if form is valid AND has real impacts, otherwise 📝
+        emoji = "✅" if impact_form_done and has_real_impacts else "📝"
+        button_text = "Edit impacts" if impact_form_done and has_real_impacts else "Set impacts"
+
         return [
             SectionBlock(
-                text=f"{'✅' if impact_form_done else '📝'} First, define the incident impacts and priority.",
+                text=f"{emoji} First, define the incident impacts and priority.",
                 accessory=ButtonElement(
-                    text="Edit impacts" if impact_form_done else "Set impacts",
+                    text=button_text,
                     action_id=SelectImpactModal.push_action,
                     value=json.dumps(open_incident_context, cls=SlackFormJSONEncoder),
                 ),
@@ -292,11 +300,11 @@ class OpenModal(SlackModal):
 
             if slack_msg is None:
                 slack_msg = "> :slack: A dedicated Slack channel will be created, and responders will be invited to help.\n"
-            text = f"> :firefighter_incident: This will trigger a critical incident response.\n{slack_msg}> :jira_new: An associated Jira ticket will also be created."
+            text = "> :jira_new: An associated Jira ticket will also be created."
             if not is_during_office_hours(timezone.now()):
                 text += "\n> :pagerduty: If you need it, you'll be able to escalate the incident to our 24/7 on-call response teams."
         else:
-            text = "> :raid_logo: This will trigger a normal incident response.\n> :jira_new: A Jira ticket will be created."
+            text = "> :jira_new: A Jira ticket will be created."
         done_review_blocks += [SectionBlock(text=text)]
 
         return done_review_blocks
@@ -371,40 +379,53 @@ class OpenModal(SlackModal):
 
         return is_valid, details_form_class, details_form
 
+    @staticmethod
+    def _auto_set_response_type(open_incident_context: OpeningData) -> None:
+        """Auto-determine response type based on priority from impact form."""
+        impact_form_data = open_incident_context.get("impact_form_data")
+        if not impact_form_data:
+            # Clear response_type and priority if no impact data
+            open_incident_context.pop("response_type", None)
+            open_incident_context.pop("priority", None)
+            return
+
+        impact_form = SelectImpactForm(impact_form_data)
+        if not impact_form.is_valid():
+            # Clear response_type and priority if form is invalid
+            open_incident_context.pop("response_type", None)
+            open_incident_context.pop("priority", None)
+            return
+
+        priority_value = impact_form.suggest_priority_from_impact()
+
+        # If no impacts are selected (all set to "NO"), don't set priority/response_type
+        # Priority value 6 corresponds to LevelChoices.NONE.priority
+        if priority_value == 6:
+            open_incident_context.pop("response_type", None)
+            open_incident_context.pop("priority", None)
+            return
+
+        priority = Priority.objects.get(value=priority_value)
+
+        # Set priority in context
+        open_incident_context["priority"] = priority
+
+        # Set response type based on priority recommendation
+        if priority.recommended_response_type:
+            open_incident_context["response_type"] = cast("ResponseType | None", priority.recommended_response_type)
+        else:
+            # Default fallback: P1/P2/P3 = critical, P4/P5 = normal
+            response_type = cast("ResponseType", "critical" if priority_value < 4 else "normal")
+            open_incident_context["response_type"] = response_type
+
     @staticmethod
     def _build_response_type_blocks(open_incident_context: OpeningData) -> list[Block]:
         selected_response_type = open_incident_context.get("response_type")
         if selected_response_type not in {"critical", "normal"}:
             return []
 
-        response_types: list[ResponseType] = cast(
-            "list[ResponseType]", INCIDENT_TYPES.keys()
-        )
-        elements: list[ButtonElement] = []
-
-        for response_type in response_types:
-            if response_type != selected_response_type:
-                continue
-
-            is_selected = (
-                open_incident_context.get("response_type") == response_type
-                or len(INCIDENT_TYPES) == 1
-            )
-            style: str | None = "primary" if is_selected else None
-            text = (
-                ":slack: Slack :jira_new: Jira ticket"
-                if response_type == "critical"
-                else ":jira_new: Jira ticket"
-            )
-            button = ButtonElement(
-                text=text,
-                action_id=f"incident_open_set_res_type_{response_type}",
-                value=json.dumps(open_incident_context, cls=SlackFormJSONEncoder),
-                style=style,
-            )
-            elements.append(button)
-
-        blocks: list[Block] = [ActionsBlock(elements=elements)]
+        blocks: list[Block] = []
+        # No buttons needed - response type is auto-determined
         if impact_form_data := open_incident_context.get("impact_form_data"):
             impact_form = SelectImpactForm(impact_form_data)
             if impact_form.is_valid():
@@ -414,6 +435,7 @@ class OpenModal(SlackModal):
                 process = ":slack: Slack :jira_new: Jira ticket" if open_incident_context.get("response_type") == "critical" else ":jira_new: Jira ticket"
 
                 impact_descriptions = OpenModal._get_impact_descriptions(open_incident_context)
+
                 blocks.append(
                     ContextBlock(
                         elements=[
@@ -422,12 +444,12 @@ class OpenModal(SlackModal):
                                 f"> ⏱️ SLA: {priority.sla}\n"
                                 f"> :gear: Process: {process}\n"
                                 f"> :pushpin: Selected impacts:\n"
-                                f"{impact_descriptions}\n"
+                                f"{impact_descriptions}"
                                 + (
                                     (
-                                        "\n> Critical incidents are for *emergency* only"
+                                        "> :warning: Critical incidents are for *emergency* only"
                                         + (
-                                            f" <{SLACK_SEVERITY_HELP_GUIDE_URL}|learn more>"
+                                            f" <{SLACK_SEVERITY_HELP_GUIDE_URL}|more info>"
                                             if SLACK_SEVERITY_HELP_GUIDE_URL
                                             else "."
                                         )
@@ -459,18 +481,56 @@ class OpenModal(SlackModal):
     @staticmethod
     def _get_impact_descriptions(open_incident_context: OpeningData) -> str:
         impact_form_data = open_incident_context.get("impact_form_data", {})
+        if not impact_form_data:
+            return ""
+
         impact_descriptions = ""
-        if impact_form_data:
-            for value in impact_form_data.values():
-                if value.name != "NO" and value.description:
-                    if hasattr(value, "impact_type_id") and value.impact_type_id:
-                        impact_type = ImpactType.objects.get(pk=value.impact_type_id)
-                        if impact_type:
-                            impact_descriptions += f"> \u00A0\u00A0 :exclamation: {impact_type} - {value}\n"
-                    for line in str(value.description).splitlines():
-                        impact_descriptions += f"> \u00A0\u00A0\u00A0\u00A0\u00A0\u00A0 • {line}\n"
+        for field_name, original_value in impact_form_data.items():
+            value = original_value
+            # Handle case where value might be an ID instead of an object
+            if isinstance(value, int | str) and not hasattr(value, "name"):
+                # Try to get the object from the database
+                form = SelectImpactForm()
+                if field_name in form.fields:
+                    field = form.fields[field_name]
+                    if hasattr(field, "queryset") and field.queryset is not None:
+                        try:
+                            value = field.queryset.get(pk=value)
+                        except field.queryset.model.DoesNotExist:
+                            logger.warning(f"Could not find impact object with pk={value} for field {field_name}")
+                            continue
+
+            description = OpenModal._format_single_impact_description(value)
+            if description:
+                impact_descriptions += description
         return impact_descriptions
 
+    @staticmethod
+    def _format_single_impact_description(value: Any) -> str:
+        """Format a single impact value into description text."""
+        # Handle object with name and description attributes (impact levels)
+        if hasattr(value, "name") and hasattr(value, "description"):
+            if value.name == "NO" or not value.description:
+                return ""
+
+            description = ""
+            # Add impact type header if available
+            if hasattr(value, "impact_type_id") and value.impact_type_id:
+                try:
+                    impact_type = ImpactType.objects.get(pk=value.impact_type_id)
+                    # Use value.name instead of value to avoid showing IDs
+                    description += f"> \u00A0\u00A0 :exclamation: {impact_type} - {value.name}\n"
+                except ImpactType.DoesNotExist:
+                    description += f"> \u00A0\u00A0 :exclamation: {value.name}\n"
+
+            # Add description lines
+            for line in str(value.description).splitlines():
+                description += f"> \u00A0\u00A0\u00A0\u00A0\u00A0\u00A0 • {line}\n"
+            return description
+
+        # Skip string values - incident_type is handled separately, not in impact descriptions
+        return ""
+
     @staticmethod
     def get_details_modal_form_class(
         open_incident_context: OpeningData,
@@ -531,21 +591,7 @@ class OpenModal(SlackModal):
                     logger.exception("Error triggering incident workflow")
                     # XXX warn the user via DM!
 
-    @app.action("incident_open_set_res_type_normal")
-    @app.action("incident_open_set_res_type_critical")
-    @staticmethod
-    def handle_set_incident_response_type_action(
-        ack: Ack, body: dict[str, Any]
-    ) -> None:
-        action_name: str = body.get("actions", [{}])[0].get("action_id", "")
-        action_name = action_name.replace("incident_open_set_res_type_", "")
-        opening_data = cast(
-            "OpeningData", json.loads(body.get("actions", [{}])[0].get("value", {})) or {}
-        )
-
-        OpenModal._update_incident_modal(
-            action_name, "response_type", ack, body, opening_data
-        )
+# Response type buttons removed - now auto-determined based on priority
 
     @app.action("set_type")
     @staticmethod
@@ -567,7 +613,11 @@ class OpenModal(SlackModal):
         body: dict[str, Any],
         opening_data: OpeningData,
     ) -> None:
-        data: OpeningData = {**opening_data, metadata_key: action_value}  # type: ignore
+        # Ensure we preserve all existing data, especially impact_form_data
+        data: OpeningData = OpeningData()
+        data.update(opening_data)
+        data[metadata_key] = action_value
+
         user = get_user_from_context(body)
         view = cls().build_modal_fn(open_incident_context=data, user=user)
 

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/firefighter/slack/views/modals/opening/select_impact.py

@@ -205,7 +205,16 @@ class SelectImpactModal(
     def _calculate_proposed_incident_type(
         suggested_priority_value: int,
     ) -> ResponseType:
-        return "critical" if suggested_priority_value <= 3 else "normal"
+        try:
+            priority = Priority.objects.get(value=suggested_priority_value)
+            # Use priority recommendation if available
+            if priority.recommended_response_type:
+                return cast("ResponseType", priority.recommended_response_type)
+        except Priority.DoesNotExist:
+            logger.warning(f"Priority with value {suggested_priority_value} does not exist")
+
+        # Fallback logic: P1/P2/P3 = critical, P4/P5 = normal
+        return cast("ResponseType", "critical" if suggested_priority_value < 4 else "normal")
 
     @staticmethod
     def _update_private_metadata(
@@ -230,12 +239,36 @@ class SelectImpactModal(
                     )
                 except queryset.model.DoesNotExist:
                     form.form.data[field_name] = None  # type: ignore
+        suggested_priority_value = form.form.suggest_priority_from_impact()
+
+        # If no impacts are selected (all set to "NO"), don't set priority/response_type
+        if suggested_priority_value == 6:  # LevelChoices.NONE.priority
+            return OpeningData(
+                priority=None,
+                response_type=None,
+                impact_form_data=cast("dict[str, Any]", form.form.data),
+                details_form_data=private_metadata_raw.get("details_form_data", {}),
+                incident_type=private_metadata_raw.get("incident_type"),
+            )
+
+        try:
+            priority = Priority.objects.get(value=suggested_priority_value)
+        except Priority.DoesNotExist as err:
+            logger.exception(
+                f"Priority with value {suggested_priority_value} does not exist"
+            )
+            # Fallback to default priority (assuming P3 exists)
+            fallback_priority = Priority.objects.filter(value__gte=3).first()
+            if not fallback_priority:
+                # If no priority exists, create a minimal fallback
+                logger.exception("No priority found in database")
+                raise ValueError("No priority configuration found in database") from err
+            priority = fallback_priority
+
         return OpeningData(
-            priority=Priority.objects.get(
-                value=form.form.suggest_priority_from_impact()
-            ),
+            priority=priority,
             response_type=SelectImpactModal._calculate_proposed_incident_type(
-                form.form.suggest_priority_from_impact()
+                suggested_priority_value
             ),
             impact_form_data=cast("dict[str, Any]", form.form.data),
             details_form_data=private_metadata_raw.get("details_form_data", {}),

{firefighter_incident-0.0.10 → firefighter_incident-0.0.12}/firefighter_tests/test_slack/views/modals/test_open.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 from typing import Any
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, Mock, patch
 
 import pytest
-from slack_sdk.models.blocks.block_elements import ButtonElement
 from slack_sdk.models.blocks.blocks import (
-    ActionsBlock,
+    ContextBlock,
 )
 
 from firefighter.incidents.forms.create_incident import CreateIncidentFormBase
@@ -102,14 +101,32 @@ def test_validate_details_form_invalid() -> None:
 
 
 def test_build_response_type_blocks_bis(open_incident_context: OpeningData) -> None:
+    # With no impact_form_data, should return empty list
     open_incident_context["response_type"] = "critical"
     blocks = OpenModal._build_response_type_blocks(open_incident_context)
+    assert len(blocks) == 0
 
-    assert len(blocks) == 1
-    first_block = blocks[0]
-    assert isinstance(first_block, ActionsBlock)
-    assert len(first_block.elements) == 1
-    assert all(isinstance(element, ButtonElement) for element in first_block.elements)
+    # With valid impact_form_data, should return context blocks
+    mock_impact_form = Mock()
+    mock_impact_form.is_valid.return_value = True
+    mock_impact_form.suggest_priority_from_impact.return_value = 1
+
+    # Mock Priority object
+    mock_priority = Mock()
+    mock_priority.emoji = "🔴"
+    mock_priority.description = "Critical"
+    mock_priority.sla = "15 min"
+    mock_priority.recommended_response_type = None
+
+    open_incident_context["impact_form_data"] = {"test_field": "test_value"}
+
+    with patch("firefighter.slack.views.modals.open.SelectImpactForm", return_value=mock_impact_form), \
+         patch("firefighter.slack.views.modals.open.Priority.objects.get", return_value=mock_priority), \
+         patch.object(OpenModal, "_get_impact_descriptions", return_value="Test impact"):
+        blocks = OpenModal._build_response_type_blocks(open_incident_context)
+        assert len(blocks) == 1
+        first_block = blocks[0]
+        assert isinstance(first_block, ContextBlock)
 
 
 @pytest.mark.django_db