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

Filter out deleted application environment roles

atst/models/application_role.py

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

atst/models/environment_role.py

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