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

allow broadcasts to have a template and no content

Browse Source 
ensures code remains backwards compatible during the deploy. this commit
should be reverted once all broadcast_message.content fields have been
back-filled.
This commit is contained in:
Leo Hemsted
2021-01-11 15:56:40 +00:00
parent 91abe6d55f
commit 400dfe0217
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/broadcast_message/rest.py
View File

@@ -189,11 +189,19 @@ def _create_broadcast_event(broadcast_message):
else:
transmitted_finishes_at = broadcast_message.finishes_at
# TODO: Remove this if statement after broadcast message content is guaranteed to always be populated.
if broadcast_message.content:
content = broadcast_message.content
else:
content = broadcast_message.template._as_utils_template_with_personalisation(
broadcast_message.personalisation
).content_with_placeholders_filled_in
event = BroadcastEvent(
service=broadcast_message.service,
broadcast_message=broadcast_message,
message_type=msg_types[broadcast_message.status],
transmitted_content={"body": broadcast_message.content},
transmitted_content={"body": content},
transmitted_areas=broadcast_message.areas,
# TODO: Probably move this somewhere more standalone too and imply that it shouldn't change. Should it include
# a service based identifier too? eg "flood-warnings@notifications.service.gov.uk" or similar