firefighter-incident 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

firefighter_tests/test_raid/test_raid_signals.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from unittest.mock import Mock, patch
+from unittest.mock import ANY, Mock, patch
 
 import pytest
 from django.test import override_settings
@@ -10,6 +10,7 @@ from django.test import override_settings
 from firefighter.incidents.enums import IncidentStatus
 from firefighter.incidents.models.incident_update import IncidentUpdate
 from firefighter.raid.signals.incident_updated import (
+    IMPACT_TO_JIRA_STATUS_MAP,
     incident_updated_close_ticket_when_mitigated_or_postmortem,
 )
 
@@ -18,11 +19,16 @@ from firefighter.raid.signals.incident_updated import (
 class TestIncidentUpdatedCloseJiraTicket:
     """Test that Jira tickets are closed when incidents reach terminal statuses."""
 
-    @patch("firefighter.raid.signals.incident_updated.client.close_issue")
+    @patch("firefighter.raid.signals.incident_updated.client.transition_issue_auto")
     def test_close_jira_ticket_when_status_changes_to_mitigated(
-        self, mock_close_issue: Mock, incident_factory, user_factory, jira_ticket_factory, priority_factory
+        self,
+        mock_transition: Mock,
+        incident_factory,
+        user_factory,
+        jira_ticket_factory,
+        priority_factory,
     ) -> None:
-        """Test that Jira ticket is closed when incident status changes to MITIGATED for P3+."""
+        """Impact → Jira: MITIGATED transitions to Reporter validation for P3+."""
         user = user_factory()
         # Create P3 priority (no postmortem needed)
         p3_priority = priority_factory(value=3, name="P3", needs_postmortem=False)
@@ -44,13 +50,19 @@ class TestIncidentUpdatedCloseJiraTicket:
             updated_fields=["_status"],
         )
 
-        # Verify close_issue was called for P3+ incidents
-        mock_close_issue.assert_called_once_with(issue_id=jira_ticket.id)
+        target = IMPACT_TO_JIRA_STATUS_MAP[IncidentStatus.MITIGATED]
+        mock_transition.assert_called_once_with(jira_ticket.id, target, ANY)
 
     @override_settings(ENABLE_JIRA_POSTMORTEM=True)
-    @patch("firefighter.raid.signals.incident_updated.client.close_issue")
+    @patch("firefighter.raid.signals.incident_updated.client.transition_issue_auto")
     def test_do_not_close_jira_ticket_when_p1_mitigated(
-        self, mock_close_issue: Mock, incident_factory, user_factory, jira_ticket_factory, priority_factory, environment_factory
+        self,
+        mock_transition: Mock,
+        incident_factory,
+        user_factory,
+        jira_ticket_factory,
+        priority_factory,
+        environment_factory,
     ) -> None:
         """Test that Jira ticket is NOT closed when P1 incident status changes to MITIGATED.
 
@@ -61,7 +73,9 @@ class TestIncidentUpdatedCloseJiraTicket:
         # Create P1 priority (needs postmortem)
         p1_priority = priority_factory(value=1, name="P1", needs_postmortem=True)
         prd_env = environment_factory(value="PRD", name="Production")
-        incident = incident_factory(created_by=user, priority=p1_priority, environment=prd_env)
+        incident = incident_factory(
+            created_by=user, priority=p1_priority, environment=prd_env
+        )
         jira_ticket = jira_ticket_factory(incident=incident)
         incident.jira_ticket = jira_ticket
 
@@ -79,12 +93,12 @@ class TestIncidentUpdatedCloseJiraTicket:
             updated_fields=["_status"],
         )
 
-        # Verify close_issue was NOT called - P1 needs to go through postmortem first
-        mock_close_issue.assert_not_called()
+        target = IMPACT_TO_JIRA_STATUS_MAP[IncidentStatus.MITIGATED]
+        mock_transition.assert_called_once_with(jira_ticket.id, target, ANY)
 
-    @patch("firefighter.raid.signals.incident_updated.client.close_issue")
+    @patch("firefighter.raid.signals.incident_updated.client.transition_issue_auto")
     def test_do_not_close_jira_ticket_when_status_changes_to_postmortem(
-        self, mock_close_issue: Mock, incident_factory, user_factory, jira_ticket_factory
+        self, mock_transition: Mock, incident_factory, user_factory, jira_ticket_factory
     ) -> None:
         """Test that Jira ticket is NOT closed when incident status changes to POST_MORTEM.
 
@@ -110,12 +124,12 @@ class TestIncidentUpdatedCloseJiraTicket:
             updated_fields=["_status"],
         )
 
-        # Verify close_issue was NOT called - ticket stays open during PM
-        mock_close_issue.assert_not_called()
+        target = IMPACT_TO_JIRA_STATUS_MAP[IncidentStatus.POST_MORTEM]
+        mock_transition.assert_called_once_with(jira_ticket.id, target, ANY)
 
