Code review changes

data/model/legacy.py

@@ -331,13 +331,7 @@ def remove_team(org_name, team_name, removed_by_username):
 def add_or_invite_to_team(inviter, team, user=None, email=None):
   # If the user is a member of the organization, then we simply add the
   # user directly to the team. Otherwise, an invite is created for the user/email.
-  # We return None if the user was directly added and the invite object if the user was invited.
-  if email:
-    try:
-      user = User.get(email=email)
-    except User.DoesNotExist:
-      pass
-
+  # We return None if the user was directly added and the invite object if the user was invited.  
   requires_invite = True
   if user:
     orgname = team.organization.username
@@ -1918,6 +1912,19 @@ def confirm_email_authorization_for_repo(code):
   return found
 
 
+def delete_team_email_invite(team, email):
+  found = TeamMemberInvite.get(TeamMemberInvite.email == email, TeamMemberInvite.team == team)
+  found.delete_instance()
+
+def delete_team_user_invite(team, user):
+  try:
+    found = TeamMemberInvite.get(TeamMemberInvite.user == user, TeamMemberInvite.team == team)
+  except TeamMemberInvite.DoesNotExist:
+    return False
+
+  found.delete_instance()
+  return True
+
 def lookup_team_invites(user):
   return TeamMemberInvite.select().where(TeamMemberInvite.user == user)