darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 23:55:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove free_sms_fragment_limit from service

Browse Source 
* remove from model
* still required when calling POST /service - we just call through
  from dao_create_service to add a new annual billing entry.
* removed from POST /service/<id> update_service - if you want to
  update/add a new one, use POST /service/<id>/free-sms-fragment-limit
* made sure tests create services with default 250k limit.
This commit is contained in:
Leo Hemsted
2017-12-01 16:31:21 +00:00
parent f0ba491d04
commit b0d4044ff5
8 changed files with 58 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@ from tests.app.db import (
create_service_with_defined_sms_sender
)
from tests.app.db import create_user
from app.dao.date_util import get_current_financial_year_start_year
def test_get_service_list(client, service_factory):
@@ -133,16 +132,8 @@ def test_get_service_by_id(admin_request, sample_service):
assert json_resp['data']['dvla_organisation'] == '001'
assert json_resp['data']['sms_sender'] == current_app.config['FROM_NUMBER']
assert json_resp['data']['prefix_sms'] is True
def test_get_service_by_id_returns_free_sms_limit(admin_request, sample_service):
json_resp = admin_request.get('service.get_service_by_id', service_id=sample_service.id)
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(admin_request, sample_service):
json_resp = admin_request.get('service.get_service_by_id', service_id=sample_service.id, detailed=True)
assert json_resp['data']['free_sms_fragment_limit'] == current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT']
# deprecated field, no longer exists
assert 'free_sms_fragment_limit' not in json_resp['data']
@pytest.mark.parametrize('detailed', [True, False])
@@ -228,7 +219,9 @@ def test_create_service(client, sample_user):
'restricted': False,
'active': False,
'email_from': 'created.service',
'created_by': str(sample_user.id)}
'created_by': str(sample_user.id),
'free_sms_fragment_limit': 250000
}
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
resp = client.post(
@@ -243,8 +236,6 @@ 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']
# TODO: Remove this after the new data is used
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'
@@ -274,7 +265,8 @@ def test_should_not_create_service_with_missing_user_id_field(notify_api, fake_u
'message_limit': 1000,
'restricted': False,
'active': False,
'created_by': str(fake_uuid)
'created_by': str(fake_uuid),
'free_sms_fragment_limit': 250000
}
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
@@ -288,7 +280,7 @@ 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):
def test_create_service_free_sms_fragment_limit_is_not_optional(admin_request, sample_user):
data1 = {
'name': 'service 1',
'user_id': str(sample_user.id),
@@ -296,56 +288,16 @@ def test_create_service_free_sms_fragment_limit_is_optional(client, sample_user)
'restricted': False,
'active': False,
'email_from': 'sample_user.email1',
'created_by': str(sample_user.id),
'free_sms_fragment_limit': 9999
'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(data1),
headers=headers)
json_resp = json.loads(resp.get_data(as_text=True))
assert resp.status_code == 201
# Test data from the new annual billing table
service_id = json_resp['data']['id']
annual_billing = client.get('service/{}/billing/free-sms-fragment-limit?financial_year_start={}'
.format(service_id, get_current_financial_year_start_year()),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
json_resp = json.loads(annual_billing.get_data(as_text=True))
assert json_resp['free_sms_fragment_limit'] == 9999
# TODO: Remove this after the new data is used
assert json_resp['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
# Test data from the new annual billing table
service_id = json_resp['data']['id']
annual_billing = client.get('service/{}/billing/free-sms-fragment-limit?financial_year_start={}'
.format(service_id, get_current_financial_year_start_year()),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
json_resp = json.loads(annual_billing.get_data(as_text=True))
assert json_resp['free_sms_fragment_limit'] == current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT']
# TODO: Remove this after the new data is used
assert json_resp['free_sms_fragment_limit'] == current_app.config['FREE_SMS_TIER_FRAGMENT_COUNT']
json_resp = admin_request.post(
'service.create_service',
_data=data1,
_expected_status=400
)
assert json_resp['result'] == 'error'
assert 'Missing data for required field.' in json_resp['message']['free_sms_fragment_limit']
def test_should_error_if_created_by_missing(notify_api, sample_user):
@@ -357,7 +309,8 @@ def test_should_error_if_created_by_missing(notify_api, sample_user):
'message_limit': 1000,
'restricted': False,
'active': False,
'user_id': str(sample_user.id)
'user_id': str(sample_user.id),
'free_sms_fragment_limit': 250000
}
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
@@ -384,7 +337,8 @@ def test_should_not_create_service_with_missing_if_user_id_is_not_in_database(no
'message_limit': 1000,
'restricted': False,
'active': False,
'created_by': str(fake_uuid)
'created_by': str(fake_uuid),
'free_sms_fragment_limit': 250000
}
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
@@ -402,7 +356,8 @@ def test_should_not_create_service_if_missing_data(notify_api, sample_user):
with notify_api.test_request_context():
with notify_api.test_client() as client:
data = {
'user_id': str(sample_user.id)
'user_id': str(sample_user.id),
'free_sms_fragment_limit': 250000
}
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
@@ -430,7 +385,9 @@ def test_should_not_create_service_with_duplicate_name(notify_api,
'restricted': False,
'active': False,
'email_from': 'sample.service2',
'created_by': str(sample_user.id)}
'created_by': str(sample_user.id),
'free_sms_fragment_limit': 250000
}
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
resp = client.post(
@@ -456,7 +413,9 @@ def test_create_service_should_throw_duplicate_key_constraint_for_existing_email
'restricted': False,
'active': False,
'email_from': 'first.service',
'created_by': str(sample_user.id)}
'created_by': str(sample_user.id),
'free_sms_fragment_limit': 250000
}
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
resp = client.post(
@@ -603,37 +562,6 @@ 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])
# TODO: Remove after new table is created and verified
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()
@@ -916,7 +844,8 @@ def test_default_permissions_are_added_for_user_service(notify_api,
'restricted': False,
'active': False,
'email_from': 'created.service',
'created_by': str(sample_user.id)}
'created_by': str(sample_user.id),
'free_sms_fragment_limit': 250000}
auth_header = create_authorization_header()
headers = [('Content-Type', 'application/json'), auth_header]
resp = client.post(