From 5edb8cd08671fcfcb34e4f79dfef133333ad6448 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Tue, 15 Nov 2016 11:12:19 +0000
Subject: [PATCH] revert platform admin statistics

was erroneously using 'requested' rather than calculating 'sending'
---
 app/main/views/platform_admin.py            |  9 ++++++++-
 app/templates/views/platform-admin.html     |  2 +-
 tests/app/main/views/test_platform_admin.py | 17 +++++++++--------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py
index 46bb030d8..ae1512164 100644
--- a/app/main/views/platform_admin.py
+++ b/app/main/views/platform_admin.py
@@ -64,7 +64,14 @@ def format_stats_by_service(services):
         yield {
             'id': service['id'],
             'name': service['name'],
-            'stats': service['statistics'],
+            'stats': {
+                msg_type: {
+                    'sending': stats['requested'] - stats['delivered'] - stats['failed'],
+                    'delivered': stats['delivered'],
+                    'failed': stats['failed'],
+                }
+                for msg_type, stats in service['statistics'].items()
+            },
             'restricted': service['restricted'],
             'research_mode': service['research_mode'],
             'created_at': service['created_at']
diff --git a/app/templates/views/platform-admin.html b/app/templates/views/platform-admin.html
index d8b8e6569..7cc2afc20 100644
--- a/app/templates/views/platform-admin.html
+++ b/app/templates/views/platform-admin.html
@@ -11,7 +11,7 @@
   {% endcall %}
 
   {% call field(align='right', border=False) %}
-    {{ big_number(data[channel]['requested'], smaller=True) }}
+    {{ big_number(data[channel]['sending'], smaller=True) }}
   {% endcall %}
 
   {% call field(align='right', border=False) %}
diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py
index 74ba43a35..78a3b17de 100644
--- a/tests/app/main/views/test_platform_admin.py
+++ b/tests/app/main/views/test_platform_admin.py
@@ -156,11 +156,12 @@ def test_format_stats_by_service_returns_correct_values(fake_uuid):
 
     ret = list(format_stats_by_service(services))
     assert len(ret) == 1
-    assert ret[0]['stats']['email']['requested'] == 10
+
+    assert ret[0]['stats']['email']['sending'] == 2
     assert ret[0]['stats']['email']['delivered'] == 3
     assert ret[0]['stats']['email']['failed'] == 5
 
-    assert ret[0]['stats']['sms']['requested'] == 50
+    assert ret[0]['stats']['sms']['sending'] == 32
     assert ret[0]['stats']['sms']['delivered'] == 7
     assert ret[0]['stats']['sms']['failed'] == 11
 
@@ -202,15 +203,15 @@ def test_should_show_email_and_sms_stats_for_all_service_types(
 
     table_body = page.find_all('table')[table_index].find_all('tbody')[0]
     service_row_group = table_body.find_all('tbody')[0].find_all('tr')
-    email_stats = service_row_group[0].find_all('td')[2:]
-    sms_stats = service_row_group[1].find_all('td')[2:]
+    email_stats = service_row_group[0].find_all('div', class_='big-number-number')
+    sms_stats = service_row_group[1].find_all('div', class_='big-number-number')
 
-    email_sending, email_delivered, email_failed = [int(stat.text.split()[0]) for stat in email_stats]
-    sms_sending, sms_delivered, sms_failed = [int(stat.text.split()[0]) for stat in sms_stats]
+    email_sending, email_delivered, email_failed = [int(x.text.strip()) for x in email_stats]
+    sms_sending, sms_delivered, sms_failed = [int(x.text.strip()) for x in sms_stats]
 
-    assert email_sending == 10
+    assert email_sending == 2
     assert email_delivered == 3
     assert email_failed == 5
-    assert sms_sending == 50
+    assert sms_sending == 32
     assert sms_delivered == 7
     assert sms_failed == 11