darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 14:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2774 from alphagov/fix-report-and-delete-tasks

Browse Source 
Fix report and delete tasks
This commit is contained in:
Rebecca Law
2020-03-27 16:30:16 +00:00
committed by GitHub
parent 4aed012d92 5d0830d7f7
commit c81388d004
7 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/notifications_dao.py
View File

@@ -352,7 +352,6 @@ def insert_notification_history_delete_notifications(
AND notification_type = :notification_type
AND created_at < :timestamp_to_delete_backwards_from
AND key_type = 'normal'
AND notification_status in ('delivered', 'permanent-failure', 'temporary-failure')
limit :qry_limit
"""
# Insert into NotificationHistory if the row already exists do nothing.
@@ -632,7 +631,7 @@ def dao_get_notification_by_reference(reference):
@statsd(namespace="dao")
def dao_get_notification_history_by_reference(reference):
def dao_get_notification_or_history_by_reference(reference):
try:
# This try except is necessary because in test keys and research mode does not create notification history.
# Otherwise we could just search for the NotificationHistory object