darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-08 19:13:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix fragile filter approach

Browse Source
This commit is contained in:
Kenneth Kehl
2024-12-19 11:18:31 -08:00
parent 3388371428
commit 83193c221a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/dao/notifications_dao.py
View File

@@ -244,18 +244,24 @@ def dao_get_failed_notification_count():
def get_notification_with_personalisation(service_id, notification_id, key_type): def get_notification_with_personalisation(service_id, notification_id, key_type):
filter_dict = {
"Notification.service_id": service_id,
"Notification.id": notification_id,
}
if key_type:
filter_dict["Notification.key_type"] = key_type
stmt = ( stmt = (
select(Notification) select(Notification)
.where(**filter_dict) .where(
Notification.service_id == service_id, Notification.id == notification_id
)
.options(joinedload(Notification.template)) .options(joinedload(Notification.template))
) )
if key_type:
stmt = (
select(Notification)
.where(
Notification.service_id == service_id,
Notification.id == notification_id,
Notification.key_type == key_type,
)
.options(joinedload(Notification.template))
)
return db.session.execute(stmt).scalars().one() return db.session.execute(stmt).scalars().one()