Get team invite confirmation working and fully tested

data/model/legacy.py

@@ -71,6 +71,10 @@ class TooManyUsersException(DataModelException):
   pass
 
 
+class UserAlreadyInTeam(DataModelException):
+  pass
+
+
 def is_create_user_allowed():
   return get_active_user_count() < config.app_config['LICENSE_USER_LIMIT']
 
@@ -294,7 +298,7 @@ def remove_team(org_name, team_name, removed_by_username):
   team.delete_instance(recursive=True, delete_nullable=True)
 
 
-def add_or_invite_to_team(team, user=None, email=None, adder=None):
+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.
@@ -326,15 +330,16 @@ def add_or_invite_to_team(team, user=None, email=None, adder=None):
     add_user_to_team(user, team)
     return None
 
-  return TeamMemberInvite.create(user=user, email=email if not user else None, team=team)
+  return TeamMemberInvite.create(user=user, email=email if not user else None, team=team,
+                                 inviter=inviter)
 
 
 def add_user_to_team(user, team):
   try:
     return TeamMember.create(user=user, team=team)
   except Exception:
-    raise DataModelException('User \'%s\' is already a member of team \'%s\'' %
-                             (user.username, team.name))
+    raise UserAlreadyInTeam('User \'%s\' is already a member of team \'%s\'' %
+                            (user.username, team.name))
 
 
 def remove_user_from_team(org_name, team_name, username, removed_by_username):
@@ -1766,6 +1771,32 @@ def delete_notifications_by_kind(target, kind_name):
   Notification.delete().where(Notification.target == target,
                               Notification.kind == kind_ref).execute()
 
+def delete_matching_notifications(target, kind_name, **kwargs):
+  kind_ref = NotificationKind.get(name=kind_name)
+
+  # Load all notifications for the user with the given kind.
+  notifications = list(Notification.select().where(
+      Notification.target == target,
+      Notification.kind == kind_ref))
+
+  # For each, match the metadata to the specified values.
+  for notification in notifications:
+    matches = True
+    try:
+      metadata = json.loads(notification.metadata_json)
+    except:
+      continue
+
+    for (key, value) in kwargs.iteritems():
+      if not key in metadata or metadata[key] != value:
+        matches = False
+        break
+
+    if not matches:
+      continue
+
+    notification.delete_instance()
+
 
 def get_active_users():
   return User.select().where(User.organization == False, User.robot == False)
@@ -1821,3 +1852,51 @@ def confirm_email_authorization_for_repo(code):
   found.save()
 
   return found
+
+
+def lookup_team_invites(user):
+  return TeamMemberInvite.select().where(TeamMemberInvite.user == user)
+
+def lookup_team_invite(code, user):
+ # Lookup the invite code.
+  try:
+    found = TeamMemberInvite.get(TeamMemberInvite.invite_token == code)
+  except TeamMemberInvite.DoesNotExist:
+    raise DataModelException('Invalid confirmation code.')
+
+  # Verify the code applies to the current user.
+  if found.user:
+    if found.user != user:
+      raise DataModelException('Invalid confirmation code.')
+  else:
+    if found.email != user.email:
+      raise DataModelException('Invalid confirmation code.')
+    
+  return found
+
+
+def delete_team_invite(code, user):
+  found = lookup_team_invite(code, user)
+
+  team = found.team
+  inviter = found.inviter
+
+  found.delete_instance()
+
+  return (team, inviter)
+
+def confirm_team_invite(code, user):
+  found = lookup_team_invite(code, user)
+
+  # Add the user to the team.
+  try:
+    add_user_to_team(user, found.team)
+  except UserAlreadyInTeam:
+    # Ignore.
+    pass
+  
+  # Delete the invite and return the team.
+  team = found.team
+  inviter = found.inviter
+  found.delete_instance()
+  return (team, inviter)