pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #496 from dod-ccpo/workspace-num-of-users-#162648520

Browse Source 
Update Workspace user_count exclude disabled users
This commit is contained in:
leigh-mil 2018-12-14 13:16:37 -05:00 committed by GitHub
commit 81f648c15e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/models/workspace.py
View File

@ -31,7 +31,7 @@ class Workspace(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
@property @property
def user_count(self): def user_count(self):
return len(self.users) return len(self.members)
@property @property
def legacy_task_order(self): def legacy_task_order(self):

11
tests/domain/test_workspaces.py
View File

@ -337,3 +337,14 @@ def test_disabled_members_dont_show_up(session):
# should only return workspace owner and ACTIVE member # should only return workspace owner and ACTIVE member
assert len(workspace.members) == 2 assert len(workspace.members) == 2
def test_does_not_count_disabled_members(session):
workspace = WorkspaceFactory.create()
WorkspaceRoleFactory.create(workspace=workspace, status=WorkspaceRoleStatus.ACTIVE)
WorkspaceRoleFactory.create(workspace=workspace)
WorkspaceRoleFactory.create(
workspace=workspace, status=WorkspaceRoleStatus.DISABLED
)
assert workspace.user_count == 3