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

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

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

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

{firefighter_incident-0.0.8 → firefighter_incident-0.0.10}/firefighter/components/avatar/avatar.py

@@ -25,7 +25,7 @@ class Kwargs(TypedDict, total=False):
 
 
 @component.register("avatar")
-class Avatar(component.Component[tuple[()], Kwargs, Data, Any]):  # 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.8 → firefighter_incident-0.0.10}/firefighter/components/card/card.py

@@ -14,7 +14,7 @@ class Data(TypedDict, total=False):
 
 
 @component.register("card")
-class Card(component.Component[tuple[()], Data, Data, Any]):  # 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.8 → firefighter_incident-0.0.10}/firefighter/components/export_button/export_button.py

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

{firefighter_incident-0.0.8 → firefighter_incident-0.0.10}/firefighter/components/form/form.py

@@ -19,8 +19,8 @@ class Data(TypedDict):
 
 
 @component.register("form")
-class Form(component.Component[tuple[()], Data, Data, Slots]):  # 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.8 → firefighter_incident-0.0.10}/firefighter/components/form_field/form_field.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import logging
 from typing import (
-    Any,
     Never,
     TypedDict,
 )
@@ -23,7 +22,7 @@ class Kwargs(TypedDict, total=True):
 
 
 @component.register("form_field")
-class FormField(component.Component[tuple[()], Kwargs, Data, Any]):  # type: ignore[type-var]
+class FormField(component.Component):
     template_name = "form_field/form_field.html"
 
     def get_context_data(

{firefighter_incident-0.0.8 → firefighter_incident-0.0.10}/firefighter/components/messages/messages.py

@@ -14,7 +14,7 @@ class Data(TypedDict):
 
 
 @component.register("messages")
-class Messages(component.Component[tuple[()], Data, Data, Any]):  # 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.8 → firefighter_incident-0.0.10}/firefighter/components/modal/modal.py

@@ -28,7 +28,7 @@ class Slots(TypedDict):
 
 
 @component.register("modal")
-class Modal(component.Component[tuple[()], Kwargs, Data, Any]):  # 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.8 → firefighter_incident-0.0.10}/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.10/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.10/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.8 → firefighter_incident-0.0.10}/firefighter/slack/views/modals/open.py

@@ -23,6 +23,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
@@ -410,18 +411,25 @@ class OpenModal(SlackModal):
                 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"
                                 + (
                                     (
                                         "\n> Critical incidents are for *emergency* only"
                                         + (
-                                            f"<{SLACK_SEVERITY_HELP_GUIDE_URL}|learn more>"
+                                            f" <{SLACK_SEVERITY_HELP_GUIDE_URL}|learn more>"
                                             if SLACK_SEVERITY_HELP_GUIDE_URL
-                                            else "" + "."
+                                            else "."
                                         )
                                     )
                                     if selected_response_type == "critical"
@@ -448,6 +456,21 @@ 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", {})
+        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"
+        return impact_descriptions
+
     @staticmethod
     def get_details_modal_form_class(
         open_incident_context: OpeningData,