pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #869 from dod-ccpo/filter-app-environment-roles

Browse Source 
Filter out deleted application environment roles
This commit is contained in:
dandds 2019-06-05 10:50:06 -04:00 committed by GitHub
commit c90e574e83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
atst/models/application_role.py
View File

@ -51,6 +51,11 @@ class ApplicationRole(
"PermissionSet", secondary=application_roles_permission_sets "PermissionSet", secondary=application_roles_permission_sets
) )
environment_roles = relationship(
"EnvironmentRole",
primaryjoin="and_(EnvironmentRole.application_role_id==ApplicationRole.id, EnvironmentRole.deleted==False)",
)
@property @property
def user_name(self): def user_name(self):
if self.user: if self.user:

2
atst/models/environment_role.py
View File

@ -29,7 +29,7 @@ class EnvironmentRole(
application_role_id = Column( application_role_id = Column(
UUID(as_uuid=True), ForeignKey("application_roles.id"), nullable=False UUID(as_uuid=True), ForeignKey("application_roles.id"), nullable=False
) )
application_role = relationship("ApplicationRole", backref="environment_roles") application_role = relationship("ApplicationRole")
def __repr__(self): def __repr__(self):
return "<EnvironmentRole(role='{}', user='{}', environment='{}', id='{}')>".format( return "<EnvironmentRole(role='{}', user='{}', environment='{}', id='{}')>".format(

12
tests/models/test_application_role.py
View File

@ -42,11 +42,15 @@ def test_has_application_role_history(session):
def test_environment_roles(): def test_environment_roles():
application = ApplicationFactory.create() application = ApplicationFactory.create()
environment = EnvironmentFactory.create(application=application) environment1 = EnvironmentFactory.create(application=application)
environment2 = EnvironmentFactory.create(application=application)
user = UserFactory.create() user = UserFactory.create()
application_role = ApplicationRoleFactory.create(application=application, user=user) application_role = ApplicationRoleFactory.create(application=application, user=user)
environment_role = EnvironmentRoleFactory.create( environment_role1 = EnvironmentRoleFactory.create(
environment=environment, application_role=application_role environment=environment1, application_role=application_role
)
EnvironmentRoleFactory.create(
environment=environment2, application_role=application_role, deleted=True
) )
assert application_role.environment_roles == [environment_role] assert application_role.environment_roles == [environment_role1]