diff --git a/app/dao/inbound_numbers_dao.py b/app/dao/inbound_numbers_dao.py index 3b8db6ff5..1c184b7f6 100644 --- a/app/dao/inbound_numbers_dao.py +++ b/app/dao/inbound_numbers_dao.py @@ -15,10 +15,6 @@ def dao_get_inbound_number_for_service(service_id): return InboundNumber.query.filter(InboundNumber.service_id == service_id).first() -def dao_get_inbound_number(inbound_number_id): - return InboundNumber.query.filter(InboundNumber.id == inbound_number_id).first() - - @transactional def dao_set_inbound_number_to_service(service_id, inbound_number): inbound_number.service_id = service_id @@ -28,7 +24,7 @@ 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 = dao_get_inbound_number(inbound_number_id) + inbound_number = InboundNumber.query.filter(InboundNumber.id == inbound_number_id).first() inbound_number.active = active db.session.add(inbound_number) diff --git a/tests/app/dao/test_inbound_numbers_dao.py b/tests/app/dao/test_inbound_numbers_dao.py index 4869ce84a..a37a86534 100644 --- a/tests/app/dao/test_inbound_numbers_dao.py +++ b/tests/app/dao/test_inbound_numbers_dao.py @@ -3,8 +3,8 @@ from sqlalchemy.exc import IntegrityError from app.dao.inbound_numbers_dao import ( dao_get_inbound_numbers, + dao_get_inbound_number_for_service, dao_get_available_inbound_numbers, - dao_get_inbound_number, dao_set_inbound_number_to_service, dao_set_inbound_number_active_flag ) @@ -56,14 +56,6 @@ def test_after_setting_service_id_that_inbound_number_is_unavailable( assert len(res) == 0 -def test_get_inbound_number(notify_db, notify_db_session): - inbound_number = create_inbound_number(number='1') - - res = dao_get_inbound_number(inbound_number.id) - - assert res.id == inbound_number.id - - def test_setting_a_service_twice_will_raise_an_error(notify_db, notify_db_session): create_inbound_number(number='1') create_inbound_number(number='2') @@ -85,6 +77,6 @@ def test_set_inbound_number_active_flag(notify_db, notify_db_session, sample_ser dao_set_inbound_number_active_flag(inbound_number.id, active=active) - inbound_number = dao_get_inbound_number(inbound_number.id) + inbound_number = dao_get_inbound_number_for_service(sample_service.id) assert inbound_number.active is active