darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 01:28:25 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
cb7d0e38137c04b0a9080d53ce424fd7d99adafb
notifications-admin/tests/app/s3_client/test_s3_letter_upload_client.py

66 lines
2.3 KiB
Python
Raw Normal View History

Show recipient when about to send uploaded letter The recipient of the letter now displays at the bottom of the page when previewing a valid letter. The template preview `/precompiled/sanitise` endpoint returns the address, but we format it to display on a single line with commas between each line. We also need to convert the recipient address to ASCII so that it can be stored as S3 metadata.
2019-11-08 09:56:59 +00:00
import pytest
Sanitise uploaded letters and store in S3 This sanitises uploaded letters and stores the sanitised result in S3 with if it passes validation or the original PDF in S3 if validation fails. A metadata value of 'status' is set to either 'valid' or 'invalid'.
2019-09-06 17:10:48 +01:00
from flask import current_app
Show recipient when about to send uploaded letter The recipient of the letter now displays at the bottom of the page when previewing a valid letter. The template preview `/precompiled/sanitise` endpoint returns the address, but we format it to display on a single line with commas between each line. We also need to convert the recipient address to ASCII so that it can be stored as S3 metadata.
2019-11-08 09:56:59 +00:00
from app.s3_client.s3_letter_upload_client import (
format_recipient,
upload_letter_to_s3,
)
Sanitise uploaded letters and store in S3 This sanitises uploaded letters and stores the sanitised result in S3 with if it passes validation or the original PDF in S3 if validation fails. A metadata value of 'status' is set to either 'valid' or 'invalid'.
2019-09-06 17:10:48 +01:00
def test_upload_letter_to_s3(mocker):
s3_mock = mocker.patch('app.s3_client.s3_letter_upload_client.utils_s3upload')
Store all data about uploaded letters in the S3 metadata We had been storing whether or not a file was valid in the S3 metadata, but using the query string of the URL to store the original filename and the page count. This meant that if you tried to view the preview letter page without the query string you would see a `500`. It was possible for this to happen if you were signed out of Notify while on the preview page - you would be redirected back to the preview page but without the query string, causing an error.
2019-10-07 15:22:11 +01:00
upload_letter_to_s3(
'pdf_data',
file_location='service_id/upload_id.pdf',
status='valid',
page_count=3,
filename='my_doc')
Sanitise uploaded letters and store in S3 This sanitises uploaded letters and stores the sanitised result in S3 with if it passes validation or the original PDF in S3 if validation fails. A metadata value of 'status' is set to either 'valid' or 'invalid'.
2019-09-06 17:10:48 +01:00
s3_mock.assert_called_once_with(
bucket_name=current_app.config['TRANSIENT_UPLOADED_LETTERS'],
file_location='service_id/upload_id.pdf',
filedata='pdf_data',
Store all data about uploaded letters in the S3 metadata We had been storing whether or not a file was valid in the S3 metadata, but using the query string of the URL to store the original filename and the page count. This meant that if you tried to view the preview letter page without the query string you would see a `500`. It was possible for this to happen if you were signed out of Notify while on the preview page - you would be redirected back to the preview page but without the query string, causing an error.
2019-10-07 15:22:11 +01:00
metadata={'status': 'valid', 'page_count': '3', 'filename': 'my_doc'},
Sanitise uploaded letters and store in S3 This sanitises uploaded letters and stores the sanitised result in S3 with if it passes validation or the original PDF in S3 if validation fails. A metadata value of 'status' is set to either 'valid' or 'invalid'.
2019-09-06 17:10:48 +01:00
region=current_app.config['AWS_REGION']
)
Allow extra metadata fields when uploading letter to S3
2019-10-15 15:55:17 +01:00
def test_upload_letter_to_s3_with_message_and_invalid_pages(mocker):
s3_mock = mocker.patch('app.s3_client.s3_letter_upload_client.utils_s3upload')
upload_letter_to_s3(
'pdf_data',
file_location='service_id/upload_id.pdf',
status='invalid',
page_count=3,
filename='my_doc',
message='This file failed',
invalid_pages=[1, 2, 5])
s3_mock.assert_called_once_with(
bucket_name=current_app.config['TRANSIENT_UPLOADED_LETTERS'],
file_location='service_id/upload_id.pdf',
filedata='pdf_data',
metadata={
'status': 'invalid',
'page_count': '3',
'filename': 'my_doc',
'message': 'This file failed',
'invalid_pages': '[1, 2, 5]'
},
region=current_app.config['AWS_REGION']
)
Show recipient when about to send uploaded letter The recipient of the letter now displays at the bottom of the page when previewing a valid letter. The template preview `/precompiled/sanitise` endpoint returns the address, but we format it to display on a single line with commas between each line. We also need to convert the recipient address to ASCII so that it can be stored as S3 metadata.
2019-11-08 09:56:59 +00:00
@pytest.mark.parametrize('original_address,expected_address', [
('The Queen, Buckingham Palace, SW1 1AA', 'The Queen, Buckingham Palace, SW1 1AA'),
('The Queen Buckingham Palace SW1 1AA', 'The Queen Buckingham Palace SW1 1AA'),
('The Queen,\nBuckingham Palace,\r\nSW1 1AA', 'The Queen, Buckingham Palace, SW1 1AA'),
('The Queen ,,\nBuckingham Palace,\rSW1 1AA,', 'The Queen, Buckingham Palace, SW1 1AA'),
(' The Queen\n Buckingham Palace\n SW1 1AA', 'The Queen, Buckingham Palace, SW1 1AA'),
("The ’Queen\n Buckingham Palace\n SW1 1AA", "The 'Queen, Buckingham Palace, SW1 1AA"),
])
def test_format_recipient(original_address, expected_address):
assert format_recipient(original_address) == expected_address
Reference in New Issue Copy Permalink