darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 23:55:58 -05: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

20
tests/app/celery/test_process_ses_receipts_tasks.py
View File

@@ -1,17 +1,23 @@
import json
from datetime import datetime
from freezegun import freeze_time
from app import statsd_client, encryption
from app.celery.process_ses_receipts_tasks import process_ses_results
from app.celery.research_mode_tasks import ses_hard_bounce_callback, ses_soft_bounce_callback, ses_notification_callback
from app.celery.research_mode_tasks import (
ses_hard_bounce_callback,
ses_soft_bounce_callback,
ses_notification_callback
)
from app.celery.service_callback_tasks import create_delivery_status_callback_data
from app.dao.notifications_dao import get_notification_by_id
from app.models import Complaint, Notification
from app.notifications.notifications_ses_callback import remove_emails_from_complaint, remove_emails_from_bounce
from app.notifications.notifications_ses_callback import (
remove_emails_from_complaint,
remove_emails_from_bounce
)
from tests.app.db import (
create_notification,
@@ -29,7 +35,7 @@ def test_process_ses_results(sample_email_template):
def test_process_ses_results_retry_called(sample_email_template, notify_db, mocker):
create_notification(sample_email_template, reference='ref1', sent_at=datetime.utcnow(), status='sending')
mocker.patch("app.dao.notifications_dao._update_notification_status", side_effect=Exception("EXPECTED"))
mocker.patch("app.dao.notifications_dao.dao_update_notifications_by_reference", side_effect=Exception("EXPECTED"))
mocked = mocker.patch('app.celery.process_ses_receipts_tasks.process_ses_results.retry')
process_ses_results(response=ses_notification_callback(reference='ref1'))
assert mocked.call_count != 0
@@ -90,13 +96,15 @@ def test_ses_callback_should_update_notification_status(
def test_ses_callback_should_not_update_notification_status_if_already_delivered(sample_email_template, mocker):
mock_dup = mocker.patch('app.celery.process_ses_receipts_tasks.notifications_dao._duplicate_update_warning')
mock_upd = mocker.patch('app.celery.process_ses_receipts_tasks.notifications_dao._update_notification_status')
mock_upd = mocker.patch(
'app.celery.process_ses_receipts_tasks.notifications_dao.dao_update_notifications_by_reference'
)
notification = create_notification(template=sample_email_template, reference='ref', status='delivered')
assert process_ses_results(ses_notification_callback(reference='ref')) is None
assert get_notification_by_id(notification.id).status == 'delivered'
mock_dup.assert_called_once_with(notification, 'delivered')
mock_dup.assert_called_once_with(notification=notification, status='delivered')
assert mock_upd.call_count == 0

18
tests/app/dao/notification_dao/test_notification_dao.py
View File

@@ -31,7 +31,7 @@ from app.dao.notifications_dao import (
update_notification_status_by_reference,
dao_get_notification_by_reference,
dao_get_notifications_by_references,
dao_get_notification_history_by_reference,
dao_get_notification_or_history_by_reference,
notifications_not_yet_sent,
)
from app.models import (
@@ -1567,7 +1567,9 @@ def test_dao_update_notifications_by_reference_set_returned_letter_status(sample
assert updated_count == 1
assert updated_history_count == 0
assert Notification.query.get(notification.id).status == 'returned-letter'
updated_notification = Notification.query.get(notification.id)
assert updated_notification.status == 'returned-letter'
assert updated_notification.updated_at <= datetime.utcnow()
def test_dao_update_notifications_by_reference_updates_history_when_one_of_two_notifications_exists(
@@ -1618,28 +1620,28 @@ def test_dao_get_notifications_by_references(sample_template):
assert notifications[1].id in [notification_1.id, notification_2.id]
def test_dao_get_notification_history_by_reference_with_one_match_returns_notification(
def test_dao_get_notification_or_history_by_reference_with_one_match_returns_notification(
sample_letter_template
):
create_notification(template=sample_letter_template, reference='REF1')
notification = dao_get_notification_history_by_reference('REF1')
notification = dao_get_notification_or_history_by_reference('REF1')
assert notification.reference == 'REF1'
def test_dao_get_notification_history_by_reference_with_multiple_matches_raises_error(
def test_dao_get_notification_or_history_by_reference_with_multiple_matches_raises_error(
sample_letter_template
):
create_notification(template=sample_letter_template, reference='REF1')
create_notification(template=sample_letter_template, reference='REF1')
with pytest.raises(SQLAlchemyError):
dao_get_notification_history_by_reference('REF1')
dao_get_notification_or_history_by_reference('REF1')
def test_dao_get_notification_history_by_reference_with_no_matches_raises_error(notify_db):
def test_dao_get_notification_or_history_by_reference_with_no_matches_raises_error(notify_db):
with pytest.raises(SQLAlchemyError):
dao_get_notification_history_by_reference('REF1')
dao_get_notification_or_history_by_reference('REF1')
@pytest.mark.parametrize("notification_type",

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

@@ -252,42 +252,44 @@ def test_delete_notifications_returns_sum_correctly(sample_template):
@freeze_time('2020-03-20 14:00')
def test_insert_notification_history_delete_notifications(sample_email_template):
# should be deleted
create_notification(template=sample_email_template,
created_at=datetime.utcnow() + timedelta(minutes=4), status='delivered')
create_notification(template=sample_email_template,
created_at=datetime.utcnow() + timedelta(minutes=20), status='permanent-failure')
create_notification(template=sample_email_template,
created_at=datetime.utcnow() + timedelta(minutes=30), status='temporary-failure')
create_notification(template=sample_email_template,
created_at=datetime.utcnow() + timedelta(minutes=59), status='temporary-failure')
# should NOT be deleted
create_notification(template=sample_email_template,
created_at=datetime.utcnow() + timedelta(hours=1), status='delivered')
create_notification(template=sample_email_template,
created_at=datetime.utcnow() + timedelta(minutes=61), status='temporary-failure')
create_notification(template=sample_email_template,
created_at=datetime.utcnow() + timedelta(hours=1, seconds=1), status='temporary-failure')
create_notification(template=sample_email_template,
created_at=datetime.utcnow() + timedelta(minutes=20), status='created')
n1 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=4), status='delivered')
n2 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=20), status='permanent-failure')
n3 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=30), status='temporary-failure')
n4 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=59), status='temporary-failure')
n5 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, hours=1), status='sending')
n6 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=61), status='pending')
n7 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, hours=1, seconds=1),
status='validation-failed')
n8 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1, minutes=20), status='created')
# should NOT be deleted - wrong status
create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1), status='sending')
create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(days=1), status='technical-failure')
create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(hours=1), status='created')
n9 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(hours=1), status='delivered')
n10 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(hours=1), status='technical-failure')
n11 = create_notification(template=sample_email_template,
created_at=datetime.utcnow() - timedelta(hours=23, minutes=59), status='created')
ids_to_move = sorted([n1.id, n2.id, n3.id, n4.id, n5.id, n6.id, n7.id, n8.id])
ids_to_keep = sorted([n9.id, n10.id, n11.id])
del_count = insert_notification_history_delete_notifications(
notification_type=sample_email_template.template_type,
service_id=sample_email_template.service_id,
timestamp_to_delete_backwards_from=datetime.utcnow() + timedelta(hours=1))
assert del_count == 4
timestamp_to_delete_backwards_from=datetime.utcnow() - timedelta(days=1))
assert del_count == 8
notifications = Notification.query.all()
history_rows = NotificationHistory.query.all()
assert len(history_rows) == 4
assert len(notifications) == 7
assert len(history_rows) == 8
assert ids_to_move == sorted([x.id for x in history_rows])
assert len(notifications) == 3
assert ids_to_keep == sorted([x.id for x in notifications])
def test_insert_notification_history_delete_notifications_more_notifications_than_query_limit(sample_template):