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

Stop making multiple API calls to get_organisation

Browse Source 
The count of live services is coming back from the `/organisations`
response. We don’t need to get each organisation individually now.
This commit is contained in:
Chris Hill-Scott
2019-06-17 16:09:58 +01:00
parent e6304fe10d
commit 290e111810
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.py
View File

@@ -294,7 +294,7 @@ class User(JSONModel, UserMixin):
@property @property
def organisations(self): def organisations(self):
return [ return [
Organisation.from_id(organisation['id']) Organisation(organisation)
for organisation in self.orgs_and_services['organisations'] for organisation in self.orgs_and_services['organisations']
] ]

10
tests/app/main/views/accounts/test_choose_accounts.py
View File

@@ -20,14 +20,17 @@ SAMPLE_DATA = {
{ {
'name': 'org_1', 'name': 'org_1',
'id': 'o1', 'id': 'o1',
'count_of_live_services': 1,
}, },
{ {
'name': 'org_2', 'name': 'org_2',
'id': 'o2', 'id': 'o2',
'count_of_live_services': 2,
}, },
{ {
'name': 'org_3', 'name': 'org_3',
'id': 'o3', 'id': 'o3',
'count_of_live_services': 0,
} }
], ],
'services': [ 'services': [
@@ -96,14 +99,14 @@ def test_choose_account_should_show_choose_accounts_page(
assert outer_list_items[0].a.text == 'Org 1' assert outer_list_items[0].a.text == 'Org 1'
assert outer_list_items[0].a['href'] == url_for('.organisation_dashboard', org_id='o1') assert outer_list_items[0].a['href'] == url_for('.organisation_dashboard', org_id='o1')
assert normalize_spaces(outer_list_items[0].select_one('.browse-list-hint').text) == ( assert normalize_spaces(outer_list_items[0].select_one('.browse-list-hint').text) == (
'0 live services' '1 live service'
) )
# second org # second org
assert outer_list_items[1].a.text == 'Org 2' assert outer_list_items[1].a.text == 'Org 2'
assert outer_list_items[1].a['href'] == url_for('.organisation_dashboard', org_id='o2') assert outer_list_items[1].a['href'] == url_for('.organisation_dashboard', org_id='o2')
assert normalize_spaces(outer_list_items[1].select_one('.browse-list-hint').text) == ( assert normalize_spaces(outer_list_items[1].select_one('.browse-list-hint').text) == (
'0 live services' '2 live services'
) )
# third org # third org
@@ -127,7 +130,7 @@ def test_choose_account_should_show_choose_accounts_page(
assert trial_services_list_items[1].a.text == 'service three' assert trial_services_list_items[1].a.text == 'service three'
assert trial_services_list_items[1].a['href'] == url_for('.service_dashboard', service_id='abcde') assert trial_services_list_items[1].a['href'] == url_for('.service_dashboard', service_id='abcde')
assert len(mock_get_organisation.call_args_list) == 21 assert mock_get_organisation.call_args_list == []
def test_choose_account_should_show_choose_accounts_page_if_no_services( def test_choose_account_should_show_choose_accounts_page_if_no_services(
@@ -155,7 +158,6 @@ def test_choose_account_should_should_organisations_link_for_platform_admin(
client_request, client_request,
platform_admin_user, platform_admin_user,
mock_get_orgs_and_services, mock_get_orgs_and_services,
mock_get_organisation,
mock_get_organisation_services, mock_get_organisation_services,
): ):
client_request.login(platform_admin_user) client_request.login(platform_admin_user)