Merge branch 'pull_request_conversation_1' into pull_request_conversation_2

Author: anthony-nhs

packages/slackBotFunction/app/slack/slack_events.py

@@ -13,6 +13,7 @@
 from app.core.config import (
     bot_messages,
     constants,
+    get_bot_token,
     get_logger,
 )
 from app.services.bedrock import query_bedrock
@@ -252,12 +253,14 @@ def process_pull_request_slack_event(slack_event_data: Dict[str, Any]) -> None:
     try:
         event_id = slack_event_data["event_id"]
         event = slack_event_data["event"]
+        token = get_bot_token()
+        client = WebClient(token=token)
         if is_duplicate_event(event_id=event_id):
             return
         message_text = event["text"]
         _, extracted_message = extract_pull_request_id(message_text)
         event["text"] = extracted_message
-        process_async_slack_event(event=event, event_id=event_id)
+        process_async_slack_event(event=event, event_id=event_id, client=client)
     except Exception:
         # we cant post a reply to slack for this error as we may not have details about where to post it
         logger.error("Error processing message", extra={"event_id": event_id, "error": traceback.format_exc()})

packages/slackBotFunction/tests/test_pulll_request_processing.py

@@ -1,10 +1,12 @@
 import sys
-from unittest.mock import Mock, patch
+from unittest.mock import ANY, Mock, patch
 
 
 @patch("app.utils.handler_utils.is_duplicate_event")
 @patch("app.utils.handler_utils.extract_pull_request_id")
-def test_process_pull_request_event(mock_extract_pull_request_id: Mock, mock_is_duplicate_event: Mock, mock_env: Mock):
+def test_process_pull_request_event(
+    mock_extract_pull_request_id: Mock, mock_is_duplicate_event: Mock, mock_env: Mock, mock_get_parameter: Mock
+):
     # set up mocks
     mock_is_duplicate_event.return_value = False
     mock_extract_pull_request_id.return_value = None, "test question"
@@ -37,7 +39,9 @@ def test_process_pull_request_event(mock_extract_pull_request_id: Mock, mock_is_
             "ts": "1234567890.123",
             "thread_ts": "1234567888.111",  # Existing thread
         }
-        mock_process_async_slack_event.assert_called_once_with(event=expected_slack_event_data, event_id="evt123")
+        mock_process_async_slack_event.assert_called_once_with(
+            event=expected_slack_event_data, event_id="evt123", client=ANY
+        )
 
 
 @patch("app.utils.handler_utils.is_duplicate_event")