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

Formatting

Browse Source
This commit is contained in:
richard-dds 2018-07-30 15:33:19 -04:00
parent c4039de861
commit 8fdf3ec20f
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/domain/users.py
View File

@ -8,12 +8,10 @@ from .exceptions import NotFoundError, AlreadyExistsError
class Users(object): class Users(object):
def __init__(self, db_session): def __init__(self, db_session):
self.db_session = db_session self.db_session = db_session
self.roles_repo = Roles(db_session) self.roles_repo = Roles(db_session)
def get(self, user_id): def get(self, user_id):
try: try:
user = self.db_session.query(User).filter_by(id=user_id).one() user = self.db_session.query(User).filter_by(id=user_id).one()

14
atst/domain/workspace_users.py
View File

@ -8,8 +8,8 @@ from .roles import Roles
from .users import Users from .users import Users
from .exceptions import NotFoundError from .exceptions import NotFoundError
class WorkspaceUsers(object):
class WorkspaceUsers(object):
def __init__(self, db_session): def __init__(self, db_session):
self.db_session = db_session self.db_session = db_session
self.roles_repo = Roles(db_session) self.roles_repo = Roles(db_session)
@ -48,10 +48,14 @@ class WorkspaceUsers(object):
raise NotFoundError("role") raise NotFoundError("role")
try: try:
existing_workspace_role = self.db_session.query(WorkspaceRole).filter( existing_workspace_role = (
WorkspaceRole.user == user, self.db_session.query(WorkspaceRole)
WorkspaceRole.workspace_id == workspace_id, .filter(
).one() WorkspaceRole.user == user,
WorkspaceRole.workspace_id == workspace_id,
)
.one()
)
new_workspace_role = existing_workspace_role new_workspace_role = existing_workspace_role
new_workspace_role.role = role new_workspace_role.role = role
except NoResultFound: except NoResultFound:

2
atst/domain/workspaces.py
View File

@ -1,5 +1,4 @@
class Projects(object): class Projects(object):
def __init__(self): def __init__(self):
pass pass
@ -47,7 +46,6 @@ class Projects(object):
class Members(object): class Members(object):
def __init__(self): def __init__(self):
pass pass

1
tests/domain/test_users.py
View File

@ -4,6 +4,7 @@ from uuid import uuid4, UUID
from atst.domain.users import Users from atst.domain.users import Users
from atst.domain.exceptions import NotFoundError, AlreadyExistsError from atst.domain.exceptions import NotFoundError, AlreadyExistsError
@pytest.fixture() @pytest.fixture()
def users_repo(db) -> Users: def users_repo(db) -> Users:
return Users(db) return Users(db)

18
tests/domain/test_workspace_users.py
View File

@ -9,17 +9,17 @@ from atst.domain.users import Users
def users_repo(db): def users_repo(db):
return Users(db) return Users(db)
@pytest.fixture() @pytest.fixture()
def workspace_users_repo(db): def workspace_users_repo(db):
return WorkspaceUsers(db) return WorkspaceUsers(db)
def test_can_create_new_workspace_user(users_repo, workspace_users_repo): def test_can_create_new_workspace_user(users_repo, workspace_users_repo):
workspace_id = uuid4() workspace_id = uuid4()
user = users_repo.create(uuid4(), "developer") user = users_repo.create(uuid4(), "developer")
workspace_user_dicts = [ workspace_user_dicts = [{"id": user.id, "workspace_role": "owner"}]
{"id": user.id, "workspace_role": "owner"}
]
workspace_users = workspace_users_repo.add_many(workspace_id, workspace_user_dicts) workspace_users = workspace_users_repo.add_many(workspace_id, workspace_user_dicts)
@ -32,12 +32,12 @@ def test_can_update_existing_workspace_user(users_repo, workspace_users_repo):
workspace_id = uuid4() workspace_id = uuid4()
user = users_repo.create(uuid4(), "developer") user = users_repo.create(uuid4(), "developer")
workspace_users_repo.add_many(workspace_id, [ workspace_users_repo.add_many(
{"id": user.id, "workspace_role": "owner"} workspace_id, [{"id": user.id, "workspace_role": "owner"}]
]) )
workspace_users = workspace_users_repo.add_many(workspace_id, [ workspace_users = workspace_users_repo.add_many(
{"id": user.id, "workspace_role": "developer"} workspace_id, [{"id": user.id, "workspace_role": "developer"}]
]) )
assert workspace_users[0].user.id == user.id assert workspace_users[0].user.id == user.id
assert workspace_users[0].workspace_role.role.name == "developer" assert workspace_users[0].workspace_role.role.name == "developer"