darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-03 23:51:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1026 from alphagov/plat-adm-stats

Browse Source 
fix platform admin statistics bug
This commit is contained in:
Leo Hemsted
2016-11-15 11:20:14 +00:00
committed by GitHub
parent 6a9973d1b6 5edb8cd086
commit 3e779675a7
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/main/views/platform_admin.py
View File

@@ -64,7 +64,14 @@ def format_stats_by_service(services):
yield { yield {
'id': service['id'], 'id': service['id'],
'name': service['name'], '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'], 'restricted': service['restricted'],
'research_mode': service['research_mode'], 'research_mode': service['research_mode'],
'created_at': service['created_at'] 'created_at': service['created_at']

2
app/templates/views/platform-admin.html
View File

@@ -11,7 +11,7 @@
{% endcall %} {% endcall %}
{% call field(align='right', border=False) %} {% call field(align='right', border=False) %}
{{ big_number(data[channel]['requested'], smaller=True) }} {{ big_number(data[channel]['sending'], smaller=True) }}
{% endcall %} {% endcall %}
{% call field(align='right', border=False) %} {% call field(align='right', border=False) %}

17
tests/app/main/views/test_platform_admin.py
View File

@@ -156,11 +156,12 @@ def test_format_stats_by_service_returns_correct_values(fake_uuid):
ret = list(format_stats_by_service(services)) ret = list(format_stats_by_service(services))
assert len(ret) == 1 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']['delivered'] == 3
assert ret[0]['stats']['email']['failed'] == 5 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']['delivered'] == 7
assert ret[0]['stats']['sms']['failed'] == 11 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] table_body = page.find_all('table')[table_index].find_all('tbody')[0]
service_row_group = table_body.find_all('tbody')[0].find_all('tr') service_row_group = table_body.find_all('tbody')[0].find_all('tr')
email_stats = service_row_group[0].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('td')[2:] 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] email_sending, email_delivered, email_failed = [int(x.text.strip()) for x in email_stats]
sms_sending, sms_delivered, sms_failed = [int(stat.text.split()[0]) for stat in sms_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_delivered == 3
assert email_failed == 5 assert email_failed == 5
assert sms_sending == 50 assert sms_sending == 32
assert sms_delivered == 7 assert sms_delivered == 7
assert sms_failed == 11 assert sms_failed == 11