Simplify WorkspaceRoles.get_by_id

2018-11-27 14:17:42 -05:00 · 2018-11-27 14:17:42 -05:00 · b7c7c72a34
commit b7c7c72a34
parent 218ec5d66a
1 changed files with 2 additions and 9 deletions
--- a/atst/domain/workspace_roles.py
+++ b/atst/domain/workspace_roles.py
@ -36,16 +36,9 @@ class WorkspaceRoles(object):
    @classmethod
    def get_by_id(cls, id_):
        try:
-            workspace_role = (
-                db.session.query(WorkspaceRole)
-                .join(User)
-                .filter(WorkspaceRole.id == id_)
-                .one()
-            )
+            return db.session.query(WorkspaceRole).filter(WorkspaceRole.id == id_).one()
        except NoResultFound:
-            workspace_role = None
-
-        return workspace_role
+            raise NotFoundError("workspace_role")

    @classmethod
    def _get_active_workspace_role(cls, workspace_id, user_id):