Update letter utils for methods to handle virus process

- add function to get reference from filename
- add function to move pdf from scan folder to process folder
- add function to delete pdfs from scan bucket for failed virus scans

app/letters/utils.py

@@ -15,8 +15,8 @@ LETTERS_PDF_FILE_LOCATION_STRUCTURE = \
 PRECOMPILED_BUCKET_PREFIX = '{folder}NOTIFY.{reference}'
 
 
-def get_folder_name(_now, is_test_letter):
-    if is_test_letter:
+def get_folder_name(_now, is_test_or_scan_letter=False):
+    if is_test_or_scan_letter:
         folder_name = ''
     else:
         print_datetime = _now
@@ -26,11 +26,11 @@ def get_folder_name(_now, is_test_letter):
     return folder_name
 
 
-def get_letter_pdf_filename(reference, crown, is_test_letter=False):
+def get_letter_pdf_filename(reference, crown, is_test_or_scan_letter=False):
     now = datetime.utcnow()
 
     upload_file_name = LETTERS_PDF_FILE_LOCATION_STRUCTURE.format(
-        folder=get_folder_name(now, is_test_letter),
+        folder=get_folder_name(now, is_test_or_scan_letter),
         reference=reference,
         duplex="D",
         letter_class="2",
@@ -52,22 +52,28 @@ def get_bucket_prefix_for_notification(notification, is_test_letter=False):
     return upload_file_name
 
 
+def get_reference_from_filename(filename):
+    # filename looks like '2018-01-13/NOTIFY.ABCDEF1234567890.D.2.C.C.20180113120000.PDF'
+    filename_parts = filename.split('.')
+    return filename_parts[1]
+
+
 def upload_letter_pdf(notification, pdf_data, is_test_letter=False):
     current_app.logger.info("PDF Letter {} reference {} created at {}, {} bytes".format(
         notification.id, notification.reference, notification.created_at, len(pdf_data)))
 
     upload_file_name = get_letter_pdf_filename(
-        notification.reference, notification.service.crown, is_test_letter)
+        notification.reference,
+        notification.service.crown,
+        is_test_or_scan_letter=is_test_letter or notification.template.is_precompiled_letter)
 
     if is_test_letter:
         bucket_name = current_app.config['TEST_LETTERS_BUCKET_NAME']
     else:
