organize portfolio permission sets by domain

This commit is contained in:
dandds
2019-03-14 08:50:38 -04:00
parent 78aa2dfcc6
commit ee37a5543a
4 changed files with 66 additions and 56 deletions

View File

@@ -2,7 +2,8 @@ import pytest
from atst.domain.task_orders import TaskOrders, TaskOrderError, DD254s
from atst.domain.exceptions import UnauthorizedError
from atst.domain.permission_sets import PermissionSets, _VIEW_PORTFOLIO_PERMISSION_SETS
from atst.domain.permission_sets import PermissionSets
from atst.domain.portfolio_roles import PortfolioRoles
from atst.models.attachment import Attachment
from tests.factories import (
@@ -116,7 +117,8 @@ def test_task_order_access():
user=member,
portfolio=task_order.portfolio,
permission_sets=[
PermissionSets.get(prms["name"]) for prms in _VIEW_PORTFOLIO_PERMISSION_SETS
PermissionSets.get(prms)
for prms in PortfolioRoles.DEFAULT_PORTFOLIO_PERMISSION_SETS
],
)
TaskOrders.add_officer(

View File

@@ -14,17 +14,13 @@ from atst.models.task_order import TaskOrder
from atst.models.user import User
from atst.models.permission_set import PermissionSet
from atst.models.portfolio import Portfolio
from atst.domain.permission_sets import (
PermissionSets,
PORTFOLIO_PERMISSION_SETS,
_VIEW_PORTFOLIO_PERMISSION_SETS,
_EDIT_PORTFOLIO_PERMISSION_SETS,
)
from atst.domain.permission_sets import PermissionSets, PORTFOLIO_PERMISSION_SETS
from atst.models.portfolio_role import PortfolioRole, Status as PortfolioRoleStatus
from atst.models.environment_role import EnvironmentRole
from atst.models.invitation import Invitation, Status as InvitationStatus
from atst.models.dd_254 import DD254
from atst.domain.invitations import Invitations
from atst.domain.portfolio_roles import PortfolioRoles
def random_choice(choices):
@@ -70,7 +66,8 @@ def _random_date(year_min, year_max, operation):
def base_portfolio_permission_sets():
return [
PermissionSets.get(prms["name"]) for prms in _VIEW_PORTFOLIO_PERMISSION_SETS
PermissionSets.get(prms)
for prms in PortfolioRoles.DEFAULT_PORTFOLIO_PERMISSION_SETS
]