firefighter-incident 0.0.19__py3-none-any.whl → 0.0.20__py3-none-any.whl

firefighter/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.19'
-__version_tuple__ = version_tuple = (0, 0, 19)
+__version__ = version = '0.0.20'
+__version_tuple__ = version_tuple = (0, 0, 20)
 
 __commit_id__ = commit_id = None

firefighter/incidents/forms/select_impact.py

@@ -71,7 +71,7 @@ class SelectImpactForm(forms.Form):
                 if impact_name.impact_type.name == "Business Impact":
                     impact_value = impact_name.value
 
-        return LevelChoices(impact_value).label if impact_value else None
+        return str(LevelChoices(impact_value).label) if impact_value else None
 
     def save(self, incident: HasImpactProtocol) -> None:
         """Save the impact choices to the incident."""

firefighter/jira_app/client.py

@@ -254,14 +254,24 @@ class JiraClient:
             ValueError: Empty issue id
 
         Returns:
-            list(JiraAPIUser): List of Jira users object
+            list(JiraAPIUser): List of Jira users object, or empty list if ticket doesn't exist
         """
-        watchers = self.jira.watchers(jira_issue_id).raw.get("watchers")
-        if len(watchers) == 0:
-            logger.warning(
-                "Watchers not found for jira_account_id '%s'.", jira_issue_id
-            )
-        return watchers
+        try:
+            watchers = self.jira.watchers(jira_issue_id).raw.get("watchers")
+        except exceptions.JIRAError as e:
+            if e.status_code == 404:
+                logger.warning(
+                    "Jira ticket %s not found or no permission to access it. Cannot fetch watchers.",
+                    jira_issue_id,
+                )
+                return []
+            raise
+        else:
+            if len(watchers) == 0:
+                logger.debug(
+                    "No watchers found for jira_issue_id '%s'.", jira_issue_id
+                )
+            return watchers
 
     @staticmethod
     def _create_user_from_jira_info(

{firefighter_incident-0.0.19.dist-info → firefighter_incident-0.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.19
+Version: 0.0.20
 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.19.dist-info → firefighter_incident-0.0.20.dist-info}/RECORD

@@ -6,7 +6,7 @@ gunicorn.conf.py,sha256=vHsTGjaKOr8FDMp6fTKYTX4AtokmPgYvvt5Mr0Q6APc,273
 main.py,sha256=CsbprHoOYhjCLpTJmq9Z_aRYFoFgWxoz2pDLuwm8Eqg,1558
 manage.py,sha256=5ivHGD13C6nJ8QvltKsJ9T9akA5he8da70HLWaEP3k8,689
 firefighter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-firefighter/_version.py,sha256=2t1q5JYEYkNwbHa29phdM-U8VWR1m6EwW48aFKWPj_w,706
+firefighter/_version.py,sha256=8FWqMenH0vIxIRfUQxFCzTnv2dsyjwSoAhVLD84lkZ4,706
 firefighter/api/__init__.py,sha256=JQW0Bv6xwGqy7ioxx3h6UGMzkkJ4DntDpbvV1Ncgi8k,136
 firefighter/api/admin.py,sha256=x9Ysy-GiYjb0rynmFdS9g56e6n24fkN0ouGy5QD9Yrc,4629
 firefighter/api/apps.py,sha256=P5uU1_gMrDfzurdMbfqw1Bnb2uNKKcMq17WBPg2sLhc,204
@@ -141,7 +141,7 @@ firefighter/incidents/forms/close_incident.py,sha256=wyLIlNXx6eU183SkR8H--k9YEOV
 firefighter/incidents/forms/closure_reason.py,sha256=rwWC9Ks8iuuelCv2oqSpGUjL13yogpdbWHdG2yM23Rc,1564
 firefighter/incidents/forms/create_incident.py,sha256=cm5EWIvkJ1BZ-JfRJrh4TAE2wYYLV694gQ3MRIkcrGQ,2764
 firefighter/incidents/forms/edit.py,sha256=RxjmYpSeVo9Xbrs09hbmKO6siy3-PusKqg1VV5xAVr4,1051
-firefighter/incidents/forms/select_impact.py,sha256=jLbzVj4UeUGwOYYa5P92PXkEu1J_6H43UATZYzDgSLY,4630
+firefighter/incidents/forms/select_impact.py,sha256=pH7neqP3d4Bxol4FuizD0Zcp6OP5wtvbhh1M3DjyDVA,4635
 firefighter/incidents/forms/unified_incident.py,sha256=3xDB3IFJVwrRe9C_G52SjQ9-Xeqe1ivAGb0e8xtXJaY,19564
 firefighter/incidents/forms/update_key_events.py,sha256=1Xmnxe5OgZqLFS2HmMzQm3VGFPQipsdrLgKSwdh-fKc,4441
 firefighter/incidents/forms/update_roles.py,sha256=Q26UPfwAj-8N23RNZLQkvmHGnS1_j_X5KQWjJmPjMKY,3635
@@ -271,7 +271,7 @@ firefighter/incidents/views/users/details.py,sha256=xqDUEMorplAdSJNQ2vcNzntKKn6U
 firefighter/jira_app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/jira_app/admin.py,sha256=YywHfi1dlpyyW8XPYvjtOW3fbTZGm5bKXvHbDkr0D_8,702
 firefighter/jira_app/apps.py,sha256=W6iM_e2X-dQ4YSeDPuFPM4wp-zIgpWsEiehtng0fk48,348
-firefighter/jira_app/client.py,sha256=pf0uqs6ccLKy0wCEIcP9FtKrsgTRkpipA9J6Mkj9p2I,16140
+firefighter/jira_app/client.py,sha256=vT0Oj8W1QJabUCA_Gkgg2ZarxgAjBL_krdP2EkaJN84,16535
 firefighter/jira_app/models.py,sha256=m-ay74zeI9zMyKuTBfN7W8DPDc9zPmiDESC8mnGBjR4,1741
 firefighter/jira_app/types.py,sha256=Ukak1U1EhcH2jQPN-UoEL6AMZ-kzPsQ8c7FUr7GmahE,956
 firefighter/jira_app/utils.py,sha256=3xuzr8viZCBm6j2J9oFzA4bUvVW8TN1DOdlpbruJ_TE,3443
@@ -463,11 +463,14 @@ firefighter_tests/test_incidents/test_models/test_migrations/test_incident_migra
 firefighter_tests/test_incidents/test_utils/test_date_utils.py,sha256=ogP7qOEwItL4YGI5gbQPVssOS9ilwiuZC8OrT2qngBY,6568
 firefighter_tests/test_incidents/test_views/test_incident_detail_view.py,sha256=gKKFWIZVrD_P4p6DJjeHCW5uGXBUBVlCd95gJJYDpWQ,680
 firefighter_tests/test_incidents/test_views/test_index_view.py,sha256=InpxbaWOFwRn4YWeIKZhj17vMymrQQf2p2LFhe2Bcdw,816
+firefighter_tests/test_jira_app/__init__.py,sha256=JxZ3v-0kiHOoO-N3kR8NHTmD8tEvuEYKW1GX_S1ZLMY,33
+firefighter_tests/test_jira_app/conftest.py,sha256=HmZd7EBZgng-rb3kIaB14TPVMixMG4YEvnShVqgjodE,545
+firefighter_tests/test_jira_app/test_jira_client_watchers.py,sha256=IBrFjwhOP0rfm58BBq339CySxjdJkPYjGmISC4oQhZc,4803
 firefighter_tests/test_raid/conftest.py,sha256=i_TOquYIMLDyVQ97uqxTqPJszVz4qq7L_Q7YJxTuS1o,4090
 firefighter_tests/test_raid/test_raid_alert_p4_p5.py,sha256=rz9orbt1E1vJ5POQyVZ6-SEPvqB55-xhwIWHicdfgDg,9356
 firefighter_tests/test_raid/test_raid_client.py,sha256=KTqELERpWno7XhF9LpabpxkHoJiWWrryUg5LHi5Yfjo,22456
 firefighter_tests/test_raid/test_raid_client_users.py,sha256=9uma1wBhaiCoG75XAZHqpT8oGTnqFJRMCi7a3XctNtM,3631
-firefighter_tests/test_raid/test_raid_forms.py,sha256=lLZvhczAge0Ftt3OdFEH2BcE1OMF6_vvy1ghHAe3HWM,19758
+firefighter_tests/test_raid/test_raid_forms.py,sha256=8hiXftYPO_lY0heKHqoreUW2s8AcedUme48wTq4hwNE,21931
 firefighter_tests/test_raid/test_raid_models.py,sha256=nq-fVClB_P24W8WrZruOPt8wlHUVGYI7wxJR7tH6AnM,5042
 firefighter_tests/test_raid/test_raid_serializers.py,sha256=xkMK9npvDMAr2pUpP4mFbLszrR6qyTzsJRd-uNOzEhM,22560
 firefighter_tests/test_raid/test_raid_service.py,sha256=AqVyrRjW2tr0sfbXS4lGlJ7mcxB2ACEXAR8Bv0pXnj0,16755
@@ -496,8 +499,8 @@ firefighter_tests/test_slack/views/modals/test_send_sos.py,sha256=_rE6jD-gOzcGyh
 firefighter_tests/test_slack/views/modals/test_status.py,sha256=oQzPfwdg2tkbo9nfkO1GfS3WydxqSC6vy1AZjZDKT30,2226
 firefighter_tests/test_slack/views/modals/test_update_status.py,sha256=OVGqVSeim7aancl0RnGzqwM21Qs3ZVFlaryZiOWi_wM,55748
 firefighter_tests/test_slack/views/modals/test_utils.py,sha256=DJd2n9q6fFu8UuCRdiq9U_Cn19MdnC5c-ydLLrk6rkc,5218
-firefighter_incident-0.0.19.dist-info/METADATA,sha256=3oyEnmXZl2Ps9iciGESrGodxRAXbOJfiDcOaY2uh8NU,5541
-firefighter_incident-0.0.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-firefighter_incident-0.0.19.dist-info/entry_points.txt,sha256=c13meJbv7YNmYz7MipMOQwzQ5IeFOPXUBYAJ44XMQsM,61
-firefighter_incident-0.0.19.dist-info/licenses/LICENSE,sha256=krRiGp-a9-1nH1bWpBEdxyTKLhjLmn6DMVVoIb0zF90,1087
-firefighter_incident-0.0.19.dist-info/RECORD,,
+firefighter_incident-0.0.20.dist-info/METADATA,sha256=yI3gWfRG__v2fGUUA1H0zC2W4LpRJzv4xkjSq1RNufY,5541
+firefighter_incident-0.0.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+firefighter_incident-0.0.20.dist-info/entry_points.txt,sha256=c13meJbv7YNmYz7MipMOQwzQ5IeFOPXUBYAJ44XMQsM,61
+firefighter_incident-0.0.20.dist-info/licenses/LICENSE,sha256=krRiGp-a9-1nH1bWpBEdxyTKLhjLmn6DMVVoIb0zF90,1087
+firefighter_incident-0.0.20.dist-info/RECORD,,

firefighter_tests/test_jira_app/__init__.py

@@ -0,0 +1 @@
+"""Tests for jira_app module."""

firefighter_tests/test_jira_app/conftest.py

@@ -0,0 +1,24 @@
+"""Fixtures for jira_app tests."""
+
+from __future__ import annotations
+
+from unittest.mock import Mock, patch
+
+import pytest
+
+from firefighter.jira_app.client import JiraClient
+
+
+@pytest.fixture
+def mock_jira_api():
+    """Create a mock JIRA API object."""
+    return Mock()
+
+
+@pytest.fixture
+def jira_client(mock_jira_api):
+    """Create a JiraClient with mocked JIRA API."""
+    with patch("firefighter.jira_app.client.JIRA", return_value=mock_jira_api):
+        client = JiraClient()
+        client.jira = mock_jira_api
+        return client

firefighter_tests/test_jira_app/test_jira_client_watchers.py

@@ -0,0 +1,135 @@
+"""Tests for JiraClient.get_watchers_from_jira_ticket method."""
+
+from __future__ import annotations
+
+from unittest.mock import Mock
+
+import pytest
+from jira.exceptions import JIRAError
+
+
+@pytest.mark.django_db
+class TestGetWatchersFromJiraTicket:
+    """Test get_watchers_from_jira_ticket method."""
+
+    def test_get_watchers_success_with_watchers(self, jira_client, mock_jira_api):
+        """Test successful retrieval of watchers when watchers exist."""
+        # Given
+        mock_watchers_response = Mock()
+        mock_watchers_response.raw = {
+            "watchers": [
+                {"accountId": "user1", "displayName": "User One"},
+                {"accountId": "user2", "displayName": "User Two"},
+            ]
+        }
+        mock_jira_api.watchers.return_value = mock_watchers_response
+
+        # When
+        result = jira_client.get_watchers_from_jira_ticket(12345)
+
+        # Then
+        mock_jira_api.watchers.assert_called_once_with(12345)
+        assert len(result) == 2
+        assert result[0]["accountId"] == "user1"
+        assert result[1]["accountId"] == "user2"
+
+    def test_get_watchers_success_empty_list(
+        self, jira_client, mock_jira_api, caplog
+    ):
+        """Test successful retrieval when no watchers exist."""
+        # Given
+        mock_watchers_response = Mock()
+        mock_watchers_response.raw = {"watchers": []}
+        mock_jira_api.watchers.return_value = mock_watchers_response
+
+        # When
+        result = jira_client.get_watchers_from_jira_ticket(12345)
+
+        # Then
+        mock_jira_api.watchers.assert_called_once_with(12345)
+        assert result == []
+        # Should log debug message
+        assert "No watchers found for jira_issue_id '12345'" in caplog.text
+
+    def test_get_watchers_404_ticket_not_found(
+        self, jira_client, mock_jira_api, caplog
+    ):
+        """Test handling of 404 error when ticket doesn't exist."""
+        # Given
+        jira_error = JIRAError(
+            status_code=404,
+            text="Issue does not exist or you do not have permission to see it.",
+            url="https://jira.example.com/rest/api/2/issue/404295/watchers",
+        )
+        mock_jira_api.watchers.side_effect = jira_error
+
+        # When
+        result = jira_client.get_watchers_from_jira_ticket(404295)
+
+        # Then
+        mock_jira_api.watchers.assert_called_once_with(404295)
+        assert result == []
+        # Should log warning
+        assert (
+            "Jira ticket 404295 not found or no permission to access it"
+            in caplog.text
+        )
+
+    def test_get_watchers_404_no_permission(self, jira_client, mock_jira_api, caplog):
+        """Test handling of 404 error when bot has no permission."""
+        # Given
+        jira_error = JIRAError(
+            status_code=404,
+            text="Issue does not exist or you do not have permission to see it.",
+            url="https://jira.example.com/rest/api/2/issue/999999/watchers",
+        )
+        mock_jira_api.watchers.side_effect = jira_error
+
+        # When
+        result = jira_client.get_watchers_from_jira_ticket("999999")
+
+        # Then
+        assert result == []
+        assert "not found or no permission" in caplog.text
+
+    def test_get_watchers_other_jira_error_raised(self, jira_client, mock_jira_api):
+        """Test that non-404 JIRA errors are re-raised."""
+        # Given
+        jira_error = JIRAError(
+            status_code=500, text="Internal Server Error", url="https://jira.example.com"
+        )
+        mock_jira_api.watchers.side_effect = jira_error
+
+        # When / Then
+        with pytest.raises(JIRAError) as exc_info:
+            jira_client.get_watchers_from_jira_ticket(12345)
+
+        assert exc_info.value.status_code == 500
+
+    def test_get_watchers_403_error_raised(self, jira_client, mock_jira_api):
+        """Test that 403 (Forbidden) errors are re-raised."""
+        # Given
+        jira_error = JIRAError(
+            status_code=403, text="Forbidden", url="https://jira.example.com"
+        )
+        mock_jira_api.watchers.side_effect = jira_error
+
+        # When / Then
+        with pytest.raises(JIRAError) as exc_info:
+            jira_client.get_watchers_from_jira_ticket(12345)
+
+        assert exc_info.value.status_code == 403
+
+    def test_get_watchers_with_string_id(self, jira_client, mock_jira_api):
+        """Test get_watchers with string issue ID."""
+        # Given
+        mock_watchers_response = Mock()
+        mock_watchers_response.raw = {"watchers": [{"accountId": "user1"}]}
+        mock_jira_api.watchers.return_value = mock_watchers_response
+
+        # When
+        result = jira_client.get_watchers_from_jira_ticket("INCIDENT-123")
+
+        # Then
+        mock_jira_api.watchers.assert_called_once_with("INCIDENT-123")
+        assert len(result) == 1

