From 663fb9f288561627e6c51d81cf5768c432b582d8 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 23 Sep 2019 11:31:13 -0400
Subject: [PATCH] Use ApplicationRoles.disable() instead of
 Applications.remove_member()

---
 .secrets.baseline                      |  2 +-
 atst/domain/applications.py            |  4 ----
 atst/routes/applications/settings.py   |  2 +-
 tests/domain/test_application_roles.py | 18 +++++++++++++++
 tests/domain/test_applications.py      | 31 --------------------------
 5 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 9c221915..58c395a9 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -199,5 +199,5 @@
       }
     ]
   },
-  "version": "0.12.6"
+  "version": "0.12.5"
 }
diff --git a/atst/domain/applications.py b/atst/domain/applications.py
index f13aefbd..21e8782b 100644
--- a/atst/domain/applications.py
+++ b/atst/domain/applications.py
@@ -118,7 +118,3 @@ class Applications(BaseDomainClass):
         db.session.commit()
 
         return invitation
-
-    @classmethod
-    def remove_member(cls, application_role):
-        ApplicationRoles.disable(application_role)
diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py
index 64cb71d9..0f363f35 100644
--- a/atst/routes/applications/settings.py
+++ b/atst/routes/applications/settings.py
@@ -333,7 +333,7 @@ def create_member(application_id):
 @user_can(Permissions.DELETE_APPLICATION_MEMBER, message="remove application member")
 def remove_member(application_id, application_role_id):
     application_role = ApplicationRoles.get_by_id(application_role_id)
-    Applications.remove_member(application_role)
+    ApplicationRoles.disable(application_role)
 
     flash(
         "application_member_removed",
diff --git a/tests/domain/test_application_roles.py b/tests/domain/test_application_roles.py
index 753eb69e..2f58f1e4 100644
--- a/tests/domain/test_application_roles.py
+++ b/tests/domain/test_application_roles.py
@@ -66,3 +66,21 @@ def test_get_by_id():
 
     with pytest.raises(NotFoundError):
         ApplicationRoles.get_by_id(app_role.id)
+
+
+def test_disable():
+    application = ApplicationFactory.create()
+    user = UserFactory.create()
+    member_role = ApplicationRoleFactory.create(application=application, user=user)
+    environment = EnvironmentFactory.create(application=application)
+    environment_role = EnvironmentRoleFactory.create(
+        application_role=member_role, environment=environment
+    )
+    assert member_role == ApplicationRoles.get(
+        user_id=user.id, application_id=application.id
+    )
+    ApplicationRoles.disable(member_role)
+    assert (
+        ApplicationRoles.get(user_id=user.id, application_id=application.id).status
+        == ApplicationRoleStatus.DISABLED
+    )
diff --git a/tests/domain/test_applications.py b/tests/domain/test_applications.py
index 4e25ab4e..66f4ee01 100644
--- a/tests/domain/test_applications.py
+++ b/tests/domain/test_applications.py
@@ -134,37 +134,6 @@ def test_for_user():
     assert len(user_applications) == 2
 
 
-def test_remove_member():
-    application = ApplicationFactory.create()
-    user = UserFactory.create()
-    member_role = ApplicationRoleFactory.create(application=application, user=user)
-    environment = EnvironmentFactory.create(application=application)
-    environment_role = EnvironmentRoleFactory.create(
-        application_role=member_role, environment=environment
-    )
-
-    assert member_role == ApplicationRoles.get(
-        user_id=user.id, application_id=application.id
-    )
-
-    Applications.remove_member(member_role)
-
-    assert (
-        ApplicationRoles.get(user_id=user.id, application_id=application.id).status
-        == ApplicationRoleStatus.DISABLED
-    )
-
-    #
-    # TODO: Why does above raise NotFoundError and this returns None
-    #
-    assert (
-        EnvironmentRoles.get(
-            application_role_id=member_role.id, environment_id=environment.id
-        )
-        is None
-    )
-
-
 def test_invite():
     application = ApplicationFactory.create()
     env1 = EnvironmentFactory.create(application=application)