diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py index f179831ce..4a19d6948 100644 --- a/app/main/views/platform_admin.py +++ b/app/main/views/platform_admin.py @@ -42,7 +42,8 @@ def format_stats_by_service(all_stats, services): (stats['emails_requested'] - stats['emails_delivered'] - stats['emails_failed']) ), 'delivered': stats['sms_delivered'] + stats['emails_delivered'], - 'failed': stats['sms_failed'] + stats['emails_failed'] + 'failed': stats['sms_failed'] + stats['emails_failed'], + 'restricted': services[stats['service']]['restricted'] } for stats in all_stats ] diff --git a/app/templates/views/platform-admin.html b/app/templates/views/platform-admin.html index 33cceb61c..6e7c31978 100644 --- a/app/templates/views/platform-admin.html +++ b/app/templates/views/platform-admin.html @@ -60,6 +60,9 @@ {% call field() %}
{{ item['name'] }} + + {{ 'Trial' if item['restricted'] else 'Live' }} +
{% endcall %} {% call field(align='right') %} diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py index 9d9f9199c..71c05df55 100644 --- a/tests/app/main/views/test_platform_admin.py +++ b/tests/app/main/views/test_platform_admin.py @@ -87,8 +87,8 @@ def create_stats( def test_format_stats_by_service_gets_correct_stats_for_each_service(): services = [ - {'name': 'a', 'id': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'}, - {'name': 'b', 'id': 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb'} + {'name': 'a', 'id': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'restricted': False}, + {'name': 'b', 'id': 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'restricted': True} ] all_stats = [ create_stats('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', emails_requested=1), @@ -102,16 +102,18 @@ def test_format_stats_by_service_gets_correct_stats_for_each_service(): assert ret[0]['sending'] == 1 assert ret[0]['delivered'] == 0 assert ret[0]['failed'] == 0 + assert ret[0]['restricted'] is False assert ret[1]['name'] == 'b' assert ret[1]['sending'] == 2 assert ret[1]['delivered'] == 0 assert ret[1]['failed'] == 0 + assert ret[1]['restricted'] is True def test_format_stats_by_service_sums_values_for_sending(): services = [ - {'name': 'a', 'id': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'}, + {'name': 'a', 'id': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'restricted': False}, ] all_stats = [ create_stats(