Merge branch 'pull_request_conversation_1' into pull_request_conversation_2

Author: anthony-nhs

packages/slackBotFunction/app/slack/slack_events.py

@@ -381,9 +381,6 @@ def process_pull_request_slack_event(slack_event_data: Dict[str, Any]) -> None:
         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, 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

packages/slackBotFunction/app/slack/slack_handlers.py

@@ -107,7 +107,7 @@ def unified_message_handler(client: WebClient, event: Dict[str, Any], req: BoltR
             extra={"session_pull_request_id": session_pull_request_id},
         )
         forward_event_to_pull_request_lambda(
-            req=req, pull_request_id=session_pull_request_id, event_id=event_id, store_pull_request_id=False
+            event=event, pull_request_id=session_pull_request_id, event_id=event_id, store_pull_request_id=False
         )
         return
 

packages/slackBotFunction/app/utils/handler_utils.py

@@ -65,6 +65,9 @@ def forward_event_to_pull_request_lambda(
 
         pull_request_lambda_arn = outputs.get("SlackBotLambdaArn")
         logger.debug("Triggering pull request lambda", extra={"lambda_arn": pull_request_lambda_arn})
+        message_text = event["text"]
+        _, extracted_message = extract_pull_request_id(message_text)
+        event["text"] = extracted_message
         lambda_payload = {"pull_request_event": True, "slack_event": {"event": event, "event_id": event_id}}
         response = lambda_client.invoke(
             FunctionName=pull_request_lambda_arn, InvocationType="Event", Payload=json.dumps(lambda_payload)