vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix performance problem with looking up org members and add some tests

Browse source
This commit is contained in:
Joseph Schorr 2014-11-20 11:33:42 -05:00
parent 3080c47ef2
commit 9b31b9805a
2 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/model/legacy.py
View file

@ -750,9 +750,13 @@ def get_organization_team_member_invites(teamid):
def get_organization_member_set(orgname): def get_organization_member_set(orgname):
Org = User.alias() Org = User.alias()
user_teams = User.select(User.username).join(TeamMember).join(Team) org_users = (User.select(User.username)
with_org = user_teams.join(Org, on=(Org.username == orgname)) .join(TeamMember)
return {user.username for user in with_org} .join(Team)
.join(Org, on=(Org.id == Team.organization))
.where(Org.username == orgname)
.distinct())
return {user.username for user in org_users}
def get_teams_within_org(organization): def get_teams_within_org(organization):

30
test/test_api_usage.py
View file

@ -1611,14 +1611,38 @@ class TestListAndDeleteTag(ApiTestCase):
class TestRepoPermissions(ApiTestCase): class TestRepoPermissions(ApiTestCase):
def listUserPermissions(self): def listUserPermissions(self, namespace=ADMIN_ACCESS_USER, repo='simple'):
return self.getJsonResponse(RepositoryUserPermissionList, return self.getJsonResponse(RepositoryUserPermissionList,
params=dict(repository=ADMIN_ACCESS_USER + '/simple'))['permissions'] params=dict(repository=namespace + '/' + repo))['permissions']
def listTeamPermissions(self): def listTeamPermissions(self):
return self.getJsonResponse(RepositoryTeamPermissionList, return self.getJsonResponse(RepositoryTeamPermissionList,
params=dict(repository=ORGANIZATION + '/' + ORG_REPO))['permissions'] params=dict(repository=ORGANIZATION + '/' + ORG_REPO))['permissions']
def test_userpermissions_underorg(self):
self.login(ADMIN_ACCESS_USER)
permissions = self.listUserPermissions(namespace=ORGANIZATION, repo=ORG_REPO)
self.assertEquals(1, len(permissions))
assert 'outsideorg' in permissions
self.assertEquals('read', permissions['outsideorg']['role'])
self.assertEquals(False, permissions['outsideorg']['is_org_member'])
# Add another user.
self.putJsonResponse(RepositoryUserPermission,
params=dict(repository=ORGANIZATION + '/' + ORG_REPO, username=ADMIN_ACCESS_USER),
data=dict(role='admin'))
# Verify the user is present.
permissions = self.listUserPermissions(namespace=ORGANIZATION, repo=ORG_REPO)
self.assertEquals(2, len(permissions))
assert ADMIN_ACCESS_USER in permissions
self.assertEquals('admin', permissions[ADMIN_ACCESS_USER]['role'])
self.assertEquals(True, permissions[ADMIN_ACCESS_USER]['is_org_member'])
def test_userpermissions(self): def test_userpermissions(self):
self.login(ADMIN_ACCESS_USER) self.login(ADMIN_ACCESS_USER)
@ -1628,6 +1652,7 @@ class TestRepoPermissions(ApiTestCase):
self.assertEquals(1, len(permissions)) self.assertEquals(1, len(permissions))
assert ADMIN_ACCESS_USER in permissions assert ADMIN_ACCESS_USER in permissions
self.assertEquals('admin', permissions[ADMIN_ACCESS_USER]['role']) self.assertEquals('admin', permissions[ADMIN_ACCESS_USER]['role'])
self.assertFalse('is_org_member' in permissions[ADMIN_ACCESS_USER])
# Add another user. # Add another user.
self.putJsonResponse(RepositoryUserPermission, self.putJsonResponse(RepositoryUserPermission,
@ -1640,6 +1665,7 @@ class TestRepoPermissions(ApiTestCase):
self.assertEquals(2, len(permissions)) self.assertEquals(2, len(permissions))
assert NO_ACCESS_USER in permissions assert NO_ACCESS_USER in permissions
self.assertEquals('read', permissions[NO_ACCESS_USER]['role']) self.assertEquals('read', permissions[NO_ACCESS_USER]['role'])
self.assertFalse('is_org_member' in permissions[NO_ACCESS_USER])
json = self.getJsonResponse(RepositoryUserPermission, json = self.getJsonResponse(RepositoryUserPermission,
params=dict(repository=ADMIN_ACCESS_USER + '/simple', username=NO_ACCESS_USER)) params=dict(repository=ADMIN_ACCESS_USER + '/simple', username=NO_ACCESS_USER))