Add the team membership to the robots view

data/model/legacy.py

@@ -310,15 +310,44 @@ def _list_entity_robots(entity_name):
           .where(User.robot == True, User.username ** (entity_name + '+%')))
 
 
-def list_entity_robot_tuples(entity_name):
-  return (_list_entity_robots(entity_name)
+class _TupleWrapper(object):
+  def __init__(self, data, fields):
+    self._data = data
+    self._fields = fields
+
+  def get(self, field):
+    return self._data[self._fields.index(field.name + ':' + field.model_class.__name__)]
+
+
+class TupleSelector(object):
+  """ Helper class for selecting tuples from a peewee query and easily accessing
+      them as if they were objects.
+  """
+  def __init__(self, query, fields):
+    self._query = query.select(*fields).tuples()
+    self._fields = [field.name + ':' + field.model_class.__name__ for field in fields]
+
+  def __iter__(self):
+    return self._build_iterator()
+
+  def _build_iterator(self):
+    for tuple_data in self._query:
+      yield _TupleWrapper(tuple_data, self._fields)
+
+
+
+def list_entity_robot_permission_teams(entity_name):
+  query = (_list_entity_robots(entity_name)
           .join(RepositoryPermission, JOIN_LEFT_OUTER,
                 on=(RepositoryPermission.user == FederatedLogin.user))
           .join(Repository, JOIN_LEFT_OUTER)
           .switch(User)
-          .group_by(User, FederatedLogin)
-          .select(User.username, FederatedLogin.service_ident, fn.Count(Repository.id))
-          .tuples())
+          .join(TeamMember, JOIN_LEFT_OUTER)
+          .join(Team, JOIN_LEFT_OUTER))
+
+  fields = [User.username, FederatedLogin.service_ident, Repository.name, Team.name]
+  return TupleSelector(query, fields)
+
 
 def list_robot_permissions(robot_name):
   return (RepositoryPermission.select(RepositoryPermission, User, Repository)