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

Merge pull request #2879 from alphagov/serialise-less-stuff

Browse Source 
Serialise less stuff from the service model
This commit is contained in:
Chris Hill-Scott
2020-06-17 08:18:28 +01:00
committed by GitHub
parent eec2c2859e b3c69087d8
commit ca5cfe8d01
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/schemas.py
View File

@@ -235,6 +235,18 @@ class ServiceSchema(BaseSchema):
'letter_contacts', 'letter_contacts',
'complaints', 'complaints',
'data_retention', 'data_retention',
'all_template_folders',
'annual_billing',
'contact_list',
'crown',
'inbound_number',
'inbound_sms',
'letter_logo_filename',
'rate_limit',
'returned_letters',
'users',
'version',
'whitelist',
) )
strict = True strict = True
@@ -289,7 +301,18 @@ class DetailedServiceSchema(BaseSchema):
'sms_sender', 'sms_sender',
'permissions', 'permissions',
'inbound_number', 'inbound_number',
'inbound_sms' 'inbound_sms',
'all_template_folders',
'annual_billing',
'contact_list',
'created_by',
'crown',
'letter_logo_filename',
'rate_limit',
'returned_letters',
'users',
'version',
'whitelist',
) )

3
tests/app/service/test_rest.py
View File

@@ -235,7 +235,6 @@ def test_get_service_by_id(admin_request, sample_service):
assert json_resp['data']['email_branding'] is None assert json_resp['data']['email_branding'] is None
assert 'branding' not in json_resp['data'] assert 'branding' not in json_resp['data']
assert json_resp['data']['prefix_sms'] is True assert json_resp['data']['prefix_sms'] is True
assert json_resp['data']['letter_logo_filename'] is None
@pytest.mark.parametrize('detailed', [True, False]) @pytest.mark.parametrize('detailed', [True, False])
@@ -347,7 +346,6 @@ def test_create_service(
assert json_resp['data']['name'] == 'created service' assert json_resp['data']['name'] == 'created service'
assert json_resp['data']['email_from'] == 'created.service' assert json_resp['data']['email_from'] == 'created.service'
assert not json_resp['data']['research_mode'] assert not json_resp['data']['research_mode']
assert json_resp['data']['rate_limit'] == 3000
assert json_resp['data']['letter_branding'] is None assert json_resp['data']['letter_branding'] is None
assert json_resp['data']['count_as_live'] is expected_count_as_live assert json_resp['data']['count_as_live'] is expected_count_as_live
@@ -1225,7 +1223,6 @@ def test_add_existing_user_to_another_service_with_all_permissions(
) )
assert resp.status_code == 200 assert resp.status_code == 200
json_resp = resp.json json_resp = resp.json
assert str(user_to_add.id) in json_resp['data']['users']
# check user has all permissions # check user has all permissions
auth_header = create_authorization_header() auth_header = create_authorization_header()