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

Merge pull request #3835 from alphagov/fix-performance-page-services-without-org

Browse Source 
Fix bug when live services have no organisation
This commit is contained in:
Chris Hill-Scott
2021-03-15 09:55:42 +00:00
committed by GitHub
parent f424837429 3ea9cba0bc
commit 90ab5f5d71
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/performance.py
View File

@@ -18,7 +18,7 @@ def performance():
stats['organisations_using_notify'] = sorted( stats['organisations_using_notify'] = sorted(
[ [
{ {
'organisation_name': organisation_name, 'organisation_name': organisation_name or 'No organisation',
'count_of_live_services': len(list(group)), 'count_of_live_services': len(list(group)),
} }
for organisation_name, group in groupby( for organisation_name, group in groupby(

12
tests/app/main/views/test_performance.py
View File

@@ -93,6 +93,15 @@ def _get_example_performance_data():
"service_id": uuid.uuid4(), "service_id": uuid.uuid4(),
"service_name": "Example service 3" "service_name": "Example service 3"
}, },
{
# On production there should be no live services without an
# organisation, but this isn’t always true in people’s local
# environments
"organisation_id": None,
"organisation_name": None,
"service_id": uuid.uuid4(),
"service_name": "Example service 4"
},
], ],
} }
@@ -150,5 +159,6 @@ def test_should_render_performance_page(
'Organisations using Notify ' 'Organisations using Notify '
'Organisation Number of live services ' 'Organisation Number of live services '
'Department of Examples and Patterns 2 ' 'Department of Examples and Patterns 2 '
'Department of One Service 1' 'Department of One Service 1 '
'No organisation 1'
) )