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

set sms_sender to be 'GOVUK' if not otherwise specified

Browse Source 
this is a precursor to making the column non-nullable
This commit is contained in:
Leo Hemsted
2017-05-22 14:43:46 +01:00
parent 3744463296
commit 2535a7fe98
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models.py
View File

@@ -199,7 +199,7 @@ class Service(db.Model, Versioned):
created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False) created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)
reply_to_email_address = db.Column(db.Text, index=False, unique=False, nullable=True) reply_to_email_address = db.Column(db.Text, index=False, unique=False, nullable=True)
letter_contact_block = db.Column(db.Text, index=False, unique=False, nullable=True) letter_contact_block = db.Column(db.Text, index=False, unique=False, nullable=True)
sms_sender = db.Column(db.String(11), nullable=True) sms_sender = db.Column(db.String(11), nullable=True, default='GOVUK')
organisation_id = db.Column(UUID(as_uuid=True), db.ForeignKey('organisation.id'), index=True, nullable=True) organisation_id = db.Column(UUID(as_uuid=True), db.ForeignKey('organisation.id'), index=True, nullable=True)
organisation = db.relationship('Organisation') organisation = db.relationship('Organisation')
dvla_organisation_id = db.Column( dvla_organisation_id = db.Column(

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

@@ -144,6 +144,7 @@ def test_get_service_by_id(client, sample_service):
assert json_resp['data']['organisation'] is None assert json_resp['data']['organisation'] is None
assert json_resp['data']['branding'] == 'govuk' assert json_resp['data']['branding'] == 'govuk'
assert json_resp['data']['dvla_organisation'] == '001' assert json_resp['data']['dvla_organisation'] == '001'
assert json_resp['data']['sms_sender'] == 'GOVUK'
def test_get_service_by_id_should_404_if_no_service(notify_api, notify_db): def test_get_service_by_id_should_404_if_no_service(notify_api, notify_db):
@@ -213,6 +214,7 @@ def test_create_service(client, sample_user):
assert json_resp['data']['email_from'] == 'created.service' assert json_resp['data']['email_from'] == 'created.service'
assert not json_resp['data']['research_mode'] assert not json_resp['data']['research_mode']
assert json_resp['data']['dvla_organisation'] == '001' assert json_resp['data']['dvla_organisation'] == '001'
assert json_resp['data']['sms_sender'] == 'GOVUK'
auth_header_fetch = create_authorization_header() auth_header_fetch = create_authorization_header()

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

@@ -34,7 +34,7 @@ def test_post_sms_notification_returns_201(notify_api, sample_template_with_plac
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")
# conftest fixture service does not have a sms sender, use config default # conftest fixture service does not have a sms sender, use config default
assert resp_json['content']['from_number'] == notify_api.config["FROM_NUMBER"] assert resp_json['content']['from_number'] == 'GOVUK'
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