From 94e3dc637ab2b46700a806c5ffc5733a0f1aaad1 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Tue, 30 Apr 2019 10:27:15 -0400
Subject: [PATCH] Remove has_member function from application model

---
 atst/models/application.py                 |  4 ----
 atst/routes/applications/settings.py       |  3 ++-
 tests/models/test_application.py           | 13 -------------
 tests/routes/applications/test_settings.py |  2 +-
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/atst/models/application.py b/atst/models/application.py
index 95c03a43..9edb5166 100644
--- a/atst/models/application.py
+++ b/atst/models/application.py
@@ -51,10 +51,6 @@ class Application(
     def displayname(self):
         return self.name
 
-    def has_member(self, user_id):
-        user_ids = set(str(user.id) for user in self.users)
-        return str(user_id) in user_ids
-
     def __repr__(self):  # pragma: no cover
         return "<Application(name='{}', description='{}', portfolio='{}', id='{}')>".format(
             self.name, self.description, self.portfolio.name, self.id
diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py
index aa017fa2..06f8d005 100644
--- a/atst/routes/applications/settings.py
+++ b/atst/routes/applications/settings.py
@@ -45,8 +45,9 @@ def serialize_env_member_form_data(application):
 
 
 def check_users_are_in_application(user_ids, application):
+    existing_ids = [str(role.user_id) for role in application.roles]
     for user_id in user_ids:
-        if not application.has_member(user_id):
+        if not user_id in existing_ids:
             raise NotFoundError("application user", user_id)
     return True
 
diff --git a/tests/models/test_application.py b/tests/models/test_application.py
index b576eb18..5c8fbb79 100644
--- a/tests/models/test_application.py
+++ b/tests/models/test_application.py
@@ -39,16 +39,3 @@ def test_audit_event_for_application_deletion(session):
     )
     assert update_event.changed_state.get("deleted")
     assert update_event.changed_state["deleted"] == [False, True]
-
-
-def test_has_app_member():
-    user = UserFactory.create()
-    app = ApplicationFactory.create()
-    ApplicationRoleFactory.create(user=user, application=app)
-    assert app.has_member(user.id)
-
-
-def test_does_not_have_app_member():
-    user = UserFactory.create()
-    app = ApplicationFactory.create()
-    assert not app.has_member(user.id)
diff --git a/tests/routes/applications/test_settings.py b/tests/routes/applications/test_settings.py
index 354fcbb6..932420be 100644
--- a/tests/routes/applications/test_settings.py
+++ b/tests/routes/applications/test_settings.py
@@ -192,7 +192,7 @@ def test_check_users_are_in_application():
     for user in [app_user_1, app_user_2, app_user_3]:
         ApplicationRoleFactory.create(user=user, application=application)
 
-    user_ids = [app_user_1.id, app_user_2.id, app_user_3.id]
+    user_ids = [str(app_user_1.id), str(app_user_2.id), str(app_user_3.id)]
     assert check_users_are_in_application(user_ids, application)