more types

Author: anthony-nhs

packages/slackBotFunction/app/services/dynamo.py

@@ -54,7 +54,9 @@ def store_state_information(item: dict[str, Any], condition: str = None) -> None
         )
 
 
-def update_state_information(key: str, update_expression: str, expression_attribute_values: dict[str, Any]) -> None:
+def update_state_information(
+    key: dict[str, Any], update_expression: str, expression_attribute_values: dict[str, Any]
+) -> None:
     start_time = time()
     table = get_slack_bot_state_table()
     is_success = True

packages/slackBotFunction/app/slack/slack_events.py

@@ -422,7 +422,7 @@ def get_conversation_session_data(conversation_key: str) -> Dict[str, Any]:
         return None
 
 
-def get_latest_message_ts(conversation_key: str) -> str:
+def get_latest_message_ts(conversation_key: str) -> str | None:
     """
     Get latest message timestamp from session
     """

packages/slackBotFunction/tests/test_async_processing.py

@@ -164,7 +164,7 @@ def test_process_async_slack_event_with_thread_ts(
         "event_id": "evt123",
         "bot_token": "bot-token",
     }
-    process_async_slack_event(slack_event_data)
+    process_async_slack_event(slack_event_data=slack_event_data)
 
     # assertions
     # Should be called at least once with the correct thread_ts

packages/slackBotFunction/tests/test_handler_utils.py

@@ -1,5 +1,7 @@
 import sys
 from unittest.mock import Mock, patch
+from slack_sdk.errors import SlackApiError
+from botocore.exceptions import ClientError
 
 
 @patch("app.services.dynamo.get_state_information")
@@ -211,3 +213,109 @@ def test_extract_key_and_root(mock_env: Mock):
     # assertions
     assert key == "dm#D123"
     assert root == "456"
+
+
+@patch("slack_sdk.WebClient")
+def test_respond_with_eyes_on_success(mock_webclient: Mock, mock_env: Mock):
+    """Test that respond with eyes"""
+    # set up mocks
+    mock_client = Mock()
+    mock_client.reactions_add.return_value = {"success"}
+    mock_webclient.return_value = mock_client
+
+    # delete and import module to test
+    if "app.utils.handler_utils" in sys.modules:
+        del sys.modules["app.utils.handler_utils"]
+    from app.slack.slack_handlers import respond_with_eyes
+
+    # perform operation
+    event = {"channel": "D123", "ts": "456", "channel_type": "im"}
+    respond_with_eyes("dummy_token", event)
+
+    # assertions
+    # just need to make sure it does not error
+
+
+@patch("slack_sdk.WebClient")
+def test_respond_with_eyes_on_failure(mock_webclient: Mock, mock_env: Mock):
+    """Test that respond with eyes"""
+    # set up mocks
+    mock_client = Mock()
+    mock_client.reactions_add.side_effect = SlackApiError("There was a problem", 500)
+    mock_webclient.return_value = mock_client
+
+    # delete and import module to test
+    if "app.utils.handler_utils" in sys.modules:
+        del sys.modules["app.utils.handler_utils"]
+    from app.slack.slack_handlers import respond_with_eyes
+
+    # perform operation
+    event = {"channel": "D123", "ts": "456", "channel_type": "im"}
+    respond_with_eyes("dummy_token", event)
+
+    # assertions
+    # just need to make sure it does not error
+
+
+@patch("app.services.dynamo.store_state_information")
+def test_is_duplicate_event_returns_true_when_conditional_check_fails(
+    mock_store_state_information: Mock,
+    mock_env: Mock,
+):
+    """Test duplicate event detection with conditional put"""
+    # set up mocks
+    error = ClientError(error_response={"Error": {"Code": "ConditionalCheckFailedException"}}, operation_name="PutItem")
+    mock_store_state_information.side_effect = 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 is_duplicate_event
+
+    # perform operation
+    result = is_duplicate_event("test-event")
+
+    # assertions
+    assert result is True
+
+
+@patch("app.services.dynamo.store_state_information")
+def test_is_duplicate_event_client_error(
+    mock_store_state_information: Mock,
+    mock_env: Mock,
+):
+    """Test is_duplicate_event handles other ClientError"""
+    # set up mocks
+    error = ClientError(error_response={"Error": {"Code": "SomeOtherError"}}, operation_name="PutItem")
+    mock_store_state_information.side_effect = 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 is_duplicate_event
+
+    # perform operation
+    result = is_duplicate_event("test-event")
+
+    # assertions
+    assert result is False
+
+
+@patch("app.services.dynamo.store_state_information")
+def test_is_duplicate_event_no_item(
+    mock_store_state_information: Mock,
+    mock_env: Mock,
+):
+    """Test is_duplicate_event when no item exists (successful put)"""
+    # set up mocks
+
+    # 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 is_duplicate_event
+
+    # perform operation
+    result = is_duplicate_event("test-event")
+
+    # assertions
+    assert result is False

