darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-24 01:11:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

respect service broadcast provider restrictions when sending

Browse Source
This commit is contained in:
Leo Hemsted
2020-12-02 14:10:46 +00:00
parent 0ef063ab14
commit 72f8a15d4f
3 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/celery/broadcast_message_tasks.py
View File

@@ -16,13 +16,15 @@ def send_broadcast_event(broadcast_event_id):
current_app.logger.info(f'CBC Proxy disabled, not sending broadcast_event {broadcast_event_id}')
return
broadcast_event = dao_get_broadcast_event_by_id(broadcast_event_id)
for provider in current_app.config['ENABLED_CBCS']:
# TODO: Decide whether to send to each provider based on platform admin, service level settings, broadcast
# level settings, etc.
send_broadcast_provider_message.apply_async(
kwargs={'broadcast_event_id': broadcast_event_id, 'provider': provider},
queue=QueueNames.NOTIFY
)
if broadcast_event.service.allowed_broadcast_provider in {None, provider}:
# There may be future checks here to decide whether to send to each provider based on platform admin level
# settings
send_broadcast_provider_message.apply_async(
kwargs={'broadcast_event_id': broadcast_event_id, 'provider': provider},
queue=QueueNames.NOTIFY
)
@notify_celery.task(name="send-broadcast-provider-message")

6
app/dao/broadcast_message_dao.py
View File

@@ -10,12 +10,8 @@ def dao_get_broadcast_message_by_id_and_service_id(broadcast_message_id, service
).one()
def dao_get_broadcast_message_by_id(broadcast_message_id):
return BroadcastMessage.query.get(broadcast_message_id)
def dao_get_broadcast_event_by_id(broadcast_event_id):
return BroadcastEvent.query.get(broadcast_event_id)
return BroadcastEvent.query.filter(BroadcastEvent.id == broadcast_event_id).one()
def dao_get_broadcast_messages_for_service(service_id):