Skip to content

Commit a2d51ee

Browse files
committed
Remove app middleware from slack handler
1 parent 22c1d16 commit a2d51ee

File tree

2 files changed

+6
-51
lines changed

2 files changed

+6
-51
lines changed

packages/slackBotFunction/app/slack/slack_handlers.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ def setup_handlers(app):
2121
"""
2222
from app.config.config import bot_token
2323

24-
@app.middleware
25-
def log_request(slack_logger, body, next):
26-
"""Middleware to log all incoming Slack requests for debugging"""
27-
logger.debug("Slack request received", extra={"body": body})
28-
return next()
29-
3024
@app.event("app_mention")
3125
def handle_app_mention(event, ack, body):
3226
"""

packages/slackBotFunction/tests/test_slack_handlers.py

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,18 @@ def mock_env():
2222
yield env_vars
2323

2424

25-
def test_middleware_function(mock_env):
26-
"""Test middleware function execution"""
25+
def test_setup_handlers_registers_correctly(mock_env):
26+
"""Test that setup_handlers registers all handlers correctly"""
2727
from app.slack.slack_handlers import setup_handlers
2828

29-
# Create mock app
3029
mock_app = Mock()
3130

32-
# Mock the middleware decorator to capture the function
33-
middleware_func = None
34-
35-
def capture_middleware(func):
36-
nonlocal middleware_func
37-
middleware_func = func
38-
return func
39-
40-
mock_app.middleware = capture_middleware
41-
mock_app.event = Mock()
42-
mock_app.action = Mock()
43-
4431
with patch("app.config.config.bot_token", "test-token"):
4532
setup_handlers(mock_app)
4633

47-
# Test the middleware function
48-
if middleware_func:
49-
mock_logger = Mock()
50-
mock_body = {"test": "data"}
51-
mock_next = Mock(return_value="next_result")
52-
53-
result = middleware_func(mock_logger, mock_body, mock_next)
54-
55-
assert result == "next_result"
56-
mock_next.assert_called_once()
34+
# Verify all handlers are registered
35+
assert mock_app.event.call_count == 2 # app_mention and message
36+
assert mock_app.action.call_count == 2 # feedback_yes and feedback_no
5737

5838

5939
def test_app_mention_handler(mock_env):
@@ -74,7 +54,6 @@ def decorator(func):
7454

7555
return decorator
7656

77-
mock_app.middleware = Mock()
7857
mock_app.event = capture_event
7958
mock_app.action = Mock()
8059

@@ -113,7 +92,6 @@ def decorator(func):
11392

11493
return decorator
11594

116-
mock_app.middleware = Mock()
11795
mock_app.event = capture_event
11896
mock_app.action = Mock()
11997

@@ -151,7 +129,6 @@ def decorator(func):
151129

152130
return decorator
153131

154-
mock_app.middleware = Mock()
155132
mock_app.event = capture_event
156133
mock_app.action = Mock()
157134

@@ -190,7 +167,6 @@ def decorator(func):
190167

191168
return decorator
192169

193-
mock_app.middleware = Mock()
194170
mock_app.event = capture_event
195171
mock_app.action = Mock()
196172

@@ -228,7 +204,6 @@ def decorator(func):
228204

229205
return decorator
230206

231-
mock_app.middleware = Mock()
232207
mock_app.event = Mock()
233208
mock_app.action = capture_action
234209

@@ -272,7 +247,6 @@ def decorator(func):
272247

273248
return decorator
274249

275-
mock_app.middleware = Mock()
276250
mock_app.event = Mock()
277251
mock_app.action = capture_action
278252

@@ -314,7 +288,6 @@ def decorator(func):
314288

315289
return decorator
316290

317-
mock_app.middleware = Mock()
318291
mock_app.event = capture_event
319292
mock_app.action = Mock()
320293

@@ -342,18 +315,7 @@ def test_is_duplicate_event_error_handling(mock_env):
342315
mock_table.put_item.side_effect = ClientError({"Error": {"Code": "SomeOtherError"}}, "put_item")
343316

344317
result = is_duplicate_event("test-event")
345-
assert result is False # Should return False on non-conditional errorsandlers import is_duplicate_event
346-
347-
with patch("app.config.config.table") as mock_table:
348-
# Test non-ConditionalCheckFailedException error
349-
error = ClientError(error_response={"Error": {"Code": "ServiceUnavailable"}}, operation_name="PutItem")
350-
mock_table.put_item.side_effect = error
351-
352-
with patch("time.time", return_value=1000):
353-
result = is_duplicate_event("test-event")
354-
355-
# Should return False on error to allow processing
356-
assert result is False
318+
assert result is False # Should return False on non-conditional errors
357319

358320

359321
def test_duplicate_event_skip_processing(mock_env):
@@ -374,7 +336,6 @@ def decorator(func):
374336

375337
return decorator
376338

377-
mock_app.middleware = Mock()
378339
mock_app.event = capture_event
379340
mock_app.action = Mock()
380341

0 commit comments

Comments
 (0)