Do not add member to application when adding to environment
This commit is contained in:
parent
60b4c50819
commit
1222220452
@ -5,7 +5,6 @@ from atst.database import db
|
|||||||
from atst.models.environment import Environment
|
from atst.models.environment import Environment
|
||||||
from atst.models.environment_role import EnvironmentRole
|
from atst.models.environment_role import EnvironmentRole
|
||||||
from atst.models.application import Application
|
from atst.models.application import Application
|
||||||
from atst.domain.application_roles import ApplicationRoles
|
|
||||||
from atst.domain.environment_roles import EnvironmentRoles
|
from atst.domain.environment_roles import EnvironmentRoles
|
||||||
from atst.domain.users import Users
|
from atst.domain.users import Users
|
||||||
|
|
||||||
@ -33,9 +32,6 @@ class Environments(object):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def add_member(cls, environment, user, role):
|
def add_member(cls, environment, user, role):
|
||||||
ApplicationRoles.create(
|
|
||||||
user=user, application=environment.application, permission_set_names=[]
|
|
||||||
)
|
|
||||||
environment_user = EnvironmentRoles.create(
|
environment_user = EnvironmentRoles.create(
|
||||||
user=user, environment=environment, role=role
|
user=user, environment=environment, role=role
|
||||||
)
|
)
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
from atst.models import AuditEvent
|
from atst.models import AuditEvent
|
||||||
|
from atst.models.environment_role import CSPRole
|
||||||
from atst.domain.environments import Environments
|
from atst.domain.environments import Environments
|
||||||
from atst.domain.applications import Applications
|
from atst.domain.applications import Applications
|
||||||
|
|
||||||
@ -7,6 +8,7 @@ from tests.factories import (
|
|||||||
UserFactory,
|
UserFactory,
|
||||||
EnvironmentFactory,
|
EnvironmentFactory,
|
||||||
ApplicationFactory,
|
ApplicationFactory,
|
||||||
|
ApplicationRoleFactory,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -20,7 +22,10 @@ def test_add_user_to_environment():
|
|||||||
)
|
)
|
||||||
dev_environment = application.environments[0]
|
dev_environment = application.environments[0]
|
||||||
|
|
||||||
dev_environment = Environments.add_member(dev_environment, developer, "developer")
|
ApplicationRoleFactory.create(user=developer, application=application)
|
||||||
|
dev_environment = Environments.add_member(
|
||||||
|
dev_environment, developer, CSPRole.BASIC_ACCESS.value
|
||||||
|
)
|
||||||
assert developer in dev_environment.users
|
assert developer in dev_environment.users
|
||||||
|
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@ from atst.models.portfolio_role import Status
|
|||||||
from atst.models.invitation import Status as InvitationStatus
|
from atst.models.invitation import Status as InvitationStatus
|
||||||
from atst.models.audit_event import AuditEvent
|
from atst.models.audit_event import AuditEvent
|
||||||
from atst.models.portfolio_role import Status as PortfolioRoleStatus
|
from atst.models.portfolio_role import Status as PortfolioRoleStatus
|
||||||
|
from atst.models.environment_role import CSPRole
|
||||||
from tests.factories import (
|
from tests.factories import (
|
||||||
UserFactory,
|
UserFactory,
|
||||||
InvitationFactory,
|
InvitationFactory,
|
||||||
@ -180,8 +181,9 @@ def test_has_environment_roles():
|
|||||||
application = Applications.create(
|
application = Applications.create(
|
||||||
portfolio, "my test application", "It's mine.", ["dev", "staging", "prod"]
|
portfolio, "my test application", "It's mine.", ["dev", "staging", "prod"]
|
||||||
)
|
)
|
||||||
|
ApplicationRoleFactory.create(user=portfolio_role.user, application=application)
|
||||||
Environments.add_member(
|
Environments.add_member(
|
||||||
application.environments[0], portfolio_role.user, "developer"
|
application.environments[0], portfolio_role.user, CSPRole.BASIC_ACCESS.value
|
||||||
)
|
)
|
||||||
assert portfolio_role.has_environment_roles
|
assert portfolio_role.has_environment_roles
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user