mirror of
https://github.com/GSA/notifications-api.git
synced 2026-09-11 18:38:14 -04:00
Update schema to return default letter contact for a service
This commit is contained in:
+5
-1
@@ -183,6 +183,7 @@ class ServiceSchema(BaseSchema):
|
|||||||
permissions = fields.Method("service_permissions")
|
permissions = fields.Method("service_permissions")
|
||||||
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")
|
||||||
|
letter_contact_block = fields.Method(method_name="get_letter_contact")
|
||||||
|
|
||||||
def get_free_sms_fragment_limit(selfs, service):
|
def get_free_sms_fragment_limit(selfs, service):
|
||||||
return service.free_sms_fragment_limit()
|
return service.free_sms_fragment_limit()
|
||||||
@@ -193,9 +194,12 @@ 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_letter_contact(self, service):
|
||||||
|
return service.get_default_letter_contact()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = models.Service
|
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 = (
|
exclude = (
|
||||||
'updated_at',
|
'updated_at',
|
||||||
'created_at',
|
'created_at',
|
||||||
|
|||||||
@@ -147,7 +147,6 @@ def update_service(service_id):
|
|||||||
fetched_service = dao_fetch_service_by_id(service_id)
|
fetched_service = dao_fetch_service_by_id(service_id)
|
||||||
# Capture the status change here as Marshmallow changes this later
|
# Capture the status change here as Marshmallow changes this later
|
||||||
service_going_live = fetched_service.restricted and not req_json.get('restricted', True)
|
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 = dict(service_schema.dump(fetched_service).data.items())
|
||||||
current_data.update(request.get_json())
|
current_data.update(request.get_json())
|
||||||
update_dict = service_schema.load(current_data).data
|
update_dict = service_schema.load(current_data).data
|
||||||
|
|||||||
@@ -150,8 +150,7 @@ def sample_service(
|
|||||||
'message_limit': limit,
|
'message_limit': limit,
|
||||||
'restricted': restricted,
|
'restricted': restricted,
|
||||||
'email_from': email_from,
|
'email_from': email_from,
|
||||||
'created_by': user,
|
'created_by': user
|
||||||
'letter_contact_block': letter_contact_block,
|
|
||||||
}
|
}
|
||||||
service = Service.query.filter_by(name=service_name).first()
|
service = Service.query.filter_by(name=service_name).first()
|
||||||
if not service:
|
if not service:
|
||||||
|
|||||||
Reference in New Issue
Block a user