Merge branch 'filter-invites' into show-invite-email

app/main/views/manage_users.py

@@ -28,11 +28,15 @@ from app.utils import user_has_permissions
 def manage_users(service_id):
     users = user_api_client.get_users_for_service(service_id=service_id)
     invited_users = invite_api_client.get_invites_for_service(service_id=service_id)
+    filtered_invites = []
+    for invite in invited_users:
+        if invite.status != 'accepted':
+            filtered_invites.append(invite)
     return render_template('views/manage-users.html',
                            service_id=service_id,
                            users=users,
                            current_user=current_user,
-                           invited_users=invited_users)
+                           invited_users=filtered_invites)
 
 
 @main.route("/services/<service_id>/users/invite", methods=['GET', 'POST'])

app/notify_client/invite_api_client.py

@@ -48,7 +48,6 @@ class InviteApiClient(BaseAPIClient):
     def _get_invited_users(self, invites):
         invited_users = []
         for invite in invites:
-            if invite['status'] != 'accepted':
+            invited_user = InvitedUser(**invite)
-                invited_user = InvitedUser(**invite)
+            invited_users.append(invited_user)
-                invited_users.append(invited_user)
         return invited_users

tests/app/main/notify_client/test_invite_client.py

@@ -18,21 +18,3 @@ def test_client_returns_invite(mocker, sample_invite):
     mock_get.assert_called_once_with(expected_url)
     assert len(invites) == 1
     assert invites[0].status == 'pending'
-
-
-def test_client_filters_out_accepted_invites(mocker, sample_invite):
-
-    sample_invite['status'] = 'accepted'
-    service_id = sample_invite['service']
-
-    expected_data = {'data': [sample_invite]}
-
-    expected_url = '/service/{}/invite'.format(service_id)
-
-    client = InviteApiClient()
-    mock_get = mocker.patch('app.notify_client.invite_api_client.InviteApiClient.get', return_value=expected_data)
-
-    invites = client.get_invites_for_service(service_id)
-
-    mock_get.assert_called_once_with(expected_url)
-    assert len(invites) == 0

tests/app/main/views/test_manage_users.py

@@ -213,3 +213,34 @@ def test_manage_users_shows_invited_user(app_,
             cols = invites_table.find_all('td')
             assert cols[0].text.strip() == 'invited_user@test.gov.uk'
             assert cols[4].text.strip() == 'Cancel invitation'
+
+
+def test_manage_users_does_not_show_accepted_invite(app_,
+                                                    mocker,
+                                                    api_user_active,
+                                                    mock_get_service,
+                                                    mock_login,
+                                                    mock_has_permissions,
+                                                    mock_get_users_by_service,
+                                                    sample_invite):
+
+    import uuid
+    invited_user_id = uuid.uuid4()
+    sample_invite['id'] = invited_user_id
+    sample_invite['status'] = 'accepted'
+    data = [InvitedUser(**sample_invite)]
+
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active)
+
+            mocker.patch('app.invite_api_client.get_invites_for_service', return_value=data)
+
+            response = client.get(url_for('main.manage_users', service_id=55555))
+
+            assert response.status_code == 200
+            page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+            assert page.h1.string.strip() == 'Manage team'
+            tables = page.find_all('table')
+            assert len(tables) == 1
+            assert not page.find(text='invited_user@test.gov.uk')