From 7d026ad385b1dd73f4ce53c1de9639a761442fef Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 20 Dec 2018 12:31:00 +0000 Subject: [PATCH] wip --- app/dao/notifications_dao.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 7544dfdea..f47a85139 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -315,8 +315,9 @@ def _filter_query(query, filter_dict=None): @statsd(namespace="dao") -@transactional def delete_notifications_created_more_than_a_week_ago_by_type(notification_type): + current_app.logger.info('Deleting {} notifications for services with flexible data retention'.format(notification_type)) + flexible_data_retention = ServiceDataRetention.query.filter( ServiceDataRetention.notification_type == notification_type ).all() @@ -329,6 +330,9 @@ def delete_notifications_created_more_than_a_week_ago_by_type(notification_type) if notification_type == LETTER_TYPE: _delete_letters_from_s3(query) deleted += query.delete(synchronize_session='fetch') + db.session.commit() + + current_app.logger.info('Deleting {} notifications for services without flexible data retention'.format(notification_type)) seven_days_ago = convert_utc_to_bst(datetime.utcnow()).date() - timedelta(days=7) services_with_data_retention = [x.service_id for x in flexible_data_retention] @@ -339,6 +343,10 @@ def delete_notifications_created_more_than_a_week_ago_by_type(notification_type) if notification_type == LETTER_TYPE: _delete_letters_from_s3(query=query) deleted += query.delete(synchronize_session='fetch') + db.session.commit() + + current_app.logger.info('Finished deleting {} notifications'.format(notification_type)) + return deleted