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

don't return or accept sms_sender in update service anymore

Browse Source 
it's no longer a field on the service
This commit is contained in:
Leo Hemsted
2018-02-21 15:45:19 +00:00
parent f248234cfc
commit 703cee66f0
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/schemas.py
View File

@@ -1,4 +1,3 @@
import re
from datetime import ( from datetime import (
datetime, datetime,
date, date,
@@ -207,7 +206,6 @@ class ServiceSchema(BaseSchema):
organisation = field_for(models.Service, 'organisation') organisation = field_for(models.Service, 'organisation')
override_flag = False override_flag = False
reply_to_email_address = fields.Method(method_name="get_reply_to_email_address") reply_to_email_address = fields.Method(method_name="get_reply_to_email_address")
sms_sender = fields.Method(method_name="get_sms_sender")
letter_contact_block = fields.Method(method_name="get_letter_contact") letter_contact_block = fields.Method(method_name="get_letter_contact")
def service_permissions(self, service): def service_permissions(self, service):
@@ -216,9 +214,6 @@ class ServiceSchema(BaseSchema):
def get_reply_to_email_address(self, service): def get_reply_to_email_address(self, service):
return service.get_default_reply_to_email_address() return service.get_default_reply_to_email_address()
def get_sms_sender(self, service):
return service.get_default_sms_sender()
def get_letter_contact(self, service): def get_letter_contact(self, service):
return service.get_default_letter_contact() return service.get_default_letter_contact()
@@ -242,11 +237,6 @@ class ServiceSchema(BaseSchema):
) )
strict = True strict = True
@validates('sms_sender')
def validate_sms_sender(self, value):
if value and not re.match(r'^[a-zA-Z0-9\s]+$', value):
raise ValidationError('Only alphanumeric characters allowed')
@validates('permissions') @validates('permissions')
def validate_permissions(self, value): def validate_permissions(self, value):
permissions = [v.permission for v in value] permissions = [v.permission for v in value]

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

@@ -137,7 +137,6 @@ def test_get_service_by_id(admin_request, sample_service):
assert json_resp['data']['email_branding'] is None assert json_resp['data']['email_branding'] 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'] == current_app.config['FROM_NUMBER']
assert json_resp['data']['prefix_sms'] is True assert json_resp['data']['prefix_sms'] is True
@@ -239,7 +238,6 @@ 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'] == current_app.config['FROM_NUMBER']
assert json_resp['data']['rate_limit'] == 3000 assert json_resp['data']['rate_limit'] == 3000
service_db = Service.query.get(json_resp['data']['id']) service_db = Service.query.get(json_resp['data']['id'])
@@ -1425,7 +1423,6 @@ def test_set_sms_prefixing_for_service(
_data={'prefix_sms': posted_value}, _data={'prefix_sms': posted_value},
) )
assert result['data']['prefix_sms'] == stored_value assert result['data']['prefix_sms'] == stored_value
assert result['data']['sms_sender'] == current_app.config['FROM_NUMBER']
def test_set_sms_prefixing_for_service_cant_be_none( def test_set_sms_prefixing_for_service_cant_be_none(