Merge pull request #1303 from alphagov/ken-purge-noti-to-email_reply_to

Purge notifications to email reply to rows older than 7 days

app/dao/notifications_dao.py

@@ -26,12 +26,13 @@ from app.dao.date_util import get_financial_year
 from app.models import (
     Service,
     Notification,
+    NotificationEmailReplyTo,
     NotificationHistory,
     NotificationStatistics,
-    NotificationEmailReplyTo,
-    ServiceEmailReplyTo,
     ScheduledNotification,
+    ServiceEmailReplyTo,
     Template,
+    EMAIL_TYPE,
     KEY_TYPE_NORMAL,
     KEY_TYPE_TEST,
     LETTER_TYPE,
@@ -366,13 +367,26 @@ def _filter_query(query, filter_dict=None):
 
 
 @statsd(namespace="dao")
+@transactional
 def delete_notifications_created_more_than_a_week_ago_by_type(notification_type):
     seven_days_ago = date.today() - timedelta(days=7)
+
+    # Following could be refactored when NotificationSmsReplyTo and NotificationLetterContact in models.py
+    if notification_type == EMAIL_TYPE:
+        subq = db.session.query(Notification.id).filter(
+            func.date(Notification.created_at) < seven_days_ago,
+            Notification.notification_type == notification_type
+        ).subquery()
+        deleted = db.session.query(
+            NotificationEmailReplyTo
+        ).filter(
+            NotificationEmailReplyTo.notification_id.in_(subq)
+        ).delete(synchronize_session='fetch')
+
     deleted = db.session.query(Notification).filter(
         func.date(Notification.created_at) < seven_days_ago,
         Notification.notification_type == notification_type,
     ).delete(synchronize_session='fetch')
-    db.session.commit()
     return deleted
 
 

tests/app/celery/test_scheduled_tasks.py

@@ -127,9 +127,10 @@ def test_should_call_delete_sms_notifications_more_than_week_in_task(notify_api,
 
 
 def test_should_call_delete_email_notifications_more_than_week_in_task(notify_api, mocker):
-    mocked = mocker.patch('app.celery.scheduled_tasks.delete_notifications_created_more_than_a_week_ago_by_type')
+    mocked_notifications = mocker.patch(
+        'app.celery.scheduled_tasks.delete_notifications_created_more_than_a_week_ago_by_type')
     delete_email_notifications_older_than_seven_days()
-    mocked.assert_called_once_with('email')
+    mocked_notifications.assert_called_once_with('email')
 
 
 def test_should_call_delete_letter_notifications_more_than_week_in_task(notify_api, mocker):

tests/app/dao/notification_dao/test_notification_dao.py

@@ -8,19 +8,21 @@ from sqlalchemy.exc import SQLAlchemyError, IntegrityError
 
 from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_service_id
 from app.models import (
-    Notification,
-    NotificationHistory,
     Job,
+    Notification,
     NotificationEmailReplyTo,
+    NotificationHistory,
     NotificationStatistics,
     ScheduledNotification,
+    ServiceEmailReplyTo,
+    EMAIL_TYPE,
     NOTIFICATION_STATUS_TYPES,
     NOTIFICATION_STATUS_TYPES_FAILED,
     NOTIFICATION_SENT,
     NOTIFICATION_DELIVERED,
     KEY_TYPE_NORMAL,
     KEY_TYPE_TEAM,
-    KEY_TYPE_TEST,
+    KEY_TYPE_TEST
 )
 
 from app.dao.notifications_dao import (
@@ -28,9 +30,9 @@ from app.dao.notifications_dao import (
     dao_create_notification_email_reply_to_mapping,
     dao_created_scheduled_notification,
     dao_delete_notifications_and_history_by_id,
-    dao_get_notifications_by_to_field,
     dao_get_last_template_usage,
     dao_get_notification_email_reply_for_notification,
+    dao_get_notifications_by_to_field,
     dao_get_notification_statistics_for_service_and_day,
     dao_get_potential_notification_statistics_for_day,
     dao_get_scheduled_notifications,
@@ -1005,6 +1007,41 @@ def test_should_delete_notifications_by_type_after_seven_days(
         assert notification.created_at.date() >= date(2016, 1, 3)
 
 
+@freeze_time("2016-01-10 12:00:00.000000")
+def test_should_delete_notification_to_email_reply_to_after_seven_days(
+    notify_db, notify_db_session, sample_service,
+):
+    assert len(Notification.query.all()) == 0
+
+    reply_to = create_reply_to_email(sample_service, 'test@example.com')
+
+    email_template = sample_email_template(notify_db, notify_db_session, service=sample_service)
+
+    # create one notification a day between 1st and 10th from 11:00 to 19:00 of each type
+    for i in range(1, 11):
+        past_date = '2016-01-{0:02d}  {0:02d}:00:00.000000'.format(i)
+        with freeze_time(past_date):
+            notification = create_notification(email_template)
+            dao_create_notification_email_reply_to_mapping(notification.id, reply_to.id)
+
+    all_notifications = Notification.query.all()
+    assert len(all_notifications) == 10
+
+    all_notification_email_reply_to = NotificationEmailReplyTo.query.all()
+    assert len(all_notification_email_reply_to) == 10
+
+    # Records before 3rd should be deleted
+    delete_notifications_created_more_than_a_week_ago_by_type(EMAIL_TYPE)
+    remaining_email_notifications = Notification.query.filter_by(notification_type=EMAIL_TYPE).all()
+    remaining_notification_to_email_reply_to = NotificationEmailReplyTo.query.filter_by().all()
+
+    assert len(remaining_email_notifications) == 8
+    assert len(remaining_notification_to_email_reply_to) == 8
+
+    for notification in remaining_email_notifications:
+        assert notification.created_at.date() >= date(2016, 1, 3)
+
+
 @pytest.mark.parametrize('notification_type', ['sms', 'email', 'letter'])
 @freeze_time("2016-01-10 12:00:00.000000")
 def test_should_not_delete_notification_history(notify_db, notify_db_session, sample_service, notification_type):
@@ -1992,7 +2029,7 @@ def test_dao_create_multiple_notification_email_reply_to_mapping(sample_service,
     assert email_reply_to[0].service_email_reply_to_id == reply_to_address.id
 
 
-def test_dao_get_notification_ememail_reply_toail_reply_for_notification(sample_service, sample_notification):
+def test_dao_get_notification_email_reply_for_notification(sample_service, sample_notification):
     reply_to_address = create_reply_to_email(sample_service, "test@test.com")
     dao_create_notification_email_reply_to_mapping(sample_notification.id, reply_to_address.id)
     assert dao_get_notification_email_reply_for_notification(sample_notification.id) == "test@test.com"