darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 15:31:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactored inbound_number dao

Browse Source
This commit is contained in:
Ken Tsang
2017-08-11 10:42:36 +01:00
parent cfabab0785
commit 9a55e167f7
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/inbound_numbers_dao.py
View File

@@ -15,10 +15,6 @@ def dao_get_inbound_number_for_service(service_id):
return InboundNumber.query.filter(InboundNumber.service_id == service_id).first() 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 @transactional
def dao_set_inbound_number_to_service(service_id, inbound_number): def dao_set_inbound_number_to_service(service_id, inbound_number):
inbound_number.service_id = service_id inbound_number.service_id = service_id
@@ -28,7 +24,7 @@ def dao_set_inbound_number_to_service(service_id, inbound_number):
@transactional @transactional
def dao_set_inbound_number_active_flag(inbound_number_id, active): 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 inbound_number.active = active
db.session.add(inbound_number) db.session.add(inbound_number)

12
tests/app/dao/test_inbound_numbers_dao.py
View File

@@ -3,8 +3,8 @@ from sqlalchemy.exc import IntegrityError
from app.dao.inbound_numbers_dao import ( from app.dao.inbound_numbers_dao import (
dao_get_inbound_numbers, dao_get_inbound_numbers,
dao_get_inbound_number_for_service,
dao_get_available_inbound_numbers, dao_get_available_inbound_numbers,
dao_get_inbound_number,
dao_set_inbound_number_to_service, dao_set_inbound_number_to_service,
dao_set_inbound_number_active_flag 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 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): def test_setting_a_service_twice_will_raise_an_error(notify_db, notify_db_session):
create_inbound_number(number='1') create_inbound_number(number='1')
create_inbound_number(number='2') 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) 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 assert inbound_number.active is active