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 #2036 from alphagov/fix-deleted-count

Browse Source 
Fix deleted count for logs and delete with letters that have not been sent
This commit is contained in:
Rebecca Law
2018-08-10 16:53:09 +01:00
committed by GitHub
parent ccaa1dfeb2 ebb43082d5
commit dd4b711ba4
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/dao/notifications_dao.py
View File

@@ -334,7 +334,7 @@ def delete_notifications_created_more_than_a_week_ago_by_type(notification_type)
services_with_data_retention)) services_with_data_retention))
if notification_type == LETTER_TYPE: if notification_type == LETTER_TYPE:
_delete_letters_from_s3(query=query) _delete_letters_from_s3(query=query)
deleted = query.delete(synchronize_session='fetch') deleted += query.delete(synchronize_session='fetch')
return deleted return deleted
@@ -342,19 +342,21 @@ def _delete_letters_from_s3(query):
letters_to_delete_from_s3 = query.all() letters_to_delete_from_s3 = query.all()
for letter in letters_to_delete_from_s3: for letter in letters_to_delete_from_s3:
bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME'] bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME']
sent_at = str(letter.sent_at.date()) # If the letter has not been sent there isn't a letter to delete from S3
prefix = LETTERS_PDF_FILE_LOCATION_STRUCTURE.format( if letter.sent_at:
folder=sent_at, sent_at = str(letter.sent_at.date())
reference=letter.reference, prefix = LETTERS_PDF_FILE_LOCATION_STRUCTURE.format(
duplex="D", folder=sent_at,
letter_class="2", reference=letter.reference,
colour="C", duplex="D",
crown="C" if letter.service.crown else "N", letter_class="2",
date='' colour="C",
).upper()[:-5] crown="C" if letter.service.crown else "N",
s3_objects = get_s3_object_by_prefix(bucket_name=bucket_name, prefix=prefix) date=''
for s3_object in s3_objects: ).upper()[:-5]
s3_object.delete() s3_objects = get_s3_object_by_prefix(bucket_name=bucket_name, prefix=prefix)
for s3_object in s3_objects:
s3_object.delete()
@statsd(namespace="dao") @statsd(namespace="dao")

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

@@ -176,6 +176,16 @@ def test_delete_notifications_delete_notification_type_for_default_time_if_no_da
assert len(Notification.query.filter_by(notification_type='email').all()) == 1 assert len(Notification.query.filter_by(notification_type='email').all()) == 1
def test_delete_notifications_does_try_to_delete_from_s3_when_letter_has_not_been_sent(sample_service, mocker):
mock_get_s3 = mocker.patch("app.dao.notifications_dao.get_s3_object_by_prefix")
letter_template = create_template(service=sample_service, template_type='letter')
create_notification(template=letter_template, status='sending',
reference='LETTER_REF')
delete_notifications_created_more_than_a_week_ago_by_type('email')
mock_get_s3.assert_not_called()
def _create_templates(sample_service): def _create_templates(sample_service):
email_template = create_template(service=sample_service, template_type='email') email_template = create_template(service=sample_service, template_type='email')
sms_template = create_template(service=sample_service) sms_template = create_template(service=sample_service)