Skip to content

fix(notification): Correct overriding in where_should_be_participating #29802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgaeta merged 2 commits into from
Nov 4, 2021
Merged

fix(notification): Correct overriding in where_should_be_participating #29802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1c69f9
Fix _get_setting_mapping_from_mapping
Nov 4, 2021
ecc3db6
Oops reverse order
Nov 4, 2021
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
12 changes: 3 additions & 9 deletions src/sentry/notifications/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,9 @@ def _get_setting_mapping_from_mapping(
for provider in notification_providers()
}

notification_settings_mapping = notification_settings_by_recipient.get(recipient)
if notification_settings_mapping:
specific_scope = get_scope_type(type)
notification_setting_option.update(
notification_settings_mapping.get(specific_scope)
or notification_settings_mapping.get(NotificationScopeType.USER)
or notification_settings_mapping.get(NotificationScopeType.TEAM)
or {}
)
notification_settings_mapping = notification_settings_by_recipient.get(recipient, {})
for scope in [NotificationScopeType.USER, NotificationScopeType.TEAM, get_scope_type(type)]:
notification_setting_option.update(notification_settings_mapping.get(scope, {}))

return notification_setting_option

Expand Down
23 changes: 23 additions & 0 deletions tests/sentry/notifications/utils/test_get_setting_mapping_from_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,26 @@ def test_get_setting_mapping_from_mapping_slack_always(self):
ExternalProviders.EMAIL: NotificationSettingOptionValues.ALWAYS,
ExternalProviders.SLACK: NotificationSettingOptionValues.ALWAYS,
}

def test_get_setting_mapping_from_mapping_project(self):
notification_settings = {
self.user: {
NotificationScopeType.USER: {
ExternalProviders.EMAIL: NotificationSettingOptionValues.NEVER,
ExternalProviders.SLACK: NotificationSettingOptionValues.ALWAYS,
},
NotificationScopeType.PROJECT: {
ExternalProviders.EMAIL: NotificationSettingOptionValues.NEVER,
},
}
}

mapping = _get_setting_mapping_from_mapping(
notification_settings,
self.user,
NotificationSettingTypes.ISSUE_ALERTS,
)
assert mapping == {
ExternalProviders.EMAIL: NotificationSettingOptionValues.NEVER,
ExternalProviders.SLACK: NotificationSettingOptionValues.ALWAYS,
}
1 change: 0 additions & 1 deletion tests/sentry/notifications/utils/test_should_be_participating.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ def test_where_should_be_participating(self):
assert providers == [ExternalProviders.EMAIL, ExternalProviders.SLACK]

def test_subscription_null(self):
self.user = User(id=1)
notification_settings = {
self.user: {
NotificationScopeType.USER: {
Expand Down