diff --git a/app/schemas.py b/app/schemas.py index b5172c9d9..5107e8cf0 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -1,4 +1,3 @@ -import re from datetime import ( datetime, date, @@ -206,25 +205,17 @@ class ServiceSchema(BaseSchema): email_branding = field_for(models.Service, 'email_branding') organisation = field_for(models.Service, 'organisation') override_flag = False - 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") def service_permissions(self, service): return [p.permission for p in service.permissions] - def get_reply_to_email_address(self, service): - 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): return service.get_default_letter_contact() class Meta: model = models.Service - dump_only = ['reply_to_email_address', 'letter_contact_block'] + dump_only = ['letter_contact_block'] exclude = ( 'updated_at', 'created_at', @@ -242,11 +233,6 @@ class ServiceSchema(BaseSchema): ) 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') def validate_permissions(self, value): permissions = [v.permission for v in value] diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index b1930a511..7998b6b91 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -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']['branding'] == 'govuk' 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 @@ -198,7 +197,6 @@ def test_get_service_by_id_and_user(client, sample_service, sample_user): json_resp = json.loads(resp.get_data(as_text=True)) assert json_resp['data']['name'] == sample_service.name assert json_resp['data']['id'] == str(sample_service.id) - assert json_resp['data']['reply_to_email_address'] == 'new@service.com' def test_get_service_by_id_should_404_if_no_service_for_user(notify_api, sample_user): @@ -239,7 +237,6 @@ def test_create_service(client, sample_user): assert json_resp['data']['email_from'] == 'created.service' assert not json_resp['data']['research_mode'] 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 service_db = Service.query.get(json_resp['data']['id']) @@ -1425,7 +1422,6 @@ def test_set_sms_prefixing_for_service( _data={'prefix_sms': posted_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(