Formatting
This commit is contained in:
parent
08243a199a
commit
efdf0b04ba
@ -8,12 +8,10 @@ from .exceptions import NotFoundError, AlreadyExistsError
|
||||
|
||||
|
||||
class Users(object):
|
||||
|
||||
def __init__(self, db_session):
|
||||
self.db_session = db_session
|
||||
self.roles_repo = Roles(db_session)
|
||||
|
||||
|
||||
def get(self, user_id):
|
||||
try:
|
||||
user = self.db_session.query(User).filter_by(id=user_id).one()
|
||||
|
@ -8,8 +8,8 @@ from .roles import Roles
|
||||
from .users import Users
|
||||
from .exceptions import NotFoundError
|
||||
|
||||
class WorkspaceUsers(object):
|
||||
|
||||
class WorkspaceUsers(object):
|
||||
def __init__(self, db_session):
|
||||
self.db_session = db_session
|
||||
self.roles_repo = Roles(db_session)
|
||||
@ -48,10 +48,14 @@ class WorkspaceUsers(object):
|
||||
raise NotFoundError("role")
|
||||
|
||||
try:
|
||||
existing_workspace_role = self.db_session.query(WorkspaceRole).filter(
|
||||
WorkspaceRole.user == user,
|
||||
WorkspaceRole.workspace_id == workspace_id,
|
||||
).one()
|
||||
existing_workspace_role = (
|
||||
self.db_session.query(WorkspaceRole)
|
||||
.filter(
|
||||
WorkspaceRole.user == user,
|
||||
WorkspaceRole.workspace_id == workspace_id,
|
||||
)
|
||||
.one()
|
||||
)
|
||||
new_workspace_role = existing_workspace_role
|
||||
new_workspace_role.role = role
|
||||
except NoResultFound:
|
||||
|
@ -1,5 +1,4 @@
|
||||
class Projects(object):
|
||||
|
||||
def __init__(self):
|
||||
pass
|
||||
|
||||
@ -47,7 +46,6 @@ class Projects(object):
|
||||
|
||||
|
||||
class Members(object):
|
||||
|
||||
def __init__(self):
|
||||
pass
|
||||
|
||||
|
@ -4,6 +4,7 @@ from uuid import uuid4, UUID
|
||||
from atst.domain.users import Users
|
||||
from atst.domain.exceptions import NotFoundError, AlreadyExistsError
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def users_repo(db) -> Users:
|
||||
return Users(db)
|
||||
|
@ -9,17 +9,17 @@ from atst.domain.users import Users
|
||||
def users_repo(db):
|
||||
return Users(db)
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def workspace_users_repo(db):
|
||||
return WorkspaceUsers(db)
|
||||
|
||||
|
||||
def test_can_create_new_workspace_user(users_repo, workspace_users_repo):
|
||||
workspace_id = uuid4()
|
||||
user = users_repo.create(uuid4(), "developer")
|
||||
|
||||
workspace_user_dicts = [
|
||||
{"id": user.id, "workspace_role": "owner"}
|
||||
]
|
||||
workspace_user_dicts = [{"id": user.id, "workspace_role": "owner"}]
|
||||
|
||||
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()
|
||||
user = users_repo.create(uuid4(), "developer")
|
||||
|
||||
workspace_users_repo.add_many(workspace_id, [
|
||||
{"id": user.id, "workspace_role": "owner"}
|
||||
])
|
||||
workspace_users = workspace_users_repo.add_many(workspace_id, [
|
||||
{"id": user.id, "workspace_role": "developer"}
|
||||
])
|
||||
workspace_users_repo.add_many(
|
||||
workspace_id, [{"id": user.id, "workspace_role": "owner"}]
|
||||
)
|
||||
workspace_users = workspace_users_repo.add_many(
|
||||
workspace_id, [{"id": user.id, "workspace_role": "developer"}]
|
||||
)
|
||||
|
||||
assert workspace_users[0].user.id == user.id
|
||||
assert workspace_users[0].workspace_role.role.name == "developer"
|
||||
|
Loading…
x
Reference in New Issue
Block a user