refactor

Author: anthony-nhs

packages/slackBotFunction/app/slack/slack_handlers.py

@@ -9,56 +9,55 @@
 
 logger = get_logger()
 
+# ================================================================
+# Event and message handlers
+# ================================================================
 
-@lru_cache()
-def setup_handlers(app: App):
+
+def mention_handler(event, ack, body):
     """
-    Register all event handlers with the Slack app
+    Handle @mentions in channels - when users mention the bot in a channel
+    Acknowledges the event immediately and triggers async processing to avoid timeouts
     """
+    ack()
+
+    event_id = body.get("event_id")
+    if not event_id or is_duplicate_event(event_id):
+        logger.info("Skipping duplicate or missing event", extra={"event_id": event_id})
+        return
+
+    user_id = event.get("user", "unknown")
+    logger.info("Processing @mention from user", extra={"user_id": user_id, "event_id": event_id})
 
-    @app.middleware
-    def log_request(slack_logger, body, next):
-        logger.debug("Slack request received", extra={"body": body})
-        return next()
-
-    @app.event("app_mention")
-    def handle_app_mention(event, ack, body):
-        """
-        Handle @mentions in channels - when users mention the bot in a channel
-        Acknowledges the event immediately and triggers async processing to avoid timeouts
-        """
-        ack()
-
-        event_id = body.get("event_id")
-        if not event_id or is_duplicate_event(event_id):
-            logger.info("Skipping duplicate or missing event", extra={"event_id": event_id})
-            return
-
-        user_id = event.get("user", "unknown")
-        logger.info("Processing @mention from user", extra={"user_id": user_id, "event_id": event_id})
-
-        bot_token = get_bot_token()
-        trigger_async_processing({"event": event, "event_id": event_id, "bot_token": bot_token})
-
-    @app.event("message")
-    def handle_direct_message(event, ack, body):
-        """
-        Handle direct messages to the bot - private 1:1 conversations
-        Filters out channel messages and processes only direct messages
-        """
-        ack()
-
-        # Only handle DMs, ignore channel messages
-        if event.get("channel_type") != "im":
-            return
-
-        event_id = body.get("event_id")
-        if not event_id or is_duplicate_event(event_id):
-            logger.info("Skipping duplicate or missing event", extra={"event_id": event_id})
-            return
-
-        user_id = event.get("user", "unknown")
-        logger.info("Processing DM from user", extra={"user_id": user_id, "event_id": event_id})
-
-        bot_token = get_bot_token()
-        trigger_async_processing({"event": event, "event_id": event_id, "bot_token": bot_token})
+    bot_token = get_bot_token()
+    trigger_async_processing({"event": event, "event_id": event_id, "bot_token": bot_token})
+
+
+def dm_message_handler(event, ack, body):
+    """
+    Handle direct messages to the bot - private 1:1 conversations
+    Filters out channel messages and processes only direct messages
+    """
+    ack()
+
+    # Only handle DMs, ignore channel messages
+    if event.get("channel_type") != "im":
+        return
+
+    event_id = body.get("event_id")
+    if not event_id or is_duplicate_event(event_id):
+        logger.info("Skipping duplicate or missing event", extra={"event_id": event_id})
+        return
+
+    user_id = event.get("user", "unknown")
+    logger.info("Processing DM from user", extra={"user_id": user_id, "event_id": event_id})
+
+    bot_token = get_bot_token()
+    trigger_async_processing({"event": event, "event_id": event_id, "bot_token": bot_token})
+
+
+@lru_cache()
+def setup_handlers(app: App):
+    """Register handlers. Intentionally minimal—no branching here."""
+    app.event("app_mention")(mention_handler)
+    app.event("message")(dm_message_handler)

packages/slackBotFunction/tests/test_middleware.py

@@ -2,37 +2,6 @@
 from unittest.mock import Mock, patch
 
 
-def test_log_request_middleware_execution(mock_slack_app, mock_env, mock_get_parameter, lambda_context):
-    """Test log_request middleware actual execution"""
-    if "app.slack.slack_handlers" in sys.modules:
-        del sys.modules["app.slack.slack_handlers"]
-
-    from app.slack.slack_handlers import setup_handlers
-
-    setup_handlers(mock_slack_app)
-
-    # Verify the app.middleware decorator was called during import
-    mock_slack_app.middleware.assert_called()
-
-    # Get the middleware function that was registered
-    middleware_calls = mock_slack_app.middleware.call_args_list
-    assert len(middleware_calls) > 0
-
-    # The middleware function should be the log_request function
-    middleware_func = middleware_calls[0][0][0]  # First argument of first call
-
-    # Now test calling the middleware function directly
-    mock_next = Mock(return_value="middleware_result")
-    mock_logger = Mock()
-    test_body = {"test": "body"}
-
-    # This should execute lines 56-57 in the log_request function
-    result = middleware_func(mock_logger, test_body, mock_next)
-
-    assert result == "middleware_result"
-    mock_next.assert_called_once()
-
-
 @patch("app.utils.handler_utils.is_duplicate_event")
 @patch("app.utils.handler_utils.trigger_async_processing")
 def test_app_mention_handler_execution_simple(