Use ApplicationRoles.disable() instead of Applications.remove_member()

.secrets.baseline

@@ -199,5 +199,5 @@
       }
     ]
   },
-  "version": "0.12.6"
+  "version": "0.12.5"
 }

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)

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",

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
+    )

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)