From 902b28e00f8ebd84d8ad6ec7190da6c04abcabb7 Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Wed, 16 Aug 2017 16:27:42 +0100 Subject: [PATCH] Refactor to check active flag --- app/dao/services_dao.py | 3 ++- tests/app/dao/test_services_dao.py | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py index b4cd2e649..9898d2855 100644 --- a/app/dao/services_dao.py +++ b/app/dao/services_dao.py @@ -71,7 +71,8 @@ def dao_fetch_service_by_id(service_id, only_active=False): ############ def dao_fetch_services_by_sms_sender(sms_sender): inbound_number = InboundNumber.query.filter( - InboundNumber.number == sms_sender + InboundNumber.number == sms_sender, + InboundNumber.active ).first() if not inbound_number: diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index 35fa803ca..b7b92a0c0 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -955,6 +955,15 @@ def test_dao_fetch_services_by_sms_sender_with_unknown_number(notify_db_session) assert services == [] +def test_dao_fetch_services_by_sms_sender_with_inactive_number_returns_empty(notify_db_session): + service = create_service(service_name='a', sms_sender=None) + inbound_number = create_inbound_number('1', service_id=service.id, active=False) + + services = dao_fetch_services_by_sms_sender('1') + + assert services == [] + + def test_dao_allocating_inbound_number_shows_on_service(notify_db_session, sample_inbound_numbers): inbound_numbers = dao_get_available_inbound_numbers()