From 8fdf3ec20f60e502760931b6312d739e374f574c Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 30 Jul 2018 15:33:19 -0400 Subject: [PATCH] Formatting --- atst/domain/users.py | 2 -- atst/domain/workspace_users.py | 14 +++++++++----- atst/domain/workspaces.py | 2 -- tests/domain/test_users.py | 1 + tests/domain/test_workspace_users.py | 18 +++++++++--------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/atst/domain/users.py b/atst/domain/users.py index 94e99056..76385228 100644 --- a/atst/domain/users.py +++ b/atst/domain/users.py @@ -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() diff --git a/atst/domain/workspace_users.py b/atst/domain/workspace_users.py index 857be057..e4d93c19 100644 --- a/atst/domain/workspace_users.py +++ b/atst/domain/workspace_users.py @@ -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: diff --git a/atst/domain/workspaces.py b/atst/domain/workspaces.py index b4cc85b8..6ec0b856 100644 --- a/atst/domain/workspaces.py +++ b/atst/domain/workspaces.py @@ -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 diff --git a/tests/domain/test_users.py b/tests/domain/test_users.py index 921463f8..a76a9ae8 100644 --- a/tests/domain/test_users.py +++ b/tests/domain/test_users.py @@ -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) diff --git a/tests/domain/test_workspace_users.py b/tests/domain/test_workspace_users.py index e86662f3..f76bdf3e 100644 --- a/tests/domain/test_workspace_users.py +++ b/tests/domain/test_workspace_users.py @@ -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"