darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-24 00:06:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

If the add sms sender is for an inbound number use the number from the inbound number object, rather than the value passed in.

Browse Source
This commit is contained in:
Rebecca Law
2017-10-19 16:29:54 +01:00
parent d975f30888
commit d1c9335307
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/service/rest.py
View File

@@ -634,10 +634,13 @@ def add_service_sms_sender(service_id):
dao_fetch_service_by_id(service_id) dao_fetch_service_by_id(service_id)
form = validate(request.get_json(), add_service_sms_sender_request) form = validate(request.get_json(), add_service_sms_sender_request)
inbound_number_id = form.get('inbound_number_id', None) inbound_number_id = form.get('inbound_number_id', None)
sms_sender = form.get('sms_sender')
if inbound_number_id: if inbound_number_id:
dao_allocate_number_for_service(service_id=service_id, inbound_number_id=inbound_number_id) updated_number = dao_allocate_number_for_service(service_id=service_id, inbound_number_id=inbound_number_id)
# the sms_sender in the form is the inbound_number_id from client, use number from table.
sms_sender = updated_number.number
new_sms_sender = dao_add_sms_sender_for_service(service_id=service_id, new_sms_sender = dao_add_sms_sender_for_service(service_id=service_id,
sms_sender=form['sms_sender'], sms_sender=sms_sender,
is_default=form['is_default'], is_default=form['is_default'],
inbound_number_id=inbound_number_id inbound_number_id=inbound_number_id
) )

2
tests/app/service/test_rest.py
View File

@@ -2595,7 +2595,7 @@ def test_add_service_sms_sender_when_it_is_an_inbound_number(client, notify_db_s
service = create_service() service = create_service()
inbound_number = create_inbound_number(number='12345') inbound_number = create_inbound_number(number='12345')
data = { data = {
"sms_sender": inbound_number.number, "sms_sender": str(inbound_number.id),
"is_default": False, "is_default": False,
"inbound_number_id": str(inbound_number.id) "inbound_number_id": str(inbound_number.id)
} }