firefighter_tests/test_raid/test_raid_forms.py

@@ -553,3 +553,58 @@ class TestGetInternalAlertConversations:
 
         # Then
         assert conversation in result
+
+
+@pytest.mark.django_db
+class TestAlertSlackNewJiraTicketSlackApiError:
+    """Test SlackApiError handling in alert_slack_new_jira_ticket."""
+
+    @pytest.fixture(autouse=True)
+    def setup(self):
+        """Set up test fixtures."""
+        self.user = UserFactory()
+        self.jira_user = JiraUser.objects.create(id="jira-slack-error", user=self.user)
+        self.jira_ticket = JiraTicket.objects.create(
+            id=88888,
+            key="SLACK-888",
+            summary="Slack error ticket",
+            reporter=self.jira_user,
+        )
+
+    @patch("firefighter.raid.forms.get_partner_alert_conversations")
+    @patch("firefighter.raid.forms.get_internal_alert_conversations")
+    @patch("firefighter.raid.forms.SlackMessageRaidCreatedIssue")
+    def test_alert_slack_new_jira_ticket_slack_api_error_on_channel_send(
+        self, mock_message_class, mock_get_internal, mock_get_partner, caplog
+    ):
+        """Test SlackApiError when sending to channel - should log exception and continue."""
+        # Given: Create a conversation that will fail to send
+        channel = Conversation.objects.create(
+            channel_id="C_FAIL_TEST",
+            name="fail-channel-test",
+            tag="raid_alert__test_fail",
+        )
+        mock_get_internal.return_value = Conversation.objects.filter(id=channel.id)
+        mock_get_partner.return_value = Conversation.objects.none()
+
+        # Mock message
+        mock_message = Mock()
+        mock_message_class.return_value = mock_message
+
+        # Mock channel.send_message_and_save to raise SlackApiError
+        with patch.object(
+            Conversation,
+            "send_message_and_save",
+            side_effect=SlackApiError(
+                message="channel_not_found",
+                response={"error": "channel_not_found"}
+            )
+        ):
+            # When
+            alert_slack_new_jira_ticket(self.jira_ticket)
+
+            # Then
+            # Should log exception about not being able to send
+            assert "Couldn't send message to channel" in caplog.text
+            assert str(self.jira_ticket.id) in caplog.text
+            # Function should continue and not raise