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

Merge pull request #766 from alphagov/fix-sms-sender

Browse Source 
Fix the from number in the post_sms_response.
This commit is contained in:
Rebecca Law
2016-12-12 16:46:00 +00:00
committed by GitHub
parent 551387251c 9973d74d09
commit 4f9b295a5b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/v2/notifications/notification_schemas.py
View File

@@ -149,7 +149,7 @@ sms_content = {
"body": {"type": "string"}, "body": {"type": "string"},
"from_number": {"type": "string"} "from_number": {"type": "string"}
}, },
"required": ["body"] "required": ["body", "from_number"]
} }
post_sms_response = { post_sms_response = {

6
app/v2/notifications/post_notifications.py
View File

@@ -1,4 +1,4 @@
from flask import request, jsonify from flask import request, jsonify, current_app
from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.orm.exc import NoResultFound
from app import api_user from app import api_user
@@ -40,10 +40,10 @@ def post_sms_notification():
key_type=api_user.key_type, key_type=api_user.key_type,
reference=form.get('reference')) reference=form.get('reference'))
send_notification_to_queue(notification, service.research_mode) send_notification_to_queue(notification, service.research_mode)
sms_sender = service.sms_sender if service.sms_sender else current_app.config.get('FROM_NUMBER')
resp = create_post_sms_response_from_notification(notification, resp = create_post_sms_response_from_notification(notification,
template_with_content.rendered, template_with_content.rendered,
service.sms_sender, sms_sender,
request.url_root) request.url_root)
return jsonify(resp), 201 return jsonify(resp), 201

3
tests/app/v2/notifications/test_post_notifications.py
View File

@@ -32,7 +32,8 @@ def test_post_sms_notification_returns_201(notify_api, sample_template_with_plac
assert resp_json['id'] == str(notification_id) assert resp_json['id'] == str(notification_id)
assert resp_json['reference'] == reference assert resp_json['reference'] == reference
assert resp_json['content']['body'] == sample_template_with_placeholders.content.replace("(( Name))", "Jo") assert resp_json['content']['body'] == sample_template_with_placeholders.content.replace("(( Name))", "Jo")
assert resp_json['content']['from_number'] == sample_template_with_placeholders.service.sms_sender # conftest fixture service does not have a sms sender, use config default
assert resp_json['content']['from_number'] == notify_api.config["FROM_NUMBER"]
assert 'v2/notifications/{}'.format(notification_id) in resp_json['uri'] assert 'v2/notifications/{}'.format(notification_id) in resp_json['uri']
assert resp_json['template']['id'] == str(sample_template_with_placeholders.id) assert resp_json['template']['id'] == str(sample_template_with_placeholders.id)
assert resp_json['template']['version'] == sample_template_with_placeholders.version assert resp_json['template']['version'] == sample_template_with_placeholders.version