darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-06-01 11:58:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into notification-created-status

Browse Source
This commit is contained in:
Rebecca Law
2016-06-27 14:59:56 +01:00
parent 8a0211b3eb abbd106212
commit 48e64abd81
4 changed files with 84 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notifications/rest.py
View File

@@ -365,7 +365,7 @@ def get_notification_return_data(notification_id, notification, template):
}
if template.template_type == 'email':
output.update({'subject': template.subject})
output.update({'subject': template.replaced_subject})
return output

17
app/schemas.py
View File

@@ -248,7 +248,7 @@ class SmsAdminNotificationSchema(SmsNotificationSchema):
class NotificationStatusSchema(BaseSchema):
template = fields.Nested(TemplateSchema, only=["id", "name", "template_type", "content"], dump_only=True)
template = fields.Nested(TemplateSchema, only=["id", "name", "template_type", "content", "subject"], dump_only=True)
job = fields.Nested(JobSchema, only=["id", "original_file_name"], dump_only=True)
personalisation = fields.Dict(required=False)
@@ -259,18 +259,19 @@ class NotificationStatusSchema(BaseSchema):
@pre_dump
def handle_personalisation_property(self, in_data):
if in_data.personalisation:
self.personalisation = in_data.personalisation
self.personalisation = in_data.personalisation
return in_data
@post_dump
def handle_template_merge(self, in_data):
if in_data.get('personalisation'):
from notifications_utils.template import Template
merged = Template(in_data['template'], in_data['personalisation']).replaced
in_data['body'] = merged
in_data.pop('personalisation', None)
from notifications_utils.template import Template
template = Template(in_data['template'], in_data['personalisation'])
in_data['body'] = template.replaced
if in_data['template']['template_type'] == 'email':
in_data['subject'] = template.replaced_subject
in_data.pop('personalisation', None)
in_data['template'].pop('content', None)
in_data['template'].pop('subject', None)
return in_data