From e9a1cc5f832d2d2876d1c9ef3bf2426ba51f4752 Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Thu, 30 Nov 2017 11:27:08 +0000
Subject: [PATCH] Stop deleting the mapping tables.

---
 app/dao/notifications_dao.py | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py
index 3a43ad602..2eb713699 100644
--- a/app/dao/notifications_dao.py
+++ b/app/dao/notifications_dao.py
@@ -24,13 +24,10 @@ from app import db, create_uuid
 from app.dao import days_ago
 from app.models import (
     Notification,
-    NotificationEmailReplyTo,
     NotificationHistory,
     ScheduledNotification,
     Template,
     TemplateHistory,
-    EMAIL_TYPE,
-    SMS_TYPE,
     KEY_TYPE_NORMAL,
     KEY_TYPE_TEST,
     LETTER_TYPE,
@@ -41,8 +38,7 @@ from app.models import (
     NOTIFICATION_TECHNICAL_FAILURE,
     NOTIFICATION_TEMPORARY_FAILURE,
     NOTIFICATION_PERMANENT_FAILURE,
-    NOTIFICATION_SENT,
-    NotificationSmsSender
+    NOTIFICATION_SENT
 )
 
 from app.dao.dao_utils import transactional
@@ -313,23 +309,6 @@ def _filter_query(query, filter_dict=None):
 @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 in [EMAIL_TYPE, SMS_TYPE]:
-        subq = db.session.query(Notification.id).filter(
-            func.date(Notification.created_at) < seven_days_ago,
-            Notification.notification_type == notification_type
-        ).subquery()
-        if notification_type == EMAIL_TYPE:
-            notification_sender_mapping_table = NotificationEmailReplyTo
-        if notification_type == SMS_TYPE:
-            notification_sender_mapping_table = NotificationSmsSender
-        db.session.query(
-            notification_sender_mapping_table
-        ).filter(
-            notification_sender_mapping_table.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,