darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-05 02:41:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add a where clause to join to NotificationHistory, this is some extra assurance that the Notification will not be deleted unless the history exists.

Browse Source
This commit is contained in:
Rebecca Law
2019-06-03 11:47:02 +01:00
parent c23ae15f32
commit b8399b8b9b
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/notifications_dao.py
View File

@@ -344,7 +344,8 @@ def _delete_notifications(
).filter( ).filter(
Notification.notification_type == notification_type, Notification.notification_type == notification_type,
Notification.service_id == service_id, Notification.service_id == service_id,
Notification.created_at < date_to_delete_from Notification.created_at < date_to_delete_from,
NotificationHistory.id == Notification.id
).limit(query_limit).subquery() ).limit(query_limit).subquery()
number_deleted = db.session.query(Notification).filter( number_deleted = db.session.query(Notification).filter(

17
tests/app/dao/notification_dao/test_notification_dao_delete_notifications.py
View File

@@ -212,6 +212,23 @@ def test_delete_notifications_does_try_to_delete_from_s3_when_letter_has_not_bee
mock_get_s3.assert_not_called() mock_get_s3.assert_not_called()
@pytest.mark.parametrize('notification_type', ['sms', 'email', 'letter'])
@freeze_time("2016-01-10 12:00:00.000000")
def test_should_not_delete_notification_if_history_does_not_exist(sample_service, notification_type, mocker):
mocker.patch("app.dao.notifications_dao.get_s3_bucket_objects")
mocker.patch("app.dao.notifications_dao.insert_update_notification_history")
with freeze_time('2016-01-01 12:00'):
email_template, letter_template, sms_template = _create_templates(sample_service)
create_notification(template=email_template, status='permanent-failure')
create_notification(template=sms_template, status='delivered')
create_notification(template=letter_template, status='temporary-failure')
assert Notification.query.count() == 3
assert NotificationHistory.query.count() == 0
delete_notifications_older_than_retention_by_type(notification_type)
assert Notification.query.count() == 3
assert NotificationHistory.query.count() == 0
def test_delete_notifications_calls_subquery( def test_delete_notifications_calls_subquery(
notify_db_session, mocker notify_db_session, mocker
): ):