firefighter-incident 0.0.9__tar.gz → 0.0.11__tar.gz

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.9
+Version: 0.0.11
 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.9 → firefighter_incident-0.0.11}/firefighter/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.9'
-__version_tuple__ = version_tuple = (0, 0, 9)
+__version__ = version = '0.0.11'
+__version_tuple__ = version_tuple = (0, 0, 11)

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/firefighter/components/avatar/avatar.py

@@ -25,7 +25,7 @@ class Kwargs(TypedDict, total=False):
 
 
 @component.register("avatar")
-class Avatar(component.Component):  # type: ignore[type-var]
+class Avatar(component.Component):
     template_name = "avatar/avatar.html"
 
     def get_context_data(self, user: User, **kwargs: Any) -> Data:

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/firefighter/components/card/card.py

@@ -14,7 +14,7 @@ class Data(TypedDict, total=False):
 
 
 @component.register("card")
-class Card(component.Component):  # type: ignore[type-var]
+class Card(component.Component):
     template_name = "card/card.html"
 
     def get_context_data(self, *args: Any, **kwargs: Unpack[Data]) -> Data:

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/firefighter/components/export_button/export_button.py

@@ -27,7 +27,7 @@ class Kwargs(TypedDict, total=False):
 
 
 @component.register("export_button")
