darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-07 09:38:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2259 from alphagov/include-live-in-service-list

Browse Source 
Include live/trial mode in list of services
This commit is contained in:
Chris Hill-Scott
2018-12-13 11:16:26 +00:00
committed by GitHub
parent 4ddd38b440 2f4f381fa4
commit d692712b69
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/user/rest.py
View File

@@ -449,7 +449,8 @@ def get_orgs_and_services(user):
'services': [ 'services': [
{ {
'id': service.id, 'id': service.id,
'name': service.name 'name': service.name,
'restricted': service.restricted,
} }
for service in org.services for service in org.services
if service.active and service in user.services if service.active and service in user.services
@@ -460,7 +461,8 @@ def get_orgs_and_services(user):
'services_without_organisations': [ 'services_without_organisations': [
{ {
'id': service.id, 'id': service.id,
'name': service.name 'name': service.name,
'restricted': service.restricted,
} for service in user.services } for service in user.services
if ( if (
service.active and service.active and

18
tests/app/user/test_rest.py
View File

@@ -631,11 +631,13 @@ def test_get_orgs_and_services_nests_services(admin_request, sample_user):
'services': [ 'services': [
{ {
'name': service1.name, 'name': service1.name,
'id': str(service1.id) 'id': str(service1.id),
'restricted': False,
}, },
{ {
'name': service2.name, 'name': service2.name,
'id': str(service2.id) 'id': str(service2.id),
'restricted': False,
} }
] ]
}, },
@@ -648,7 +650,8 @@ def test_get_orgs_and_services_nests_services(admin_request, sample_user):
'services_without_organisations': [ 'services_without_organisations': [
{ {
'name': service3.name, 'name': service3.name,
'id': str(service3.id) 'id': str(service3.id),
'restricted': False,
} }
] ]
} }
@@ -683,7 +686,8 @@ def test_get_orgs_and_services_only_returns_active(admin_request, sample_user):
'services': [ 'services': [
{ {
'name': service1.name, 'name': service1.name,
'id': str(service1.id) 'id': str(service1.id),
'restricted': False,
} }
] ]
} }
@@ -691,7 +695,8 @@ def test_get_orgs_and_services_only_returns_active(admin_request, sample_user):
'services_without_organisations': [ 'services_without_organisations': [
{ {
'name': service4.name, 'name': service4.name,
'id': str(service4.id) 'id': str(service4.id),
'restricted': False,
} }
] ]
} }
@@ -727,7 +732,8 @@ def test_get_orgs_and_services_only_shows_users_orgs_and_services(admin_request,
'services_without_organisations': [ 'services_without_organisations': [
{ {
'name': service1.name, 'name': service1.name,
'id': str(service1.id) 'id': str(service1.id),
'restricted': False,
} }
] ]
} }