Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions experimenter/experimenter/slack/notification.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ def _send_dm_to_user(client, user_id, message, channel_message_link=None):
conversation = client.conversations_open(users=[user_id])
channel_id = conversation["channel"]["id"]

# Add channel message link if provided
dm_message = message
# Add prefix message and channel message link if provided
dm_message = (
f"Join {settings.SLACK_NIMBUS_CHANNEL} to get slack notifications: {message}"
)
if channel_message_link:
dm_message = f"{message}\n\nView in channel: {channel_message_link}"
dm_message = f"{dm_message}\n\nView in channel: {channel_message_link}"

client.chat_postMessage(
channel=channel_id, text=dm_message, unfurl_links=False, unfurl_media=False
Expand Down
14 changes: 13 additions & 1 deletion experimenter/experimenter/slack/tests/test_notification.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def test_send_slack_notification_experiment_not_found(self, mock_webclient):
# Should not call Slack API when experiment doesn't exist
mock_client.chat_postMessage.assert_not_called()

@override_settings(SLACK_AUTH_TOKEN="test-token")
@override_settings(SLACK_AUTH_TOKEN="test-token", SLACK_NIMBUS_CHANNEL="test-channel")
@patch("experimenter.slack.notification.WebClient")
def test_send_slack_notification_with_requesting_user(self, mock_webclient):
mock_client = Mock()
Expand Down Expand Up @@ -187,6 +187,13 @@ def test_send_slack_notification_with_requesting_user(self, mock_webclient):
)
self.assertIn("<@U789012>", message) # mentioned user

# Verify both DM messages include channel name prefix
dm_call_1 = mock_client.chat_postMessage.call_args_list[1]
dm_call_2 = mock_client.chat_postMessage.call_args_list[2]
for dm_call in [dm_call_1, dm_call_2]:
dm_message = dm_call.kwargs["text"]
self.assertIn("Join test-channel to get slack notifications:", dm_message)

@override_settings(SLACK_AUTH_TOKEN="test-token")
@patch("experimenter.slack.notification.WebClient")
def test_send_slack_notification_requesting_user_not_found(self, mock_webclient):
Expand Down Expand Up @@ -314,6 +321,11 @@ def test_send_slack_notification_channel_setting(self, mock_webclient):
self.assertEqual(call_args.kwargs["unfurl_links"], False)
self.assertEqual(call_args.kwargs["unfurl_media"], False)

# Verify DM message includes the custom channel name
dm_call = mock_client.chat_postMessage.call_args_list[1]
dm_message = dm_call.kwargs["text"]
self.assertIn("Join custom-channel to get slack notifications:", dm_message)

@override_settings(SLACK_AUTH_TOKEN="test-token")
@patch("experimenter.slack.notification.WebClient")
def test_send_slack_notification_empty_email(self, mock_webclient):
Expand Down