From e6304fe10db4ffc1db6a0f0d750c802912b5907d Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 12 Jun 2019 13:43:33 +0100
Subject: [PATCH] Add count of live services to organisation list

This is useful information that we might as well return now we have it.
---
 app/templates/views/organisations/index.html       |  4 ++++
 .../main/views/organisations/test_organisation.py  | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html
index 00a228459..a7706b189 100644
--- a/app/templates/views/organisations/index.html
+++ b/app/templates/views/organisations/index.html
@@ -33,6 +33,10 @@
               {% for org in organisations %}
                 <li class="browse-list-item">
                   <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="browse-list-link">{{ org.name }}</a>
+                  <p class="browse-list-hint">
+                    {{ org.count_of_live_services }}
+                    live service{% if org.count_of_live_services != 1 %}s{% endif %}
+                  </p>
                   {% if not org.active %}
                     <span class="table-field-status-default heading-medium">- archived</span>
                   {% endif %}
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py
index c72c34154..cb4fb0bed 100644
--- a/tests/app/main/views/organisations/test_organisation.py
+++ b/tests/app/main/views/organisations/test_organisation.py
@@ -20,12 +20,12 @@ def test_organisation_page_shows_all_organisations(
     mocker
 ):
     orgs = [
-        {'id': '1', 'name': 'Test 1', 'active': True},
-        {'id': '2', 'name': 'Test 2', 'active': True},
-        {'id': '3', 'name': 'Test 3', 'active': False},
+        {'id': '1', 'name': 'Test 1', 'active': True, 'count_of_live_services': 0},
+        {'id': '2', 'name': 'Test 2', 'active': True, 'count_of_live_services': 1},
+        {'id': '3', 'name': 'Test 3', 'active': False, 'count_of_live_services': 2},
     ]
 
-    mocker.patch(
+    get_organisations = mocker.patch(
         'app.models.organisation.Organisations.client', return_value=orgs
     )
     response = logged_in_platform_admin_client.get(
@@ -39,13 +39,19 @@ def test_organisation_page_shows_all_organisations(
         page.select_one('h1').text
     ) == "All organisations"
 
+    expected_hints = ('0 live services', '1 live service', '2 live services')
+
     for index, org in enumerate(orgs):
         assert page.select('a.browse-list-link')[index].text == org['name']
         if not org['active']:
             assert page.select_one('.table-field-status-default,heading-medium').text == '- archived'
+        assert normalize_spaces(page.select('.browse-list-hint')[index].text) == (
+            expected_hints[index]
+        )
     assert normalize_spaces(
         page.select_one('a.button-secondary').text
     ) == 'New organisation'
+    get_organisations.assert_called_once_with()
 
 
 def test_view_organisation_shows_the_correct_organisation(