post error message

Author: anthony-nhs

packages/slackBotFunction/app/slack/slack_handlers.py

@@ -20,6 +20,7 @@
     constants,
 )
 from app.services.dynamo import get_state_information
+from app.services.slack import post_error_message
 from app.utils.handler_utils import (
     conversation_key_and_root,
     extract_pull_request_id,
@@ -30,7 +31,7 @@
     respond_with_eyes,
     trigger_pull_request_processing,
 )
-from app.slack.slack_events import store_feedback
+from app.slack.slack_events import _extract_conversation_context, store_feedback
 
 logger = get_logger()
 
@@ -269,6 +270,13 @@ def _common_message_handler(
             trigger_pull_request_processing(pull_request_id=pull_request_id, event=event, event_id=event_id)
         except Exception as e:
             logger.error(f"Can not find pull request details: {e}", extra={"error": traceback.format_exc()})
+            _, _, thread_ts = _extract_conversation_context(event)
+            post_error_message(channel=channel_id, thread_ts=thread_ts)
         return
 
-    trigger_async_processing(event=event, event_id=event_id)
+    try:
+        trigger_async_processing(event=event, event_id=event_id)
+    except Exception:
+        logger.error("Error triggering async processing", extra={"error": traceback.format_exc()})
+        _, _, thread_ts = _extract_conversation_context(event)
+        post_error_message(channel=channel_id, thread_ts=thread_ts)

packages/slackBotFunction/app/utils/handler_utils.py

@@ -64,8 +64,9 @@ def trigger_async_processing(event: Dict[str, Any], event_id: str) -> None:
             Payload=json.dumps(lambda_payload),
         )
         logger.debug("Async processing triggered successfully")
-    except Exception:
+    except Exception as e:
         logger.error("Failed to trigger async processing", extra={"error": traceback.format_exc()})
+        raise e
 
 
 def respond_with_eyes(event: Dict[str, Any]) -> None:

packages/slackBotFunction/tests/test_trigger_processing.py

@@ -1,6 +1,9 @@
+import json
 import sys
 from unittest.mock import Mock, patch
 
+import pytest
+
 
 @patch("boto3.client")
 def test_trigger_async_processing_error(mock_boto_client: Mock, mock_env: Mock):
@@ -18,11 +21,12 @@ def test_trigger_async_processing_error(mock_boto_client: Mock, mock_env: Mock):
     # perform operation
     event_data = {"test": "data"}
     # Should not raise exception even if Lambda invoke fails
-    trigger_async_processing(event=event_data, event_id="evt123")
+    with pytest.raises(Exception):
+        trigger_async_processing(event=event_data, event_id="evt123")
 
-    # assertions
-    mock_boto_client.assert_called_once_with("lambda")
-    mock_lambda_client.invoke.assert_called_once()
+        # assertions
+        mock_boto_client.assert_called_once_with("lambda")
+        mock_lambda_client.invoke.assert_called_once()
 
 
 @patch("boto3.client")
@@ -47,3 +51,91 @@ def test_trigger_async_processing(
     # assertions
     mock_boto_client.assert_called_once_with("lambda")
     mock_lambda_client.invoke.assert_called_once()
+
+
+@patch("boto3.client")
+def test_trigger_pull_request_processing(
+    mock_boto_client: Mock,
+    mock_env: Mock,
+):
+    """Test triggering async processing"""
+    # set up mocks
+    mock_cf_client = Mock(name="cloudformation_client")
+    mock_lambda_client = Mock(name="lambda_client")
+
+    # Make boto3.client return the right mock depending on service
+    def client_side_effect(service_name, *args, **kwargs):
+        if service_name == "cloudformation":
+            return mock_cf_client
+        elif service_name == "lambda":
+            return mock_lambda_client
+        else:
+            raise ValueError(f"Unexpected client: {service_name}")
+
+    mock_boto_client.side_effect = client_side_effect
+
+    mock_cf_client.describe_stacks.return_value = {
+        "Stacks": [
+            {
+                "StackName": "mystack",
+                "Outputs": [{"OutputKey": "SlackBotLambdaArn", "OutputValue": "output_SlackBotLambdaArn"}],
+            }
+        ]
+    }
+
+    # delete and import module to test
+    if "app.utils.handler_utils" in sys.modules:
+        del sys.modules["app.utils.handler_utils"]
+    from app.utils.handler_utils import trigger_pull_request_processing
+
+    # perform operation
+    event_data = {"test": "data"}
+    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"},
+    }
+
+    mock_lambda_client.invoke.assert_called_once_with(
+        FunctionName="output_SlackBotLambdaArn", InvocationType="Event", Payload=json.dumps(expected_lambda_payload)
+    )
+
+
+@patch("boto3.client")
+def test_trigger_pull_request_processing_error(
+    mock_boto_client: Mock,
+    mock_env: Mock,
+):
+    """Test triggering async processing"""
+    # set up mocks
+    mock_cf_client = Mock(name="cloudformation_client")
+    mock_lambda_client = Mock(name="lambda_client")
+
+    # Make boto3.client return the right mock depending on service
+    def client_side_effect(service_name, *args, **kwargs):
+        if service_name == "cloudformation":
+            return mock_cf_client
+        elif service_name == "lambda":
+            return mock_lambda_client
+        else:
+            raise ValueError(f"Unexpected client: {service_name}")
+
+    mock_boto_client.side_effect = client_side_effect
+
+    mock_cf_client.invoke.side_effect = Exception("Lambda invoke error")
+
+    # delete and import module to test
+    if "app.utils.handler_utils" in sys.modules:
+        del sys.modules["app.utils.handler_utils"]
+    from app.utils.handler_utils import trigger_pull_request_processing
+
+    # perform operation
+    event_data = {"test": "data"}
+    with pytest.raises(Exception):
+        trigger_pull_request_processing(pull_request_id="123", event=event_data, event_id="evt123")
+
+        # assertions
+
+        mock_lambda_client.invoke.assert_not_called()