Merge pull request #885 from dod-ccpo/fix-member-remove

Fix error when removing application member

atst/domain/applications.py

@@ -128,15 +128,11 @@ class Applications(BaseDomainClass):
         return invitation
 
     @classmethod
-    def remove_member(cls, application, user_id):
-        application_role = ApplicationRoles.get(
-            user_id=user_id, application_id=application.id
-        )
-
+    def remove_member(cls, application_role):
         application_role.status = ApplicationRoleStatus.DISABLED
         application_role.deleted = True
 
-        for env in application.environments:
+        for env in application_role.application.environments:
             EnvironmentRoles.delete(
                 application_role_id=application_role.id, environment_id=env.id
             )

atst/routes/applications/team.py

@@ -9,7 +9,6 @@ from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.environments import Environments
 from atst.domain.exceptions import AlreadyExistsError
 from atst.domain.permission_sets import PermissionSets
-from atst.domain.users import Users
 from atst.forms.application_member import NewForm as NewMemberForm
 from atst.forms.team import TeamForm
 from atst.models import Permissions
@@ -188,15 +187,11 @@ 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=g.application, user_id=application_role.user_id
-    )
-    user = Users.get(application_role.user_id)
+    Applications.remove_member(application_role)
 
     flash(
         "application_member_removed",
-        user_name=user.full_name,
+        user_name=application_role.user_name,
         application_name=g.application.name,
     )
 

tests/domain/test_applications.py

@@ -147,7 +147,7 @@ def test_remove_member():
         user_id=user.id, application_id=application.id
     )
 
-    Applications.remove_member(application=application, user_id=member_role.user.id)
+    Applications.remove_member(member_role)
 
     assert (
         ApplicationRoles.get(user_id=user.id, application_id=application.id).status

tests/routes/applications/test_team.py

@@ -218,6 +218,30 @@ def test_remove_member_success(client, user_session):
     )
 
 
+def test_remove_new_member_success(client, user_session):
+    application = ApplicationFactory.create()
+    application_role = ApplicationRoleFactory.create(application=application, user=None)
+
+    user_session(application.portfolio.owner)
+
+    response = client.post(
+        url_for(
+            "applications.remove_member",
+            application_id=application.id,
+            application_role_id=application_role.id,
+        )
+    )
+
+    assert response.status_code == 302
+    assert response.location == url_for(
+        "applications.team",
+        _anchor="application-members",
+        _external=True,
+        application_id=application.id,
+        fragment="application-members",
+    )
+
+
 def test_remove_member_failure(client, user_session):
     user = UserFactory.create()
     application = ApplicationFactory.create()