darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1692 from alphagov/service-name-change

Browse Source 
don't return or accept sms_sender in update service anymore
This commit is contained in:
Leo Hemsted
2018-02-22 14:37:47 +00:00
committed by GitHub
parent 18a85a080d aedbd37d8b
commit 25d6b45ea2
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/schemas.py
View File

@@ -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]