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

dao_get_all_broadcast_messages returns just fields govuk alerts need

Browse Source
This commit is contained in:
Pea Tyczynska
2021-08-06 17:37:57 +01:00
parent 74c9ca2bf6
commit 0f7f219a55
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/dao/broadcast_message_dao.py
View File

@@ -11,7 +11,8 @@ from app.models import (
BroadcastProviderMessage,
BroadcastProviderMessageNumber,
BroadcastProviderMessageStatus,
BroadcastStatusType
BroadcastStatusType,
ServiceBroadcastSettings
)
@@ -33,7 +34,20 @@ def dao_get_broadcast_messages_for_service(service_id):
def dao_get_all_broadcast_messages():
return BroadcastMessage.query.filter(
return db.session.query(
BroadcastMessage.id,
BroadcastMessage.reference,
ServiceBroadcastSettings.channel,
BroadcastMessage.content,
BroadcastMessage.areas,
BroadcastMessage.status,
BroadcastMessage.starts_at,
BroadcastMessage.finishes_at,
BroadcastMessage.approved_at,
BroadcastMessage.cancelled_at,
).join(
ServiceBroadcastSettings, ServiceBroadcastSettings.service_id == BroadcastMessage.service_id
).filter(
BroadcastMessage.starts_at >= datetime(2021, 5, 25, 0, 0, 0),
BroadcastMessage.stubbed == False, # noqa
BroadcastMessage.status.in_(BroadcastStatusType.LIVE_STATUSES)