packages/slackBotFunction/tests/test_handlers.py

@@ -36,7 +36,6 @@ def test_handler_async_processing(
 ):
     """Test Lambda handler function for async processing"""
     # set up mocks
-    mock_process_async_slack_event.return_value = {"statusCode": 200}
 
     # delete and import module to test
     if "app.handler" in sys.modules:
@@ -45,11 +44,10 @@ def test_handler_async_processing(
 
     # perform operation
     event = {"async_processing": True, "slack_event": {"body": "test event"}}
-    result = handler(event, lambda_context)
+    handler(event, lambda_context)
 
     # assertions
     mock_process_async_slack_event.assert_called_once()
-    assert result["statusCode"] == 200
 
 
 def test_handler_async_processing_missing_slack_event(
@@ -73,3 +71,50 @@ def test_handler_async_processing_missing_slack_event(
     assert isinstance(result, dict)
     assert "statusCode" in result
     assert result["statusCode"] == 400
+
+
+@patch("app.slack.slack_events.process_pull_request_slack_event")
+def test_handler_pull_request_processing(
+    mock_process_pull_request_slack_event: Mock,
+    mock_get_parameter: Mock,
+    mock_slack_app: Mock,
+    mock_env: Mock,
+    lambda_context: Mock,
+):
+    """Test Lambda handler function for pull request processing"""
+    # set up mocks
+
+    # delete and import module to test
+    if "app.handler" in sys.modules:
+        del sys.modules["app.handler"]
+    from app.handler import handler
+
+    # perform operation
+    event = {"pull_request_processing": True, "slack_event": {"body": "test event"}}
+    handler(event, lambda_context)
+
+    # assertions
+    mock_process_pull_request_slack_event.assert_called_once()
+
+
+def test_handler_pull_request_processing_missing_slack_event(
+    mock_slack_app: Mock, mock_env: Mock, mock_get_parameter: Mock, lambda_context: Mock
+):
+    """Test Lambda handler function for async processing without slack_event data"""
+    # set up mocks
+
+    # delete and import module to test
+    if "app.handler" in sys.modules:
+        del sys.modules["app.handler"]
+    from app.handler import handler
+
+    # perform operation
+    # Test async processing without slack_event - should return 400
+    event = {"pull_request_processing": True}  # Missing slack_event
+    result = handler(event, lambda_context)
+
+    # assertions
+    # Check that result is a dict with statusCode
+    assert isinstance(result, dict)
+    assert "statusCode" in result
+    assert result["statusCode"] == 400

packages/slackBotFunction/tests/test_pulll_request_processing.py

@@ -0,0 +1,73 @@
+import sys
+from unittest.mock import 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):
+    # set up mocks
+    mock_is_duplicate_event.return_value = False
+    mock_extract_pull_request_id.return_value = None, "test question"
+
+    # delete and import module to test
+    if "app.slack.slack_events" in sys.modules:
+        del sys.modules["app.slack.slack_events"]
+    from app.slack.slack_events import process_pull_request_slack_event
+
+    # perform operation
+    # patching process_async_slack_event here as its in the same module we are testing
+    with patch("app.slack.slack_events.process_async_slack_event") as mock_process_async_slack_event:
+        slack_event_data = {
+            "event": {
+                "text": "pr: 60 test question",
+                "user": "U456",
+                "channel": "C789",
+                "ts": "1234567890.123",
+                "thread_ts": "1234567888.111",  # Existing thread
+            },
+            "event_id": "evt123",
+        }
+        process_pull_request_slack_event(slack_event_data)
+
+        # assertions
+        expected_slack_event_data = {
+            "event": {
+                "text": "test question",
+                "user": "U456",
+                "channel": "C789",
+                "ts": "1234567890.123",
+                "thread_ts": "1234567888.111",  # Existing thread
+            },
+            "event_id": "evt123",
+        }
+        mock_process_async_slack_event.assert_called_once_with(slack_event_data=expected_slack_event_data)
+
+
+@patch("app.utils.handler_utils.is_duplicate_event")
+@patch("app.utils.handler_utils.extract_pull_request_id")
+def test_process_pull_request_duplicate_event(
+    mock_extract_pull_request_id: Mock, mock_is_duplicate_event: Mock, mock_env: Mock
+):
+    # set up mocks
+    mock_is_duplicate_event.return_value = True
+
+    # delete and import module to test
+    if "app.slack.slack_events" in sys.modules:
+        del sys.modules["app.slack.slack_events"]
+    from app.slack.slack_events import process_pull_request_slack_event
+
+    # perform operation
+    slack_event_data = {
+        "event": {
+            "text": "pr: 60 test question",
+            "user": "U456",
+            "channel": "C789",
+            "ts": "1234567890.123",
+            "thread_ts": "1234567888.111",  # Existing thread
+        },
+        "event_id": "evt123",
+    }
+    process_pull_request_slack_event(slack_event_data)
+
+    # assertions
+    mock_extract_pull_request_id.assert_not_called()