Refactor to check active flag

This commit is contained in:
Ken Tsang
2017-08-16 16:27:42 +01:00
parent fbe1a14304
commit 902b28e00f
2 changed files with 11 additions and 1 deletions

View File

@@ -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:

View File

@@ -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()