firefighter-incident 0.0.19__tar.gz → 0.0.21__tar.gz

{firefighter_incident-0.0.19 → firefighter_incident-0.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.19
+Version: 0.0.21
 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 → firefighter_incident-0.0.21}/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.21'
+__version_tuple__ = version_tuple = (0, 0, 21)
 
 __commit_id__ = commit_id = None

{firefighter_incident-0.0.19 → firefighter_incident-0.0.21}/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_incident-0.0.19 → firefighter_incident-0.0.21}/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 → firefighter_incident-0.0.21}/firefighter/raid/serializers.py

@@ -130,14 +130,12 @@ class LandbotIssueRequestSerializer(serializers.ModelSerializer[JiraTicket]):
         allow_blank=True,
     )
     suggested_team_routing = serializers.CharField(max_length=10, write_only=True)
-    project = serializers.ChoiceField(
+    project = serializers.CharField(
+        max_length=128,
         required=False,
         allow_blank=True,
         allow_null=True,
         default="SBI",
-        choices=[
-            "SBI",
-        ],
     )
     priority = serializers.IntegerField(
         min_value=1, max_value=5, write_only=True, allow_null=True,

firefighter_incident-0.0.21/firefighter_tests/test_jira_app/__init__.py

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

firefighter_incident-0.0.21/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_incident-0.0.21/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_incident-0.0.19 → firefighter_incident-0.0.21}/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