Merge branch 'pull_request_conversation_1' into pull_request_conversation_2

Author: anthony-nhs

packages/slackBotFunction/app/slack/slack_handlers.py

@@ -25,6 +25,7 @@
     conversation_key_and_root,
     extract_conversation_context,
     extract_pull_request_id,
+    extract_session_pull_request_id,
     gate_common,
     is_latest_message,
     strip_mentions,
@@ -182,6 +183,12 @@ def feedback_handler(body: Dict[str, Any], client: WebClient) -> None:
         # Check if this is the latest message in the conversation
         conversation_key = feedback_data["ck"]
         message_ts = feedback_data.get("mt")
+        session_pull_request_id = extract_session_pull_request_id(conversation_key)
+        if session_pull_request_id:
+            logger.info(
+                f"Feedback in pull request session {session_pull_request_id}",
+                extra={"session_pull_request_id": session_pull_request_id},
+            )
 
         if message_ts and not is_latest_message(conversation_key=conversation_key, message_ts=message_ts):
             logger.info(f"Feedback ignored - not latest message: {message_ts}")
@@ -251,6 +258,12 @@ def _common_message_handler(
     channel_id = event["channel"]
     user_id = event.get("user", "unknown")
     conversation_key, _, thread_ts = extract_conversation_context(event)
+    session_pull_request_id = extract_session_pull_request_id(conversation_key)
+    if session_pull_request_id:
+        logger.info(
+            f"Message in pull request session {session_pull_request_id} from user {user_id}",
+            extra={"session_pull_request_id": session_pull_request_id},
+        )
     if message_text.lower().startswith(constants.FEEDBACK_PREFIX):
         feedback_text = message_text.split(":", 1)[1].strip() if ":" in message_text else ""
         try:
@@ -264,9 +277,7 @@ def _common_message_handler(
                 feedback_text=feedback_text,
                 client=client,
             )
-        except Exception as e:
-            logger.error(f"Failed to store channel feedback via mention: {e}", extra={"error": traceback.format_exc()})
-        try:
+
             params = {
                 "channel": channel_id,
                 "text": bot_messages.FEEDBACK_THANKS,

packages/slackBotFunction/app/utils/handler_utils.py

@@ -161,3 +161,16 @@ def extract_conversation_context(event: Dict[str, Any]) -> Tuple[str, str, str |
     else:
         thread_root = event.get("thread_ts", event["ts"])
         return f"{constants.THREAD_PREFIX}{channel}#{thread_root}", constants.CONTEXT_TYPE_THREAD, thread_root
+
+
+def extract_session_pull_request_id(conversation_key: str) -> str | None:
+    """Check if the conversation is associated with a pull request"""
+    try:
+        response = get_state_information({"pk": conversation_key, "sk": constants.PULL_REQUEST_SK})
+        if "Item" in response:
+            logger.info("Found existing pull request session", extra={"conversation_key": conversation_key})
+            return response["Item"]["pull_request_id"]
+        return None
+    except Exception as e:
+        logger.error(f"Error checking pull request session: {e}", extra={"error": traceback.format_exc()})
+        return None

packages/slackBotFunction/tests/test_slack_handlers.py

@@ -244,11 +244,7 @@ def test_common_message_handler_store_feedback_error_handling(
     )
 
     # assertions
-    # Should still try to post message
-    mock_client.chat_postMessage.assert_called_once_with(
-        channel="C789", text=bot_messages.FEEDBACK_THANKS, thread_ts="bar"
-    )
-    mock_post_error_message.assert_not_called()
+    mock_post_error_message.assert_called()
 
 
 @patch("app.slack.slack_events.store_feedback")

packages/slackBotFunction/tests/test_trigger_processing.py

@@ -6,7 +6,9 @@
 
 
 @patch("boto3.client")
+@patch("app.services.dynamo.store_state_information")
 def test_trigger_pull_request_processing(
+    mock_store_state_information: Mock,
     mock_boto_client: Mock,
     mock_env: Mock,
 ):
@@ -41,18 +43,21 @@ def client_side_effect(service_name, *args, **kwargs):
     from app.utils.handler_utils import trigger_pull_request_processing
 
     # perform operation
-    event_data = {"test": "data"}
+    event_data = {"test": "data", "channel": "C123", "ts": "12345.6789"}
     trigger_pull_request_processing(pull_request_id="123", event=event_data, event_id="evt123")
 
     # assertions
     expected_lambda_payload = {
         "pull_request_processing": True,
-        "slack_event": {"event": {"test": "data"}, "event_id": "evt123"},
+        "slack_event": {"event": {"test": "data", "channel": "C123", "ts": "12345.6789"}, "event_id": "evt123"},
     }
 
     mock_lambda_client.invoke.assert_called_once_with(
         FunctionName="output_SlackBotLambdaArn", InvocationType="Event", Payload=json.dumps(expected_lambda_payload)
     )
+    mock_store_state_information.assert_called_once_with(
+        item={"pk": "thread#C123#12345.6789", "sk": "pull_request", "pull_request_id": "123"}
+    )
 
 
 @patch("boto3.client")