-class ExportButton(component.Component):  # type: ignore[type-var]
+class ExportButton(component.Component):
     template_name = "export_button/export_button.html"
 
     def get_context_data(

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/firefighter/components/form/form.py

@@ -19,8 +19,8 @@ class Data(TypedDict):
 
 
 @component.register("form")
-class Form(component.Component):  # type: ignore[type-var]  # type: ignore[override]
+class FormComponent(component.Component):
     template_name = "form/form.html"
 
-    def get_context_data(self, form: forms.Form, **kwargs: Any) -> Data:  # type: ignore[override]
+    def get_context_data(self, form: forms.Form, **kwargs: Any) -> Data:
         return Data(form=form)

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/firefighter/components/form_field/form_field.py

@@ -22,7 +22,7 @@ class Kwargs(TypedDict, total=True):
 
 
 @component.register("form_field")
-class FormField(component.Component):  # type: ignore[type-var]
+class FormField(component.Component):
     template_name = "form_field/form_field.html"
 
     def get_context_data(

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/firefighter/components/messages/messages.py

@@ -14,7 +14,7 @@ class Data(TypedDict):
 
 
 @component.register("messages")
-class Messages(component.Component):  # type: ignore[type-var]
+class MessagesComponent(component.Component):
     template_name = "messages/messages.html"
 
     def get_context_data(self, messages: BaseStorage, **kwargs: Any) -> Data:

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/firefighter/components/modal/modal.py

@@ -28,7 +28,7 @@ class Slots(TypedDict):
 
 
 @component.register("modal")
-class Modal(component.Component):  # type: ignore[type-var]
+class Modal(component.Component):
     template_name = "modal/modal.html"
 
     def get_context_data(self, *args: Any, **kwargs: Unpack[Kwargs]) -> Data:

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/firefighter/incidents/forms/select_impact.py

@@ -39,7 +39,7 @@ class SelectImpactForm(forms.Form):
 
         super().__init__(*args, **kwargs)
 
-        for impact_type in ImpactType.objects.all().order_by("-order"):
+        for impact_type in ImpactType.objects.all().order_by("order"):
             field_name = f"set_impact_type_{impact_type.value}"
             self.fields[field_name] = forms.ModelChoiceField(
                 label=impact_type.emoji + " " + impact_type.name,

firefighter_incident-0.0.11/firefighter/incidents/migrations/0017_reorder_impact_types.py

@@ -0,0 +1,28 @@
+# Generated by ChatGPT on 2024-06-24
+from django.db import migrations
+
+
+def reorder_impact_types(apps, schema_editor):
+    ImpactType = apps.get_model("incidents", "ImpactType")
+    # On suppose que les valeurs sont :
+    # business_impact, customers_impact, sellers_impact, employees_impact
+    order_map = {
+        "business_impact": 1,
+        "customers_impact": 2,
+        "sellers_impact": 3,
+        "employees_impact": 4,
+    }
+    for value, order in order_map.items():
+        impact_type = ImpactType.objects.filter(value=value).first()
+        if impact_type:
+            impact_type.order = order
+            impact_type.save(update_fields=["order"])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("incidents", "0016_update_business_incidents_and_level"),
+    ]
+    operations = [
+        migrations.RunPython(reorder_impact_types),
+    ]

firefighter_incident-0.0.11/firefighter/incidents/migrations/0018_update_impactlevel_names.py

@@ -0,0 +1,48 @@
+# Generated by ChatGPT on 2024-06-24
+from django.db import migrations
+
+
+def update_impactlevel_names(apps, schema_editor):
+    ImpactType = apps.get_model("incidents", "ImpactType")
+    ImpactLevel = apps.get_model("incidents", "ImpactLevel")
+
+    # Map: (impact_type.value, impact_level.value) -> new name
+    updates = {
+        ("business_impact", "HT"): "Critical Impact (>5% BV loss)",
+        ("business_impact", "HI"): "Major Impact (<5% BV loss)",
+        ("business_impact", "MD"): "Uncertain Business Impact",
+        ("business_impact", "LO"): "Low Impact not measurable",
+        ("business_impact", "LT"): "Very Low Impact not measurable",
+        ("customers_impact", "HT"): "Critical issue for many customers",
+        ("customers_impact", "HI"): "Major issue for many customers",
+        ("customers_impact", "MD"): "Major issue for few customers",
+        ("customers_impact", "LO"): "Minor issue for customers",
+        ("customers_impact", "LT"): "Cosmetic minor issue for customers",
+        ("sellers_impact", "HT"): "Critical issue for many sellers",
+        ("sellers_impact", "HI"): "Major issue for many sellers",
+        ("sellers_impact", "MD"): "Major issue for few sellers",
+        ("sellers_impact", "LO"): "Minor issue for sellers",
+        ("sellers_impact", "LT"): "Cosmetic minor issue for sellers",
+        ("employees_impact", "MD"): "Departments fully blocked",
+        ("employees_impact", "LO"): "Some employees affected",
+        ("employees_impact", "LT"): "Degraded service for employees",
+        ("employees_impact", "NO"): "No impact for employees",
+    }
+
+    for (impact_type_value, level_value), new_name in updates.items():
+        impact_type = ImpactType.objects.filter(value=impact_type_value).first()
+        if not impact_type:
+            continue
+        impact_level = ImpactLevel.objects.filter(impact_type=impact_type, value=level_value).first()
+        if impact_level:
+            impact_level.name = new_name
+            impact_level.save(update_fields=["name"])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("incidents", "0017_reorder_impact_types"),
+    ]
+    operations = [
+        migrations.RunPython(update_impactlevel_names),
+    ]

{firefighter_incident-0.0.9 → firefighter_incident-0.0.11}/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,
@@ -23,6 +22,7 @@ from slack_sdk.models.views import View
 from firefighter.firefighter.utils import is_during_office_hours
 from firefighter.incidents.enums import IncidentStatus
 from firefighter.incidents.forms.select_impact import SelectImpactForm
+from firefighter.incidents.models.impact import ImpactType
 from firefighter.incidents.models.incident import Incident
 from firefighter.incidents.models.priority import Priority
 from firefighter.slack.slack_app import SlackApp
@@ -73,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
         )
@@ -180,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),
                 ),
@@ -370,58 +379,79 @@ 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():
                 priority: Priority = Priority.objects.get(
                     value=impact_form.suggest_priority_from_impact()
                 )
+                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=[
                             MarkdownTextObject(
-                                text=f"> {priority.emoji} Selected priority: {priority}"
+                                text=f"> {priority.emoji} Selected priority: *{priority} - {priority.description}*\n"
+                                f"> ⏱️ SLA: {priority.sla}\n"
+                                f"> :gear: Process: {process}\n"
+                                f"> :pushpin: Selected impacts:\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 "" + "."
+                                            else "."
                                         )
                                     )
                                     if selected_response_type == "critical"
@@ -448,6 +478,59 @@ class OpenModal(SlackModal):
 
         return blocks
 
+    @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 = ""
+        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,
@@ -508,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
@@ -544,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.9 → firefighter_incident-0.0.11}/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.9 → firefighter_incident-0.0.11}/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