Fix: [AEA-6308] - Fix Command Endpoint (#397)

## Summary

Fix Slack Command endpoint for `/test`

---------

Co-authored-by: bencegadanyi1-nhs <bence.gadanyi1@nhs.net>

Author: kieran-wilkinson-4

packages/slackBotFunction/app/slack/slack_events.py

@@ -433,16 +433,16 @@ def process_async_slack_event(event: Dict[str, Any], event_id: str, client: WebC
     process_slack_message(event=event, event_id=event_id, client=client)
 
 
-def process_async_slack_command(command: Dict[str, Any], client: WebClient) -> None:
-    logger.debug("Processing async Slack command", extra={"command": command})
+def process_async_slack_command(body: Dict[str, Any], client: WebClient) -> None:
+    logger.debug("Processing async Slack command", extra={"body": body})
 
     try:
-        command_arg = command.get("command", "").strip()
+        command_arg = body.get("command", "").strip()
         if command_arg == "/test":
-            process_command_test_request(command=command, client=client)
+            process_command_test_request(body=body, client=client)
     except Exception as e:
         logger.error(f"Error processing test command: {e}", extra={"error": traceback.format_exc()})
-        post_error_message(channel=command["channel_id"], thread_ts=None, client=client)
+        post_error_message(channel=body["channel_id"], thread_ts=None, client=client)
 
 
 # ================================================================
@@ -474,7 +474,7 @@ def process_pull_request_slack_command(slack_command_data: Dict[str, Any]) -> No
         command = slack_command_data["event"]
         token = get_bot_token()
         client = WebClient(token=token)
-        process_async_slack_command(command=command, client=client)
+        process_async_slack_command(body=command, 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
         logger.error(processing_error_message, extra={"error": traceback.format_exc()})
@@ -804,22 +804,23 @@ def _toggle_button_style(element: dict) -> bool:
 # ================================================================
 
 
-def process_command_test_request(command: Dict[str, Any], client: WebClient) -> None:
-    if "help" in command.get("text"):
-        process_command_test_help(command=command, client=client)
+def process_command_test_request(body: Dict[str, Any], client: WebClient) -> None:
+    logger.info("Processing Command Test Request", extra={"body": body})
+    if "help" in body.get("text"):
+        process_command_test_help(body=body, client=client)
     else:
-        process_command_test_questions(command=command, client=client)
+        process_command_test_questions(body=body, client=client)
 
 
-def process_command_test_questions(command: Dict[str, Any], client: WebClient) -> None:
+def process_command_test_questions(body: Dict[str, Any], client: WebClient) -> None:
     # Prepare response
 
     try:
-        acknowledgement_msg = f"<@{command.get("user_id")}> has initiated testing."
-        logger.info(acknowledgement_msg, extra={"command": command})
+        acknowledgement_msg = f"<@{body.get('user_id')}> has initiated testing."
+        logger.info(acknowledgement_msg, extra={"body": body})
 
         # Extract parameters
-        params = extract_test_command_params(command.get("text"))
+        params = extract_test_command_params(body.get("text"))
 
         # Is the command targeting a PR
         pr = params.get("pr", "").strip()
@@ -829,7 +830,7 @@ def process_command_test_questions(command: Dict[str, Any], client: WebClient) -
 
         # Initial acknowledgment
         post_params = {
-            "channel": command["channel_id"],
+            "channel": body["channel_id"],
             "text": acknowledgement_msg,
         }
         client.chat_postMessage(**post_params)
@@ -846,10 +847,10 @@ def process_command_test_questions(command: Dict[str, Any], client: WebClient) -
 
         # Post query information (for reflection in future)
         post_params = {
-            "channel": command["channel_id"],
+            "channel": body["channel_id"],
             "text": acknowledgement_msg,
         }
-        client.chat_postEphemeral(**post_params, user=command.get("user_id"))
+        client.chat_postEphemeral(**post_params, user=body.get("user_id"))
 
         # Retrieve sample questions
         test_questions = SampleQuestionBank().get_questions(start=start - 1, end=end - 1)
@@ -876,7 +877,7 @@ def process_command_test_questions(command: Dict[str, Any], client: WebClient) -
                 futures.append(future)
 
         post_params["text"] = "Testing complete, generating file..."
-        client.chat_postEphemeral(**post_params, user=command.get("user_id"))
+        client.chat_postEphemeral(**post_params, user=body.get("user_id"))
 
         aggregated_results = []
         for i, future in enumerate(futures):
@@ -897,7 +898,7 @@ def process_command_test_questions(command: Dict[str, Any], client: WebClient) -
 
         # Upload the file to Slack
         client.files_upload_v2(
-            channel=command["channel_id"],
+            channel=body["channel_id"],
             content=final_file_content,
             title=filename,
             filename=filename,
@@ -907,7 +908,7 @@ def process_command_test_questions(command: Dict[str, Any], client: WebClient) -
     except Exception as e:
         logger.error(
             f"Failed to attach feedback buttons: {e}",
-            extra={"channel": command["channel_id"], "error": traceback.format_exc()},
+            extra={"channel": body["channel_id"], "error": traceback.format_exc()},
         )
 
 
@@ -939,8 +940,8 @@ def process_command_test_ai_request(question, response, output: bool, client: We
     return {"index": f"{question[0]}", "text": question[1], "response": response_text}
 
 
-def process_command_test_help(command: Dict[str, Any], client: WebClient) -> None:
-    logger.info("Processing Command Test Help Message", extra={"command": command})
+def process_command_test_help(body: Dict[str, Any], client: WebClient) -> None:
+    logger.info("Processing Command Test Help Message", extra={"body": body})
     length = SampleQuestionBank().length() + 1
     help_text = f"""
     Certainly! Here is some help testing me!
@@ -962,7 +963,7 @@ def process_command_test_help(command: Dict[str, Any], client: WebClient) -> Non
         - /test q10-16 --> Sends questions 10 to 16
         - /test .output -> Sends questions 1 to {length} and posts them to Slack
     """  # noqa: E501
-    client.chat_postEphemeral(channel=command["channel_id"], user=command["user_id"], text=help_text)
+    client.chat_postEphemeral(channel=body["channel_id"], user=body["user_id"], text=help_text)
 
 
 # ================================================================

packages/slackBotFunction/app/slack/slack_handlers.py

@@ -12,7 +12,7 @@
 from functools import lru_cache
 import traceback
 from typing import Any, Dict
-from slack_bolt import Ack, App, Say
+from slack_bolt import Ack, App
 from slack_sdk import WebClient
 from app.core.config import (
     get_logger,
@@ -67,9 +67,9 @@ def respond_to_action(ack: Ack):
 
 
 # ack function for commands where we just send an ack response back
-def respond_to_command(ack: Ack, say: Say):
-    logger.debug("Sending ack response for command")
-    ack()
+def respond_to_command(body, ack):
+    logger.debug("Sending ack response for help command", extra={"body": body, "ack": ack})
+    ack("Testing initiated")
 
 
 def feedback_handler(body: Dict[str, Any], client: WebClient) -> None:
@@ -149,20 +149,20 @@ def unified_message_handler(client: WebClient, event: Dict[str, Any], body: Dict
         logger.error("Error triggering async processing for event", extra={"error": traceback.format_exc()})
 
 
-def command_handler(body: Dict[str, Any], command: Dict[str, Any], client: WebClient) -> None:
+def command_handler(respond, body, client: WebClient) -> None:
     """Handle /test command to prompt the bot to respond."""
-    logger.info("Received command from user", extra={"body": body, "command": command, "client": client})
-    if not command:
+    logger.info("Received command from user", extra={"body": body})
+    if not body:
         logger.error("Invalid command payload")
         return
 
-    user_id = command.get("user_id")
-    session_pull_request_id = extract_test_command_params(command.get("text")).get("pr")
+    user_id = body.get("user_id")
+    session_pull_request_id = extract_test_command_params(body.get("text")).get("pr")
     if session_pull_request_id:
         logger.info(f"Command in pull request session {session_pull_request_id} from user {user_id}")
         forward_to_pull_request_lambda(
             body=body,
-            event={**command, "channel": command.get("channel_id")},
+            event={**body, "channel": body.get("channel_id")},
             pull_request_id=session_pull_request_id,
             event_id=f"/command-{time.time()}",
             store_pull_request_id=False,
@@ -171,6 +171,6 @@ def command_handler(body: Dict[str, Any], command: Dict[str, Any], client: WebCl
         return
 
     try:
-        process_async_slack_command(command, client)
+        process_async_slack_command(body=body, client=client)
     except Exception:
         logger.error("Error triggering async processing for command", extra={"error": traceback.format_exc()})

packages/slackBotFunction/tests/test_slack_commands.py

@@ -127,7 +127,7 @@ def test_process_slack_command_test_questions_ai_request_to_file(
     mock_client.chat_postMessage.return_value = mock_response
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     assert mock_query_bedrock.call_count == 21
@@ -163,7 +163,7 @@ def test_process_slack_command_test_questions_default_to_file(
     mock_process_ai_query.return_value = {"text": "ai response", "session_id": None, "citations": [], "kb_response": {}}
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     mock_client.chat_postMessage.assert_called_once()
@@ -202,7 +202,7 @@ def test_process_slack_command_test_questions_single_question_to_file(
     mock_process_ai_query.return_value = {"text": "ai response", "session_id": None, "citations": [], "kb_response": {}}
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     mock_client.chat_postMessage.asset_called_once()
@@ -237,7 +237,7 @@ def test_process_slack_command_test_questions_two_questions_to_file(
     mock_process_ai_query.return_value = {"text": "ai response", "session_id": None, "citations": [], "kb_response": {}}
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     mock_client.chat_postMessage.assert_called_once()
@@ -272,7 +272,7 @@ def test_process_slack_command_test_questions_ai_request_to_slack(
     mock_client.chat_postMessage.return_value = mock_response
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     assert mock_query_bedrock.call_count == 21
@@ -308,7 +308,7 @@ def test_process_slack_command_test_questions_default_to_slack(
     mock_process_ai_query.return_value = {"text": "ai response", "session_id": None, "citations": [], "kb_response": {}}
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     mock_client.chat_postMessage.assert_called()
@@ -347,7 +347,7 @@ def test_process_slack_command_test_questions_single_question_to_slack(
     mock_process_ai_query.return_value = {"text": "ai response", "session_id": None, "citations": [], "kb_response": {}}
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     mock_client.chat_postMessage.assert_called()
@@ -381,7 +381,7 @@ def test_process_slack_command_test_questions_two_questions_to_slack(
     mock_process_ai_query.return_value = {"text": "ai response", "session_id": None, "citations": [], "kb_response": {}}
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     mock_client.chat_postMessage.assert_called()
@@ -423,7 +423,7 @@ def test_process_slack_command_test_questions_too_many_questions_error(
 
         # with pytest.raises(ValueError, match="'end' must be less than 21"):
         # perform operation
-        process_async_slack_command(command=slack_command_data, client=mock_client)
+        process_async_slack_command(body=slack_command_data, client=mock_client)
 
         # assertions
         mock_client.chat_postMessage.asset_not_called()
@@ -460,7 +460,7 @@ def test_process_slack_command_test_help(
     mock_process_ai_query.return_value = {"text": "ai response", "session_id": None, "citations": [], "kb_response": {}}
 
     # perform operation
-    process_async_slack_command(command=slack_command_data, client=mock_client)
+    process_async_slack_command(body=slack_command_data, client=mock_client)
 
     # assertions
     mock_client.chat_postMessage.assert_not_called()