extend soft delete functionality to app and env roles

tests/models/test_environments.py

@@ -25,8 +25,6 @@ def test_add_user_to_environment():
 
 
 def test_audit_event_for_environment_deletion(session):
-    EnvironmentFactory._meta.sqlalchemy_session_persistence = "flush"
-
     env = EnvironmentFactory.create(application=ApplicationFactory.create())
     env.deleted = True
     session.add(env)
@@ -38,4 +36,6 @@ def test_audit_event_for_environment_deletion(session):
         .one()
     )
     assert update_event.changed_state.get("deleted")
-    assert update_event.changed_state["deleted"] == [False, True]
+    before, after = update_event.changed_state["deleted"]
+    assert not before
+    assert after

tests/models/test_user.py

@@ -3,7 +3,7 @@ from sqlalchemy.exc import InternalError
 
 from atst.models.user import User
 
-from tests.factories import UserFactory
+from tests.factories import UserFactory, ApplicationFactory, ApplicationRoleFactory
 
 
 def test_profile_complete_with_all_info():
@@ -24,3 +24,16 @@ def test_cannot_update_dod_id(session):
     session.add(user)
     with pytest.raises(InternalError):
         session.commit()
+
+
+def test_deleted_application_roles_are_ignored(session):
+    user = UserFactory.create()
+    app = ApplicationFactory.create()
+    app_role = ApplicationRoleFactory.create(user=user, application=app)
+    assert len(user.application_roles) == 1
+
+    app_role.deleted = True
+    session.add(app_role)
+    session.commit()
+
+    assert len(user.application_roles) == 0