Update relationship between Environment and EnvironmentRole so only environment roles that are not deleted are included

atst/models/environment.py

@@ -32,6 +32,12 @@ class Environment(
 
     job_failures = relationship("EnvironmentJobFailure")
 
+    roles = relationship(
+        "EnvironmentRole",
+        back_populates="environment",
+        primaryjoin="and_(EnvironmentRole.environment_id == Environment.id, EnvironmentRole.deleted == False)",
+    )
+
     class ProvisioningStatus(Enum):
         PENDING = "pending"
         COMPLETED = "completed"

atst/models/environment_role.py

@@ -24,7 +24,7 @@ class EnvironmentRole(
     environment_id = Column(
         UUID(as_uuid=True), ForeignKey("environments.id"), nullable=False
     )
-    environment = relationship("Environment", backref="roles")
+    environment = relationship("Environment")
 
     role = Column(String())