From e14fa2d87e0243ef4436bcc461d6b5bdb9bc185a Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Mon, 14 Aug 2017 18:20:25 +0100 Subject: [PATCH] Refactored to use service_id to set flag --- app/dao/inbound_numbers_dao.py | 4 ++-- app/inbound_number/rest.py | 8 ++++---- tests/app/dao/test_inbound_numbers_dao.py | 2 +- tests/app/inbound_number/test_rest.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/dao/inbound_numbers_dao.py b/app/dao/inbound_numbers_dao.py index 085ed3f22..fa30258c2 100644 --- a/app/dao/inbound_numbers_dao.py +++ b/app/dao/inbound_numbers_dao.py @@ -26,8 +26,8 @@ def dao_set_inbound_number_to_service(service_id, inbound_number): @transactional -def dao_set_inbound_number_active_flag(inbound_number_id, active): - inbound_number = InboundNumber.query.filter(InboundNumber.id == inbound_number_id).first() +def dao_set_inbound_number_active_flag(service_id, active): + inbound_number = InboundNumber.query.filter(InboundNumber.service_id == service_id).first() inbound_number.active = active db.session.add(inbound_number) diff --git a/app/inbound_number/rest.py b/app/inbound_number/rest.py index 3f21d9551..3fba96774 100644 --- a/app/inbound_number/rest.py +++ b/app/inbound_number/rest.py @@ -33,7 +33,7 @@ def post_allocate_inbound_number(service_id): if inbound_number: if not inbound_number.active: - dao_set_inbound_number_active_flag(inbound_number.id, active=True) + dao_set_inbound_number_active_flag(service_id, active=True) return '', 204 else: return '', 200 @@ -47,7 +47,7 @@ def post_allocate_inbound_number(service_id): raise InvalidRequest('No available inbound numbers', status_code=400) -@inbound_number_blueprint.route('//off', methods=['POST']) -def post_set_inbound_number_off(inbound_number_id): - dao_set_inbound_number_active_flag(inbound_number_id, active=False) +@inbound_number_blueprint.route('/service//off', methods=['POST']) +def post_set_inbound_number_off(service_id): + dao_set_inbound_number_active_flag(service_id, active=False) return '', 204 diff --git a/tests/app/dao/test_inbound_numbers_dao.py b/tests/app/dao/test_inbound_numbers_dao.py index 9d59a8110..f55dda956 100644 --- a/tests/app/dao/test_inbound_numbers_dao.py +++ b/tests/app/dao/test_inbound_numbers_dao.py @@ -74,7 +74,7 @@ def test_set_inbound_number_active_flag(notify_db, notify_db_session, sample_ser inbound_number = create_inbound_number(number='1') dao_set_inbound_number_to_service(sample_service.id, inbound_number) - dao_set_inbound_number_active_flag(inbound_number.id, active=active) + dao_set_inbound_number_active_flag(sample_service.id, active=active) inbound_number = dao_get_inbound_number_for_service(sample_service.id) diff --git a/tests/app/inbound_number/test_rest.py b/tests/app/inbound_number/test_rest.py index 3baba5e3b..a5268f283 100644 --- a/tests/app/inbound_number/test_rest.py +++ b/tests/app/inbound_number/test_rest.py @@ -110,7 +110,7 @@ def test_rest_set_inbound_number_active_flag_off( admin_request.post( 'inbound_number.post_set_inbound_number_off', _expected_status=204, - inbound_number_id=inbound_number.id + service_id=service.id ) inbound_number_from_db = dao_get_inbound_number_for_service(service.id)