extend soft delete functionality to app and env roles

2019-04-10 10:42:36 -04:00
parent dac764ab82
commit 0bde431a70
15 changed files with 81 additions and 35 deletions
--- a/atst/models/user.py
+++ b/atst/models/user.py
@@ -25,7 +25,11 @@ class User(
    permission_sets = relationship("PermissionSet", secondary=users_permission_sets)

    portfolio_roles = relationship("PortfolioRole", backref="user")
-    application_roles = relationship("ApplicationRole", backref="user")
+    application_roles = relationship(
+        "ApplicationRole",
+        backref="user",
+        primaryjoin="and_(ApplicationRole.user_id==User.id, ApplicationRole.deleted==False)",
+    )

    email = Column(String, unique=True)
    dod_id = Column(String, unique=True, nullable=False)