Update schema to return default letter contact for a service

This commit is contained in:
Imdad Ahad
2017-09-26 15:09:02 +01:00
committed by Katie Smith
parent 4eebd9a83c
commit cb37ba5f78
3 changed files with 6 additions and 4 deletions

View File

@@ -183,6 +183,7 @@ class ServiceSchema(BaseSchema):
permissions = fields.Method("service_permissions")
override_flag = False
reply_to_email_address = fields.Method(method_name="get_reply_to_email_address")
letter_contact_block = fields.Method(method_name="get_letter_contact")
def get_free_sms_fragment_limit(selfs, service):
return service.free_sms_fragment_limit()
@@ -193,9 +194,12 @@ class ServiceSchema(BaseSchema):
def get_reply_to_email_address(self, service):
return service.get_default_reply_to_email_address()
def get_letter_contact(self, service):
return service.get_default_letter_contact()
class Meta:
model = models.Service
dump_only = ['free_sms_fragment_limit', 'reply_to_email_address']
dump_only = ['free_sms_fragment_limit', 'reply_to_email_address', 'letter_contact_block']
exclude = (
'updated_at',
'created_at',

View File

@@ -147,7 +147,6 @@ def update_service(service_id):
fetched_service = dao_fetch_service_by_id(service_id)
# Capture the status change here as Marshmallow changes this later
service_going_live = fetched_service.restricted and not req_json.get('restricted', True)
current_data = dict(service_schema.dump(fetched_service).data.items())
current_data.update(request.get_json())
update_dict = service_schema.load(current_data).data

View File

@@ -150,8 +150,7 @@ def sample_service(
'message_limit': limit,
'restricted': restricted,
'email_from': email_from,
'created_by': user,
'letter_contact_block': letter_contact_block,
'created_by': user
}
service = Service.query.filter_by(name=service_name).first()
if not service: