Create Workspaces._get

This commit is contained in:
richard-dds 2018-09-06 14:17:32 -04:00
parent 3e74ff9c05
commit eb200fbd67

View File

@ -25,11 +25,7 @@ class Workspaces(object):
@classmethod @classmethod
def get(cls, user, workspace_id): def get(cls, user, workspace_id):
try: workspace = Workspaces._get(workspace_id)
workspace = db.session.query(Workspace).filter_by(id=workspace_id).one()
except NoResultFound:
raise NotFoundError("workspace")
Authorization.check_workspace_permission( Authorization.check_workspace_permission(
user, workspace, Permissions.VIEW_WORKSPACE, "get workspace" user, workspace, Permissions.VIEW_WORKSPACE, "get workspace"
) )
@ -38,7 +34,7 @@ class Workspaces(object):
@classmethod @classmethod
def get_for_update(cls, user, workspace_id): def get_for_update(cls, user, workspace_id):
workspace = Workspaces.get(user, workspace_id) workspace = Workspaces._get(workspace_id)
Authorization.check_workspace_permission( Authorization.check_workspace_permission(
user, workspace, Permissions.ADD_APPLICATION_IN_WORKSPACE, "add project" user, workspace, Permissions.ADD_APPLICATION_IN_WORKSPACE, "add project"
) )
@ -56,13 +52,14 @@ class Workspaces(object):
@classmethod @classmethod
def get_with_members(cls, user, workspace_id): def get_with_members(cls, user, workspace_id):
workspace = Workspaces.get(user, workspace_id) workspace = Workspaces._get(workspace_id)
Authorization.check_workspace_permission( Authorization.check_workspace_permission(
user, user,
workspace, workspace,
Permissions.VIEW_WORKSPACE_MEMBERS, Permissions.VIEW_WORKSPACE_MEMBERS,
"view workspace members", "view workspace members",
) )
return workspace return workspace
@classmethod @classmethod
@ -112,3 +109,12 @@ class Workspaces(object):
workspace_role = WorkspaceRole(user=user, role=role, workspace=workspace) workspace_role = WorkspaceRole(user=user, role=role, workspace=workspace)
db.session.add(workspace_role) db.session.add(workspace_role)
return workspace_role return workspace_role
@classmethod
def _get(cls, workspace_id):
try:
workspace = db.session.query(Workspace).filter_by(id=workspace_id).one()
except NoResultFound:
raise NotFoundError("workspace")
return workspace