Skip to content

fix(aci): Gracefully handle missing OrganizationMember in MetricAlert target lookup #94

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(aci): Gracefully handle missing OrganizationMember in MetricAlert target lookup #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 4 deletions ...ication_action/group_type_notification_registry/handlers/metric_alert_registry_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ def target(action: Action) -> OrganizationMember | Team | str | None:
target_type = action.config.get("target_type")
if target_type == ActionTarget.USER.value:
dcga = DataConditionGroupAction.objects.get(action=action)
return OrganizationMember.objects.get(
user_id=int(target_identifier),
organization=dcga.condition_group.organization,
)
try:
return OrganizationMember.objects.get(
user_id=int(target_identifier),
organization=dcga.condition_group.organization,
)
except OrganizationMember.DoesNotExist:
# user is no longer a member of the organization
pass
Comment on lines +54 to +56
Copy link

@propel-test-bot propel-test-bot bot Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[BestPractice]

The function now exits gracefully when OrganizationMember doesn't exist, but it doesn't return None explicitly. While Python functions return None by default, it's clearer to be explicit about the return value when handling the exception case.

Suggested change
except OrganizationMember.DoesNotExist:
# user is no longer a member of the organization
pass
except OrganizationMember.DoesNotExist:
# user is no longer a member of the organization
return None

⚡ Committable suggestion

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Context for Agents 
[**BestPractice**]

The function now exits gracefully when OrganizationMember doesn't exist, but it doesn't return None explicitly. While Python functions return None by default, it's clearer to be explicit about the return value when handling the exception case.

```suggestion
            except OrganizationMember.DoesNotExist:
                # user is no longer a member of the organization
                return None
```

⚡ **Committable suggestion**

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

File: src/sentry/notifications/notification_action/group_type_notification_registry/handlers/metric_alert_registry_handler.py
Line: 56

elif target_type == ActionTarget.TEAM.value:
try:
return Team.objects.get(id=int(target_identifier))
Expand Down