-        bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME']
-
-    if notification.template.is_precompiled_letter:
-        bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME']
-    else:
-        bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME']
+        if notification.template.is_precompiled_letter:
+            bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME']
+        else:
+            bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME']
 
     s3upload(
         filedata=pdf_data,
@@ -79,6 +85,33 @@ def upload_letter_pdf(notification, pdf_data, is_test_letter=False):
 
     current_app.logger.info("Uploaded letters PDF {} to {} for notification id {}".format(
         upload_file_name, bucket_name, notification.id))
+    return upload_file_name
+
+
+def move_scanned_pdf_to_letters_pdf_bucket(filename):
+    source_bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME']
+    target_bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME']
+
+    s3 = boto3.resource('s3')
+    copy_source = {'Bucket': source_bucket_name, 'Key': filename}
+    target_filename = get_folder_name(datetime.utcnow()) + filename
+    target_bucket = s3.Bucket(target_bucket_name)
+    obj = target_bucket.Object(target_filename)
+    obj.copy(copy_source, ExtraArgs={'ServerSideEncryption': 'AES256'})
+
+    s3.Object(source_bucket_name, filename).delete()
+
+    current_app.logger.info("Moved letter PDF: {}/{} to {}/{}".format(
+        source_bucket_name, filename, target_bucket_name, target_filename))
+
+
+def delete_pdf_from_letters_scan_bucket(filename):
+    bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME']
+
+    s3 = boto3.resource('s3')
+    s3.Object(bucket_name, filename).delete()
+
+    current_app.logger.info("Deleted letter PDF: {}/{}".format(bucket_name, filename))
 
 
 def get_letter_pdf(notification):

requirements_for_test.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
 flake8==3.5.0
-moto==1.1.25
+moto==1.2
 pytest==3.4.2
 pytest-env==0.6.2
 pytest-mock==1.7.1

tests/app/letters/test_letter_utils.py

@@ -1,4 +1,3 @@
-from flask import current_app
 import pytest
 from datetime import datetime
 
@@ -7,8 +6,15 @@ from flask import current_app
 from freezegun import freeze_time
 from moto import mock_s3
 
-from app.letters.utils import get_bucket_prefix_for_notification, get_letter_pdf_filename, get_letter_pdf
+from app.letters.utils import (
+    get_bucket_prefix_for_notification,
+    get_letter_pdf_filename,
+    get_letter_pdf,
+    upload_letter_pdf,
+    move_scanned_pdf_to_letters_pdf_bucket
+)
 from app.models import KEY_TYPE_NORMAL, KEY_TYPE_TEST, PRECOMPILED_TEMPLATE_NAME
+from app.variables import Retention
 
 FROZEN_DATE_TIME = "2018-03-14 17:00:00"
 
@@ -22,13 +28,6 @@ def sample_precompiled_letter_notification_using_test_key(sample_letter_notifica
     sample_letter_notification.reference = 'foo'
     sample_letter_notification.created_at = datetime.utcnow()
     return sample_letter_notification
-from app.letters.utils import (
-    get_bucket_prefix_for_notification,
-    get_letter_pdf_filename,
-    upload_letter_pdf
-)
-from app.models import PRECOMPILED_TEMPLATE_NAME
-from app.variables import Retention
 
 
 def test_get_bucket_prefix_for_notification_valid_notification(sample_notification):
@@ -72,7 +71,7 @@ def test_get_letter_pdf_filename_returns_correct_filename(
 @freeze_time("2017-12-04 17:29:00")
 def test_get_letter_pdf_filename_returns_correct_filename_for_test_letters(
         notify_api, mocker):
-    filename = get_letter_pdf_filename(reference='foo', crown='C', is_test_letter=True)
+    filename = get_letter_pdf_filename(reference='foo', crown='C', is_test_or_scan_letter=True)
 
     assert filename == 'NOTIFY.FOO.D.2.C.C.20171204172900.PDF'
 
@@ -125,7 +124,8 @@ def test_upload_letter_pdf_to_correct_bucket(
 
     filename = get_letter_pdf_filename(
         reference=sample_letter_notification.reference,
-        crown=sample_letter_notification.service.crown
+        crown=sample_letter_notification.service.crown,
+        is_test_or_scan_letter=is_precompiled_letter
     )
 
     upload_letter_pdf(sample_letter_notification, b'\x00\x01')
@@ -137,3 +137,23 @@ def test_upload_letter_pdf_to_correct_bucket(
         region=current_app.config['AWS_REGION'],
         tags={Retention.KEY: Retention.ONE_WEEK}
     )
+
+
+@mock_s3
+@freeze_time(FROZEN_DATE_TIME)
+def test_move_scanned_letter_pdf_to_processing_bucket(notify_api):
+    filename = 'test.pdf'
+    source_bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME']
+    target_bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME']
+
+    conn = boto3.resource('s3', region_name='eu-west-1')
+    source_bucket = conn.create_bucket(Bucket=source_bucket_name)
+    target_bucket = conn.create_bucket(Bucket=target_bucket_name)
+
+    s3 = boto3.client('s3', region_name='eu-west-1')
+    s3.put_object(Bucket=source_bucket_name, Key=filename, Body=b'pdf_content')
+
+    move_scanned_pdf_to_letters_pdf_bucket(filename)
+
+    assert '2018-03-14/' + filename in [o.key for o in target_bucket.objects.all()]
+    assert filename not in [o.key for o in source_bucket.objects.all()]