firefighter-incident 0.0.18__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.18'
-__version_tuple__ = version_tuple = (0, 0, 18)
+__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/raid/client.py

@@ -72,6 +72,7 @@ class RaidJiraClient(JiraClient):
             extra_args["customfield_10896"] = str(zoho_desk_ticket_id)
         if zendesk_ticket_id:
             extra_args["customfield_10895"] = str(zendesk_ticket_id)
+
         if seller_contract_id:
             description_addendum.append(
                 f"Seller link to TOOLBOX: {TOOLBOX_URL}?seller_id={seller_contract_id}"
@@ -109,6 +110,7 @@ class RaidJiraClient(JiraClient):
             project = (
                 feature_team.jira_project_key if feature_team else RAID_JIRA_PROJECT_KEY
             )
+
         issue = self.jira.create_issue(
             project=project,
             summary=summary,

firefighter/raid/forms.py

@@ -107,8 +107,12 @@ def alert_slack_new_jira_ticket(
     reporter_user: User | None = None,
     reporter_email: str | None = None,
 ) -> None:
-    # These alerts are not for critical incidents
-    if hasattr(jira_ticket, "incident") and jira_ticket.incident:
+    # These alerts are for P4-P5 incidents only, not P1-P3 critical incidents
+    if (
+        hasattr(jira_ticket, "incident")
+        and jira_ticket.incident
+        and jira_ticket.incident.priority.value <= 3
+    ):
         raise ValueError("This is a critical incident, not a raid incident.")
 
     # Get the reporter's email and user from ticket if not provided

firefighter/raid/views/__init__.py

@@ -35,6 +35,7 @@ if TYPE_CHECKING:
                 "description": "Description test where you want to depict your issue",
                 "seller_contract_id": "12345678",
                 "zoho": "https://crmplus.zoho.eu/mycrmlink/index.do/cxapp/agent/mycompany/all/tickets/details/123456789",
+                "zendesk": "12345",
                 "platform": "FR",
                 "reporter_email": "john.doe@mycompany.com",
                 "incident_category": "Payment Processing",

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.18
+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.18.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=tzG3REjXftgEO32YP2rgLirgULNff34B-C5Yb8oweEc,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
@@ -311,8 +311,8 @@ firefighter/pagerduty/views/oncall_trigger.py,sha256=LYHpWyEaR6O8NazmsTl5ydtw1XH
 firefighter/raid/__init__.py,sha256=nMNmvHCSkyLQsdhTow7myMU62vXk1e755gUntVfFFlY,154
 firefighter/raid/admin.py,sha256=WhIHaRAv7JPp2NH27w7_0JfvGHrvoyRJhYr3_WwedrA,1117
 firefighter/raid/apps.py,sha256=olDKua1rqhhIJUhCu6A2PnPWloW_jbeD4XWL94b2owo,1117
-firefighter/raid/client.py,sha256=ja_tiKAcBFpI5ZwbGxSVyf7_ETq2K1Qauq26pMR-Ze4,8124
-firefighter/raid/forms.py,sha256=gbbXDizCYDs8vz33ZFClTVZ_yM3jqZtWFMYRy3K3xuM,11863
+firefighter/raid/client.py,sha256=5PzW7Ub0rU4Z_gdGqPB42CMcM5TCUoWeOZRZZmnhJXg,8126
+firefighter/raid/forms.py,sha256=XivNADFHOl2ewNRXev17HthDIUvwt4pdH9t4So-BE-A,11968
 firefighter/raid/messages.py,sha256=e75kwi0hCe5ChwU4t-_6Q3Rcy22MLLdVSsYyjvG2SCM,5542
 firefighter/raid/models.py,sha256=29Smci739K1ZdcMu7uXYvoVEhgDpwLQoCzBbc5wvwhs,2211
 firefighter/raid/resources.py,sha256=39GhITs3OAWA1eSPZme-rLd818kuz7gwYzdN38zNz8Y,436
@@ -328,7 +328,7 @@ firefighter/raid/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 firefighter/raid/signals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/raid/signals/incident_updated.py,sha256=5LYeqvgTrfINu_SOwkZa3hD6rvTsl8BL8Py-immqK3I,1374
 firefighter/raid/tasks/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
-firefighter/raid/views/__init__.py,sha256=noK-M1X4L46OMAp6S29jqajovzL6sIMSnIBv5l9vxIM,5174
+firefighter/raid/views/__init__.py,sha256=C3WhAJfEoUasi2afHPuLpKiuRYixK-tc3j0-2Rw_g3E,5210
 firefighter/slack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/slack/admin.py,sha256=pNJbA-szxUUrghxv_Z0BNezu6lULDzFcOu_K5i4m7Cs,13963
 firefighter/slack/apps.py,sha256=gR0zWTtqT58tjPayBX22ZSzMkLiNpmoOvLShNvhJA6Q,664
@@ -463,18 +463,24 @@ 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_client.py,sha256=8iRBR4bKewPPbtz33hCLOHiZDTELPQBOrQb7EdNDS4c,21227
+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=y89ZqP6Wf9h3S2hegJHVfVdCuVbfL4SvT-kPVoAYyy8,19618
+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=nejl4ceBPegOcks6z6B8_7Ekg8ef18j3i7C8Y8dS8v0,20665
+firefighter_tests/test_raid/test_raid_serializers.py,sha256=xkMK9npvDMAr2pUpP4mFbLszrR6qyTzsJRd-uNOzEhM,22560
 firefighter_tests/test_raid/test_raid_service.py,sha256=AqVyrRjW2tr0sfbXS4lGlJ7mcxB2ACEXAR8Bv0pXnj0,16755
 firefighter_tests/test_raid/test_raid_signals.py,sha256=twNxB3NQs58s8ZcP-wsZXG7iTHR4yKFC9x-zpq1ZuAo,7002
 firefighter_tests/test_raid/test_raid_transitions.py,sha256=mtmMKwukxmZSM-R619BQ3Z_2AB-qY6imvDgUF0A3_tw,4784
 firefighter_tests/test_raid/test_raid_utils.py,sha256=i6JBwim1G-qynwxprNZekxl9K7Vis4FFvNkw3wT2jTM,1016
 firefighter_tests/test_raid/test_raid_views.py,sha256=paAhh4k2EDlmG1ehwNhMuYIhr1okqrvM7xlkaTAo2V0,6825
+firefighter_tests/test_raid/test_zendesk_integration.py,sha256=RtHIKWog_YZ6g-uZSr37k5XjAGe0c8WEeBWqkt1ZNqk,7113
 firefighter_tests/test_slack/conftest.py,sha256=MCg04JFQ0iBeYUN_moEvvH4PVA3wE48Q6LkrIw7Bic0,2015
+firefighter_tests/test_slack/test_conversation_tags.py,sha256=nNqTZRRBfF6Z4wpFSYZ83DH7_mR9z9F9LAHSq8AHFN0,12744
 firefighter_tests/test_slack/test_signals_downgrade.py,sha256=mgl4H5vwr2kImf6g4IZbhv7YEPmMzbYSaVr8E6taL88,5420
 firefighter_tests/test_slack/test_slack_utils.py,sha256=9PLobMNXh3xDyFuwzcQFpKJhe4j__sIgf_WRHIpANJw,3957
 firefighter_tests/test_slack/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -491,10 +497,10 @@ firefighter_tests/test_slack/views/modals/test_open.py,sha256=IzgG9le5NN_CvltehA
 firefighter_tests/test_slack/views/modals/test_opening_unified.py,sha256=OejtLyc_mehav2TDaLzUnhilMNvhCzc6T4FodCqfQPk,17406
 firefighter_tests/test_slack/views/modals/test_send_sos.py,sha256=_rE6jD-gOzcGyhlY0R9GzlGtPx65oOOguJYdENgxtLc,1289
 firefighter_tests/test_slack/views/modals/test_status.py,sha256=oQzPfwdg2tkbo9nfkO1GfS3WydxqSC6vy1AZjZDKT30,2226
-firefighter_tests/test_slack/views/modals/test_update_status.py,sha256=aqLQ_9TV4Zn-S2sSXL8VNqTMygcbgOIrxg4OUovgUrw,55630
+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.18.dist-info/METADATA,sha256=IoKMnbPTxFmn7Cfb2UIV6x77XIp1pY6WSrOhW2JxsFg,5541
-firefighter_incident-0.0.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-firefighter_incident-0.0.18.dist-info/entry_points.txt,sha256=c13meJbv7YNmYz7MipMOQwzQ5IeFOPXUBYAJ44XMQsM,61
-firefighter_incident-0.0.18.dist-info/licenses/LICENSE,sha256=krRiGp-a9-1nH1bWpBEdxyTKLhjLmn6DMVVoIb0zF90,1087
-firefighter_incident-0.0.18.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_alert_p4_p5.py

@@ -0,0 +1,255 @@
+"""Tests for RAID alert notifications for P4-P5 incidents with linked Incident objects.
+
+This module tests the alert_slack_new_jira_ticket() function behavior when called
+with P4-P5 JiraTickets that have associated Incident objects (since 0.0.17 unified workflow).
+
+Before 0.0.17: P4-P5 created only JiraTicket (no Incident) → alerts worked
+Since 0.0.17: P4-P5 create Incident + JiraTicket → alerts broken due to incorrect check
+"""
+
+from __future__ import annotations
+
+from unittest.mock import patch
+
+import pytest
+
+from firefighter.incidents.factories import (
+    IncidentCategoryFactory,
+    IncidentFactory,
+    UserFactory,
+)
+from firefighter.incidents.models.priority import Priority
+from firefighter.jira_app.models import JiraUser
+from firefighter.raid.forms import (
+    alert_slack_new_jira_ticket,
+    get_internal_alert_conversations,
+)
+from firefighter.raid.models import JiraTicket
+from firefighter.slack.models.conversation import Conversation
+from firefighter.slack.models.user import SlackUser
+
+
+@pytest.mark.django_db
+class TestAlertSlackNewJiraTicketWithIncident:
+    """Test alert_slack_new_jira_ticket for P4-P5 with linked Incident (unified workflow)."""
+
+    @pytest.fixture
+    def p4_priority(self):
+        """Get or create P4 priority."""
+        priority, _ = Priority.objects.get_or_create(value=4, defaults={"name": "P4"})
+        return priority
+
+    @pytest.fixture
+    def p5_priority(self):
+        """Get or create P5 priority."""
+        priority, _ = Priority.objects.get_or_create(value=5, defaults={"name": "P5"})
+        return priority
+
+    @pytest.fixture
+    def incident_category(self):
+        """Create incident category."""
+        return IncidentCategoryFactory()
+
+    @pytest.fixture
+    def reporter_user_with_slack(self):
+        """Create user with Slack account."""
+        user = UserFactory(email="reporter@manomano.com")
+        jira_user = JiraUser.objects.create(id="jira-123", user=user)
+        slack_user = SlackUser.objects.create(user=user, slack_id="U12345")
+        return user, jira_user, slack_user
+
+    @pytest.fixture
+    def raid_alert_channel_sbi(self):
+        """Create the raid_alert__sbi_normal channel for SBI tickets."""
+        return Conversation.objects.create(
+            name="incidents",
+            channel_id="C_INCIDENTS",
+            tag="raid_alert__sbi_normal",
+        )
+
+    def test_alert_p4_incident_with_linked_incident_should_succeed(
+        self,
+        p4_priority,
+        incident_category,
+        reporter_user_with_slack,
+        raid_alert_channel_sbi,  # noqa: ARG002 - fixture creates channel in DB
+    ):
+        """Test that P4 JiraTicket with linked Incident can send raid_alert notifications.
+
+        This test reproduces the CURRENT BROKEN behavior since 0.0.17:
+        - UnifiedIncidentForm creates Incident + JiraTicket for P4-P5
+        - alert_slack_new_jira_ticket() raises ValueError because jira_ticket.incident exists
+        - Notifications to #incidents channel are never sent
+
+        Expected: Should send notifications (test will FAIL until bug is fixed)
+        """
+        user, jira_user, _ = reporter_user_with_slack
+
+        # Create P4 incident (simulating UnifiedIncidentForm behavior)
+        incident = IncidentFactory(
+            priority=p4_priority,
+            incident_category=incident_category,
+            created_by=user,
+        )
+
+        # Create JiraTicket linked to Incident (UNIFIED workflow since 0.0.17)
+        jira_ticket = JiraTicket.objects.create(
+            id=12345,
+            key="SBI-12345",
+            summary="P4 incident with linked Incident",
+            business_impact="N/A",
+            project_key="SBI",
+            reporter=jira_user,
+            incident=incident,  # ← This is what breaks alert_slack_new_jira_ticket()
+        )
+
+        # Mock Slack API to capture messages sent
+        with (
+            patch(
+                "firefighter.slack.models.user.SlackUser.send_private_message"
+            ) as mock_dm,
+            patch(
+                "firefighter.slack.models.conversation.Conversation.send_message_and_save"
+            ) as mock_channel_msg,
+        ):
+            # This should NOT raise ValueError and should send notifications
+            alert_slack_new_jira_ticket(
+                jira_ticket, reporter_user=user, reporter_email=user.email
+            )
+
+            # Verify DM was sent to reporter
+            assert mock_dm.called, "Should send DM to reporter"
+
+            # Verify message was sent to #incidents channel
+            assert (
+                mock_channel_msg.called
+            ), "Should send message to raid_alert channel"
+
+    def test_alert_p5_incident_with_linked_incident_should_succeed(
+        self,
+        p5_priority,
+        incident_category,
+        reporter_user_with_slack,
+        raid_alert_channel_sbi,  # noqa: ARG002 - fixture creates channel in DB
+    ):
+        """Test that P5 JiraTicket with linked Incident can send raid_alert notifications."""
+        user, jira_user, _ = reporter_user_with_slack
+
+        # Create P5 incident
+        incident = IncidentFactory(
+            priority=p5_priority,
+            incident_category=incident_category,
+            created_by=user,
+        )
+
+        # Create JiraTicket linked to Incident
+        jira_ticket = JiraTicket.objects.create(
+            id=12346,
+            key="SBI-12346",
+            summary="P5 incident with linked Incident",
+            business_impact="N/A",
+            project_key="SBI",
+            reporter=jira_user,
+            incident=incident,
+        )
+
+        # Mock Slack API
+        with (
+            patch(
+                "firefighter.slack.models.user.SlackUser.send_private_message"
+            ) as mock_dm,
+            patch(
+                "firefighter.slack.models.conversation.Conversation.send_message_and_save"
+            ) as mock_channel_msg,
+        ):
+            # Should succeed for P5 as well
+            alert_slack_new_jira_ticket(
+                jira_ticket, reporter_user=user, reporter_email=user.email
+            )
+
+            assert mock_dm.called
+            assert mock_channel_msg.called
+
+    def test_alert_p1_incident_should_fail(
+        self, incident_category, reporter_user_with_slack
+    ):
+        """Test that P1 JiraTicket with linked Incident correctly raises ValueError.
+
+        P1-P3 incidents should NOT use raid_alert notifications.
+        They have dedicated Slack channels and use different notification flow.
+        """
+        user, jira_user, _ = reporter_user_with_slack
+        p1_priority, _ = Priority.objects.get_or_create(value=1, defaults={"name": "P1"})
+
+        incident = IncidentFactory(
+            priority=p1_priority,
+            incident_category=incident_category,
+            created_by=user,
+        )
+
+        jira_ticket = JiraTicket.objects.create(
+            id=12347,
+            key="SBI-12347",
+            summary="P1 critical incident",
+            business_impact="High",
+            project_key="SBI",
+            reporter=jira_user,
+            incident=incident,
+        )
+
+        # P1 should correctly raise ValueError
+        with pytest.raises(
+            ValueError, match="This is a critical incident, not a raid incident"
+        ):
+            alert_slack_new_jira_ticket(
+                jira_ticket, reporter_user=user, reporter_email=user.email
+            )
+
+    def test_get_internal_alert_conversations_for_normal_impact(
+        self, raid_alert_channel_sbi  # noqa: ARG002 - fixture creates channel in DB
+    ):
+        """Test that get_internal_alert_conversations finds raid_alert__sbi_normal channel."""
+        # Create a JiraTicket with normal/N/A business impact for SBI project
+        jira_user = JiraUser.objects.create(id="jira-999", user=UserFactory())
+        jira_ticket = JiraTicket.objects.create(
+            id=99999,
+            key="SBI-99999",
+            summary="Test ticket",
+            business_impact="N/A",
+            project_key="SBI",
+            reporter=jira_user,
+        )
+
+        # Should find the raid_alert__sbi_normal channel
+        channels = get_internal_alert_conversations(jira_ticket)
+        channel_list = list(channels)
+
+        assert len(channel_list) == 1
+        assert channel_list[0].tag == "raid_alert__sbi_normal"
+        assert channel_list[0].name == "incidents"
+
+    def test_get_internal_alert_conversations_for_high_impact(self):
+        """Test that get_internal_alert_conversations finds raid_alert__sbi_high channel."""
+        # Create channel for high impact on SBI
+        Conversation.objects.create(
+            name="incidents-high-impact",
+            channel_id="C_INCIDENTS_HIGH",
+            tag="raid_alert__sbi_high",
+        )
+
+        # Create JiraTicket with High business impact for SBI
+        jira_user = JiraUser.objects.create(id="jira-998", user=UserFactory())
+        jira_ticket = JiraTicket.objects.create(
+            id=99998,
+            key="SBI-99998",
+            summary="Test high impact ticket",
+            business_impact="High",
+            project_key="SBI",
+            reporter=jira_user,
+        )
+
+        channels = get_internal_alert_conversations(jira_ticket)
+        channel_list = list(channels)
+
+        assert len(channel_list) == 1
+        assert channel_list[0].tag == "raid_alert__sbi_high"

firefighter_tests/test_raid/test_raid_client.py

@@ -368,6 +368,38 @@ class TestRaidJiraClientBasics:
                 priority=1,
             )
 
+    def test_create_issue_zendesk_field_mapping(self, mock_jira_client):
+        """Test that zendesk_ticket_id is correctly mapped to customfield_10895."""
+        mock_issue = Mock()
+        mock_issue.raw = {
+            "id": "12355",
+            "key": "TEST-130",
+            "fields": {
+                "summary": "Test zendesk mapping",
+                "description": "Test description",
+                "reporter": {"accountId": "reporter123"},
+                "issuetype": {"name": "Bug"},
+            },
+        }
+        mock_jira_client.jira.create_issue.return_value = mock_issue
+
+        result = mock_jira_client.create_issue(
+            issuetype="Bug",
+            summary="Test zendesk mapping",
+            description="Test description",
+            assignee=None,
+            reporter="test_reporter",
+            priority=1,
+            zendesk_ticket_id="ZD-98765",
+        )
+
+        # Verify create_issue was called with customfield_10895
+        call_kwargs = mock_jira_client.jira.create_issue.call_args[1]
+        assert "customfield_10895" in call_kwargs
+        assert call_kwargs["customfield_10895"] == "ZD-98765"
+        assert result["id"] == 12355
+        assert result["key"] == "TEST-130"
+
     def test_jira_object_static_method(self):
         """Test _jira_object static method."""
         test_issue = {