From 89b7c13da569521e3b45bb11181d3b1dc74f90d8 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Tue, 21 Feb 2017 10:55:31 -0500 Subject: [PATCH] Catch team member invite missing exception Fixes https://sentry.io/coreos/backend-production/issues/195926082/ --- data/model/team.py | 7 ++++++- endpoints/api/team.py | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/data/model/team.py b/data/model/team.py index 738a27407..753d00e2f 100644 --- a/data/model/team.py +++ b/data/model/team.py @@ -257,8 +257,13 @@ def get_organization_team_member_invites(teamid): def delete_team_email_invite(team, email): - found = TeamMemberInvite.get(TeamMemberInvite.email == email, TeamMemberInvite.team == team) + try: + found = TeamMemberInvite.get(TeamMemberInvite.email == email, TeamMemberInvite.team == team) + except TeamMemberInvite.DoesNotExist: + return False + found.delete_instance() + return True def delete_team_user_invite(team, user_obj): diff --git a/endpoints/api/team.py b/endpoints/api/team.py index a427c472a..81b779b58 100644 --- a/endpoints/api/team.py +++ b/endpoints/api/team.py @@ -347,7 +347,9 @@ class InviteTeamMember(ApiResource): raise NotFound() # Delete the invite. - model.team.delete_team_email_invite(team, email) + if not model.team.delete_team_email_invite(team, email): + raise NotFound() + log_action('org_delete_team_member_invite', orgname, { 'email': email, 'team': teamname,