Merge pull request #3461 from alphagov/be-more-robust-around-references-to-cancel

Be more robust in handling ambiguous references to cancel an alert
This commit is contained in:
Chris Hill-Scott
2022-02-21 10:39:48 +00:00
committed by GitHub
4 changed files with 107 additions and 4 deletions

View File

@@ -26,6 +26,10 @@ def dao_get_broadcast_message_by_id_and_service_id(broadcast_message_id, service
def dao_get_broadcast_message_by_references_and_service_id(references_to_original_broadcast, service_id):
return BroadcastMessage.query.filter(
BroadcastMessage.status.in_((
BroadcastStatusType.PENDING_APPROVAL,
BroadcastStatusType.BROADCASTING,
)),
BroadcastMessage.reference.in_(references_to_original_broadcast),
BroadcastMessage.service_id == service_id
).one()