darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop overwriting S3 metadata with empty filename

Browse Source 
When you upload a CSV the check page takes the file name from the URL
and writes it to the S3 metadata for that file.

This also happens when you go to the .png version of this page.

The .png version of the page doesn’t have the filename in the URL. So it
re-writes the S3 metadata with an empty filename.

This means that all letter jobs sent recently have no file names. This
commit fixes this problem.
This commit is contained in:
Chris Hill-Scott
2018-05-10 17:00:20 +01:00
parent 5f4d9a60da
commit 3a471e2f61
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/main/views/send.py
View File

@@ -476,7 +476,7 @@ def send_test_preview(service_id, template_id, filetype):
return TemplatePreview.from_utils_template(template, filetype, page=request.args.get('page'))
def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_pdf=False):
def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_pdf=False, write_metadata=False):
try:
# The happy path is that the job doesn’t already exist, so the
@@ -561,7 +561,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
elif preview_row > 2:
abort(404)
if any(recipients) and not recipients.has_errors:
if any(recipients) and not recipients.has_errors and write_metadata:
set_metadata_on_csv_upload(
service_id,
upload_id,
@@ -604,7 +604,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
@user_has_permissions('send_messages', restrict_admin_usage=True)
def check_messages(service_id, template_id, upload_id, row_index=2):
data = _check_messages(service_id, template_id, upload_id, row_index)
data = _check_messages(service_id, template_id, upload_id, row_index, write_metadata=True)
if (
data['recipients'].too_many_rows or
@@ -642,7 +642,7 @@ def check_messages_preview(service_id, template_id, upload_id, filetype, row_ind
abort(404)
template = _check_messages(
service_id, template_id, upload_id, row_index, letters_as_pdf=True
service_id, template_id, upload_id, row_index, letters_as_pdf=True, write_metadata=False,
)['template']
return TemplatePreview.from_utils_template(template, filetype)