fix mentions

Author: anthony-nhs

packages/slackBotFunction/app/slack/slack_events.py

@@ -271,7 +271,7 @@ def process_async_slack_event(event: Dict[str, Any], event_id: str, client: WebC
     conversation_key, thread_root = conversation_key_and_root(event=event)
     if message_text.lower().startswith(constants.PULL_REQUEST_PREFIX):
         try:
-            pull_request_id, _ = extract_pull_request_id(message_text)
+            pull_request_id, _ = extract_pull_request_id(text=message_text)
             forward_event_to_pull_request_lambda(
                 pull_request_id=pull_request_id, event=event, event_id=event_id, store_pull_request_id=True
             )

packages/slackBotFunction/app/utils/handler_utils.py

@@ -162,15 +162,20 @@ def strip_mentions(message_text: str) -> str:
 
 
 def extract_pull_request_id(text: str) -> Tuple[str | None, str]:
-    # Regex: PULL_REQUEST_PREFIX + optional space + number + space + rest of text
-    pattern = re.escape(constants.PULL_REQUEST_PREFIX) + r"\s*(\d+)\s+(.+)"
-    match = re.match(pattern, text)
-    if not match:
-        logger.warning("Can not extract pull request id from text", extra={"text": text})
-        return None, text
-    pr_number = int(match.group(1))
-    rest_text = match.group(2)
-    return pr_number, rest_text
+    prefix = re.escape(constants.PULL_REQUEST_PREFIX)  # safely escape for regex
+    pattern = rf"^(<[^>]+>\s*)?{prefix}\s*(\d+)\b"
+
+    match = re.match(pattern, text, flags=re.IGNORECASE)
+    if match:
+        mention = match.group(1) or ""
+        pr_number = match.group(2)
+
+        # Remove the matched part (mention + prefix + number)
+        remaining_text = text[match.end() :].strip()
+        cleaned_text = f"{mention}{remaining_text}".strip()
+        return pr_number, cleaned_text
+
+    return None, text.strip()
 
 
 def conversation_key_and_root(event: Dict[str, Any]) -> Tuple[str, str]:

packages/slackBotFunction/tests/test_handler_utils.py

@@ -320,3 +320,42 @@ def test_is_duplicate_event_no_item(
 
     # assertions
     assert result is False
+
+
+def test_extract_pull_request_id_extracts_when_no_mention():
+    # setup mocks
+    if "app.utils.handler_utils" in sys.modules:
+        del sys.modules["app.utils.handler_utils"]
+    from app.utils.handler_utils import extract_pull_request_id
+
+    # perform operation
+    pr_id, text = extract_pull_request_id("pr:12345 some question")
+    # assertions
+    assert pr_id == "12345"
+    assert text == "some question"
+
+
+def test_extract_pull_request_id_extracts_when_no_pull_request():
+    # setup mocks
+    if "app.utils.handler_utils" in sys.modules:
+        del sys.modules["app.utils.handler_utils"]
+    from app.utils.handler_utils import extract_pull_request_id
+
+    # perform operation
+    pr_id, text = extract_pull_request_id("some question")
+    # assertions
+    assert pr_id is None
+    assert text == "some question"
+
+
+def test_extract_pull_request_id_extracts_when_there_is_a_mention():
+    # setup mocks
+    if "app.utils.handler_utils" in sys.modules:
+        del sys.modules["app.utils.handler_utils"]
+    from app.utils.handler_utils import extract_pull_request_id
+
+    # perform operation
+    pr_id, text = extract_pull_request_id("<@U123> pr:12345 some question")
+    # assertions
+    assert pr_id == "12345"
+    assert text == "<@U123> some question"

packages/slackBotFunction/tests/test_slack_events.py

@@ -57,7 +57,7 @@ def test_process_async_slack_event_pull_request_with_mention(
     ) as mock_process_slack_message:
         process_async_slack_event(event=slack_event_data, event_id="evt123", client=mock_client)
         mock_forward_event_to_pull_request_lambda.assert_called_once_with(
-            pull_request_id=123,
+            pull_request_id="123",
             event=slack_event_data,
             event_id="evt123",
             store_pull_request_id=True,
@@ -93,7 +93,7 @@ def test_process_async_slack_event_pull_request_with_no_mention(
     ) as mock_process_slack_message:
         process_async_slack_event(event=slack_event_data, event_id="evt123", client=mock_client)
         mock_forward_event_to_pull_request_lambda.assert_called_once_with(
-            pull_request_id=123,
+            pull_request_id="123",
             event=slack_event_data,
             event_id="evt123",
             store_pull_request_id=True,