From 2001bfca36d2646f9bac343efb0a8edb37572f05 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 12 Oct 2017 12:07:52 +0100 Subject: [PATCH] Set free_sms_fragment_limit when creating a service The free_sms_fragment_limit of a service is set when the service is created. If a value for the free_sms_fragment_limit is not given, the default value is used. --- app/service/rest.py | 4 ++ tests/app/service/test_rest.py | 78 +++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/app/service/rest.py b/app/service/rest.py index e06d66dc9..66cd90317 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -138,6 +138,10 @@ def create_service(): errors = {'user_id': ['Missing data for required field.']} raise InvalidRequest(errors, status_code=400) + # TODO: to be removed when front-end is updated + if 'free_sms_fragment_limit' not in data: + data['free_sms_fragment_limit'] = current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT'] + # validate json with marshmallow service_schema.load(request.get_json()) diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index ba0465958..c131abad3 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -162,7 +162,7 @@ def test_get_service_by_id_returns_free_sms_limit(client, sample_service): ) assert resp.status_code == 200 json_resp = json.loads(resp.get_data(as_text=True)) - assert json_resp['data']['free_sms_fragment_limit'] == 250000 + assert json_resp['data']['free_sms_fragment_limit'] == current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT'] def test_get_detailed_service_by_id_returns_free_sms_limit(client, sample_service): @@ -174,7 +174,7 @@ def test_get_detailed_service_by_id_returns_free_sms_limit(client, sample_servic ) assert resp.status_code == 200 json_resp = json.loads(resp.get_data(as_text=True)) - assert json_resp['data']['free_sms_fragment_limit'] == 250000 + assert json_resp['data']['free_sms_fragment_limit'] == current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT'] def test_get_service_list_has_default_permissions(client, service_factory): @@ -272,6 +272,7 @@ def test_create_service(client, sample_user): assert not json_resp['data']['research_mode'] assert json_resp['data']['dvla_organisation'] == '001' assert json_resp['data']['sms_sender'] == current_app.config['FROM_NUMBER'] + assert json_resp['data']['free_sms_fragment_limit'] == current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT'] service_db = Service.query.get(json_resp['data']['id']) assert service_db.name == 'created service' @@ -316,6 +317,49 @@ def test_should_not_create_service_with_missing_user_id_field(notify_api, fake_u assert 'Missing data for required field.' in json_resp['message']['user_id'] +def test_create_service_free_sms_fragment_limit_is_optional(client, sample_user): + data1 = { + 'name': 'service 1', + 'user_id': str(sample_user.id), + 'message_limit': 1000, + 'restricted': False, + 'active': False, + 'email_from': 'sample_user.email1', + 'created_by': str(sample_user.id), + 'free_sms_fragment_limit': 9999 + } + + auth_header = create_authorization_header() + headers = [('Content-Type', 'application/json'), auth_header] + resp = client.post( + '/service', + data=json.dumps(data1), + headers=headers) + json_resp = json.loads(resp.get_data(as_text=True)) + assert resp.status_code == 201 + assert json_resp['data']['free_sms_fragment_limit'] == 9999 + + data2 = { + 'name': 'service 2', + 'user_id': str(sample_user.id), + 'message_limit': 1000, + 'restricted': False, + 'active': False, + 'email_from': 'sample_user.email2', + 'created_by': str(sample_user.id), + } + + auth_header = create_authorization_header() + headers = [('Content-Type', 'application/json'), auth_header] + resp = client.post( + '/service', + data=json.dumps(data2), + headers=headers) + json_resp = json.loads(resp.get_data(as_text=True)) + assert resp.status_code == 201 + assert json_resp['data']['free_sms_fragment_limit'] == current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT'] + + def test_should_error_if_created_by_missing(notify_api, sample_user): with notify_api.test_request_context(): with notify_api.test_client() as client: @@ -550,6 +594,36 @@ def test_update_service_flags_will_remove_service_permissions(client, notify_db, assert set([p.permission for p in permissions]) == set([SMS_TYPE, EMAIL_TYPE]) +def test_update_service_free_sms_fragment_limit(client, notify_db, sample_service): + org = Organisation(colour='#000000', logo='justice-league.png', name='Justice League') + notify_db.session.add(org) + notify_db.session.commit() + + auth_header = create_authorization_header() + resp = client.get( + '/service/{}'.format(sample_service.id), + headers=[auth_header] + ) + json_resp = json.loads(resp.get_data(as_text=True)) + assert resp.status_code == 200 + assert json_resp['data']['free_sms_fragment_limit'] == current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT'] + + data = { + 'free_sms_fragment_limit': 9999 + } + + auth_header = create_authorization_header() + + resp = client.post( + '/service/{}'.format(sample_service.id), + data=json.dumps(data), + headers=[('Content-Type', 'application/json'), auth_header] + ) + result = json.loads(resp.get_data(as_text=True)) + assert resp.status_code == 200 + assert result['data']['free_sms_fragment_limit'] == 9999 + + def test_update_permissions_will_override_permission_flags(client, service_with_no_permissions): auth_header = create_authorization_header()