darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-18 21:48:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor set_inbound_number_for_service

Browse Source 
As don't need the check for available inbound numbers
This commit is contained in:
Ken Tsang
2017-08-11 16:10:52 +01:00
parent 0c4c467cac
commit d2a618cf0a
2 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/inbound_number/rest.py
View File

@@ -39,9 +39,6 @@ def get_inbound_number_for_service(service_id):
@inbound_number_blueprint.route('/<uuid:inbound_number_id>/service/<uuid:service_id>', methods=['POST']) @inbound_number_blueprint.route('/<uuid:inbound_number_id>/service/<uuid:service_id>', methods=['POST'])
def post_set_inbound_number_for_service(inbound_number_id, service_id): def post_set_inbound_number_for_service(inbound_number_id, service_id):
if len(dao_get_available_inbound_numbers()) == 0:
raise InvalidRequest('No inbound numbers available', status_code=400)
inbound_number = dao_get_inbound_number_for_service(service_id) inbound_number = dao_get_inbound_number_for_service(service_id)
if inbound_number: if inbound_number:
raise InvalidRequest('Service already has an inbound number', status_code=400) raise InvalidRequest('Service already has an inbound number', status_code=400)

47
tests/app/inbound_number/test_rest.py
View File

@@ -1,3 +1,5 @@
import pytest
from flask import url_for from flask import url_for
import json import json
@@ -29,22 +31,6 @@ def test_rest_get_inbound_number(admin_request, notify_db_session, sample_servic
assert result['data'] == inbound_number.serialize() assert result['data'] == inbound_number.serialize()
def test_rest_set_service_to_several_inbound_numbers_returns_400(
admin_request, notify_db_session, sample_service):
service_1 = create_service(service_name='test service 1')
create_inbound_number(number='1', provider='mmg', active=False, service_id=sample_service.id)
inbound_number = create_inbound_number(number='2', provider='mmg', active=True, service_id=service_1.id)
service_2 = create_service(service_name='test service 2')
result = admin_request.post(
'inbound_number.post_set_inbound_number_for_service',
_expected_status=400,
inbound_number_id=inbound_number.id,
service_id=service_2.id
)
assert result['message'] == 'No inbound numbers available'
def test_rest_set_number_to_several_services_returns_400( def test_rest_set_number_to_several_services_returns_400(
admin_request, notify_db_session, sample_service): admin_request, notify_db_session, sample_service):
service_1 = create_service(service_name='test service 1') service_1 = create_service(service_name='test service 1')
@@ -61,7 +47,7 @@ def test_rest_set_number_to_several_services_returns_400(
assert result['message'] == 'Inbound number already assigned' assert result['message'] == 'Inbound number already assigned'
def test_rest_set_multiple_number_to_a_service_returns_400( def test_rest_set_multiple_numbers_to_a_service_returns_400(
admin_request, notify_db_session, sample_service): admin_request, notify_db_session, sample_service):
create_inbound_number(number='1', provider='mmg', active=True, service_id=sample_service.id) create_inbound_number(number='1', provider='mmg', active=True, service_id=sample_service.id)
inbound_number = create_inbound_number(number='2', provider='mmg', active=True, service_id=None) inbound_number = create_inbound_number(number='2', provider='mmg', active=True, service_id=None)
@@ -75,29 +61,18 @@ def test_rest_set_multiple_number_to_a_service_returns_400(
assert result['message'] == 'Service already has an inbound number' assert result['message'] == 'Service already has an inbound number'
def test_rest_set_inbound_number_active_flag_off(admin_request, notify_db_session): @pytest.mark.parametrize("active_flag,expected_flag_state", [("on", True), ("off", False)])
def test_rest_set_inbound_number_active_flag(
admin_request, notify_db_session, active_flag, expected_flag_state):
service = create_service(service_name='test service 1') service = create_service(service_name='test service 1')
inbound_number = create_inbound_number(number='1', provider='mmg', active=True, service_id=service.id) inbound_number = create_inbound_number(
number='1', provider='mmg', active=not expected_flag_state, service_id=service.id)
admin_request.post( admin_request.post(
'inbound_number.post_set_inbound_number_off', 'inbound_number.post_set_inbound_number_{}'.format(active_flag),
_expected_status=204, _expected_status=204,
inbound_number_id=inbound_number.id inbound_number_id=inbound_number.id
) )
inbound_number_off = dao_get_inbound_number_for_service(service.id) inbound_number_from_db = dao_get_inbound_number_for_service(service.id)
assert not inbound_number_off.active assert inbound_number_from_db.active == expected_flag_state
def test_rest_set_inbound_number_active_flag_on(admin_request, notify_db_session):
service = create_service(service_name='test service 1')
inbound_number = create_inbound_number(number='1', provider='mmg', active=False, service_id=service.id)
admin_request.post(
'inbound_number.post_set_inbound_number_on',
_expected_status=204,
inbound_number_id=inbound_number.id
)
inbound_number_on = dao_get_inbound_number_for_service(service.id)
assert inbound_number_on.active