darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-10 18:23:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3121 from alphagov/dont-update-finishes-at

Browse Source 
dont update finishes_at when cancelling broadcast
This commit is contained in:
Leo Hemsted
2021-02-04 14:37:49 +00:00
committed by GitHub
parent 1bd99c779d eff0119f5c
commit 6a9ac654a6
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/broadcast_message/rest.py
+1 -8
View File
@@ -192,12 +192,6 @@ def _create_broadcast_event(broadcast_message):
BroadcastStatusType.CANCELLED: BroadcastEventMessageType.CANCEL, BroadcastStatusType.CANCELLED: BroadcastEventMessageType.CANCEL,
} }
if broadcast_message.status == BroadcastStatusType.CANCELLED:
transmitted_finishes_at = broadcast_message.cancelled_at
else:
transmitted_finishes_at = broadcast_message.finishes_at
event = BroadcastEvent( event = BroadcastEvent(
service=broadcast_message.service, service=broadcast_message.service,
broadcast_message=broadcast_message, broadcast_message=broadcast_message,
@@ -210,8 +204,7 @@ def _create_broadcast_event(broadcast_message):
# TODO: Should this be set to now? Or the original starts_at? # TODO: Should this be set to now? Or the original starts_at?
transmitted_starts_at=broadcast_message.starts_at, transmitted_starts_at=broadcast_message.starts_at,
# TODO: When cancelling, do we need to set this to now? Or should we keep it as the original time. transmitted_finishes_at=broadcast_message.finishes_at,
transmitted_finishes_at=transmitted_finishes_at,
) )
dao_save_object(event) dao_save_object(event)
tests/app/broadcast_message/test_rest.py
+1 -1
View File
@@ -508,7 +508,7 @@ def test_update_broadcast_message_status_stores_cancelled_by_and_cancelled_at(
assert cancel_event.service_id == sample_broadcast_service.id assert cancel_event.service_id == sample_broadcast_service.id
assert cancel_event.transmitted_areas == bm.areas assert cancel_event.transmitted_areas == bm.areas
assert cancel_event.message_type == BroadcastEventMessageType.CANCEL assert cancel_event.message_type == BroadcastEventMessageType.CANCEL
assert cancel_event.transmitted_finishes_at == bm.cancelled_at assert cancel_event.transmitted_finishes_at == bm.finishes_at
assert cancel_event.transmitted_content == {"body": "emergency broadcast"} assert cancel_event.transmitted_content == {"body": "emergency broadcast"}