Add the team membership to the robots view

endpoints/api/robot.py

@@ -5,15 +5,15 @@ from auth.permissions import AdministerOrganizationPermission, OrganizationMembe
 from auth.auth_context import get_authenticated_user
 from auth import scopes
 from data import model
+from data.database import User, Team, Repository, FederatedLogin
 from util.names import format_robot_username
 from flask import abort
+from app import avatar
 
-
-def robot_view(name, token, count=None):
+def robot_view(name, token):
   return {
     'name': name,
-    'token': token,
-    'permission_count': count
+    'token': token
   }
 
 
@@ -27,6 +27,41 @@ def permission_view(permission):
   }
 
 
+def robots_list(prefix):
+  tuples = model.list_entity_robot_permission_teams(prefix)
+
+  robots = {}
+  robot_teams = set()
+
+  for robot_tuple in tuples:
+    robot_name = robot_tuple.get(User.username)
+    if not robot_name in robots:
+      robots[robot_name] = {
+        'name': robot_name,
+        'token': robot_tuple.get(FederatedLogin.service_ident),
+        'teams': [],
+        'repositories': []
+      }
+
+    team_name = robot_tuple.get(Team.name)
+    repository_name = robot_tuple.get(Repository.name)
+
+    if team_name is not None:
+      check_key = robot_name + ':' + team_name
+      if not check_key in robot_teams:
+        robot_teams.add(check_key)
+
+        robots[robot_name]['teams'].append({
+          'name': team_name,
+          'avatar': avatar.get_data(team_name, team_name, 'team')
+        })
+
+    if repository_name is not None:
+      if not repository_name in robots[robot_name]['repositories']:
+        robots[robot_name]['repositories'].append(repository_name)
+
+  return {'robots': robots.values()}
+
 @resource('/v1/user/robots')
 @internal_only
 class UserRobotList(ApiResource):
@@ -36,10 +71,7 @@ class UserRobotList(ApiResource):
   def get(self):
     """ List the available robots for the user. """
     user = get_authenticated_user()
-    robots = model.list_entity_robot_tuples(user.username)
-    return {
-      'robots': [robot_view(name, password, count) for name, password, count in robots]
-    }
+    return robots_list(user.username)
 
 
 @resource('/v1/user/robots/<robot_shortname>')
@@ -85,10 +117,7 @@ class OrgRobotList(ApiResource):
     """ List the organization's robots. """
     permission = OrganizationMemberPermission(orgname)
     if permission.can():
-      robots = model.list_entity_robot_tuples(orgname)
-      return {
-        'robots': [robot_view(name, password, count) for name, password, count in robots]
-      }
+      return robots_list(orgname)
 
     raise Unauthorized()