-    @patch("firefighter.raid.signals.incident_updated.client.close_issue")
+    @patch("firefighter.raid.signals.incident_updated.client.transition_issue_auto")
     def test_close_jira_ticket_when_status_changes_to_closed(
-        self, mock_close_issue: Mock, incident_factory, user_factory, jira_ticket_factory
+        self, mock_transition: Mock, incident_factory, user_factory, jira_ticket_factory
     ) -> None:
         """Test that Jira ticket is closed when incident status changes to CLOSED (direct close)."""
         user = user_factory()
@@ -137,12 +151,11 @@ class TestIncidentUpdatedCloseJiraTicket:
             updated_fields=["_status"],
         )
 
-        # Verify close_issue was called
-        mock_close_issue.assert_called_once_with(issue_id=jira_ticket.id)
+        mock_transition.assert_called_once_with(jira_ticket.id, "Closed", ANY)
 
-    @patch("firefighter.raid.signals.incident_updated.client.close_issue")
+    @patch("firefighter.raid.signals.incident_updated.client.transition_issue_auto")
     def test_do_not_close_jira_ticket_when_status_not_terminal(
-        self, mock_close_issue: Mock, incident_factory, user_factory, jira_ticket_factory
+        self, mock_transition: Mock, incident_factory, user_factory, jira_ticket_factory
     ) -> None:
         """Test that Jira ticket is NOT closed for non-terminal statuses."""
         user = user_factory()
@@ -164,12 +177,12 @@ class TestIncidentUpdatedCloseJiraTicket:
             updated_fields=["_status"],
         )
 
-        # Verify close_issue was NOT called
-        mock_close_issue.assert_not_called()
+        target = IMPACT_TO_JIRA_STATUS_MAP[IncidentStatus.INVESTIGATING]
+        mock_transition.assert_called_once_with(jira_ticket.id, target, ANY)
 
-    @patch("firefighter.raid.signals.incident_updated.client.close_issue")
+    @patch("firefighter.raid.signals.incident_updated.client.transition_issue_auto")
     def test_do_not_close_jira_ticket_when_status_not_updated(
-        self, mock_close_issue: Mock, incident_factory, user_factory, jira_ticket_factory
+        self, mock_transition: Mock, incident_factory, user_factory, jira_ticket_factory
     ) -> None:
         """Test that Jira ticket is NOT closed when _status is not in updated_fields."""
         user = user_factory()
@@ -191,15 +204,14 @@ class TestIncidentUpdatedCloseJiraTicket:
             updated_fields=["priority_id"],  # Not _status
         )
 
-        # Verify close_issue was NOT called
-        mock_close_issue.assert_not_called()
+        mock_transition.assert_not_called()
 
-    @patch("firefighter.raid.signals.incident_updated.client.close_issue")
+    @patch("firefighter.raid.signals.incident_updated.client.transition_issue_auto")
     @patch("firefighter.raid.signals.incident_updated.logger")
     def test_do_not_crash_when_jira_ticket_missing(
         self,
         mock_logger: Mock,
-        mock_close_issue: Mock,
+        mock_transition: Mock,
         incident_factory,
         user_factory,
     ) -> None:
@@ -222,8 +234,8 @@ class TestIncidentUpdatedCloseJiraTicket:
             updated_fields=["_status"],
         )
 
-        # Verify close_issue was NOT called
-        mock_close_issue.assert_not_called()
+        # Verify transition was NOT called
+        mock_transition.assert_not_called()
 
         # Verify a warning was logged
         mock_logger.warning.assert_called_once()

firefighter_tests/test_slack/views/modals/test_update_status.py

@@ -10,6 +10,8 @@ from pytest_mock import MockerFixture
 from firefighter.incidents.enums import IncidentStatus
 from firefighter.incidents.factories import IncidentFactory, UserFactory
 from firefighter.incidents.models import Incident, MilestoneType
+from firefighter.incidents.models.environment import Environment
+from firefighter.incidents.models.priority import Priority
 from firefighter.slack.views import UpdateStatusModal
 
 logger = logging.getLogger(__name__)
@@ -223,9 +225,35 @@ class TestUpdateStatusModal:
 
         # Create a P1/P2 incident in POST_MORTEM status
         # This incident will have missing milestones (detected, started)
+        priority = (
+            Priority.objects.filter(value=1).first()
+            or Priority.objects.create(
+                value=1,
+                name="P1",
+                order=1,
+                emoji="🔴",
+                needs_postmortem=True,
+                enabled_create=True,
+                enabled_update=True,
+                default=False,
+            )
+        )
+        environment = (
+            Environment.objects.filter(value="PRD").first()
+            or Environment.objects.create(
+                value="PRD",
+                name="Production",
+                description="Production",
+                order=1,
+                default=False,
+            )
+        )
+
         incident = IncidentFactory.create(
             _status=IncidentStatus.POST_MORTEM,
             created_by=user,
+            priority=priority,
+            environment=environment,
         )
 
         # Verify that can_be_closed returns False due to missing milestones