darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check metadata for file name when sending from contact list

Browse Source 
The `.send_from_contact_list` function redirected to `.check_messages`
with `original_file_name` in the query string. Contact lists already
have `original_file_name` as part of their metadata, so we can stop
sending it in the query string and use the metadata instead.
This commit is contained in:
Katie Smith
2020-10-21 13:07:59 +01:00
parent e07651ed80
commit a6c103841e
4 changed files with 129 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ from app.main.forms import (
from app.models.contact_list import ContactList, ContactListsAlphabetical
from app.models.user import Users
from app.s3_client.s3_csv_client import (
get_csv_metadata,
s3download,
s3upload,
set_metadata_on_csv_upload,
@@ -575,7 +576,6 @@ def send_from_contact_list(service_id, template_id, contact_list_id):
service_id=current_service.id,
template_id=template_id,
upload_id=contact_list.copy_to_uploads(),
original_file_name=contact_list.original_file_name,
contact_list_id=contact_list.id,
))
@@ -660,6 +660,10 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
abort(404)
page_count = get_page_count_for_letter(db_template, template.values)
# TODO: stop checking the request.args for original_file_name once this change has been deployed for a
# while and we are confident it's only coming from metadata
metadata = get_csv_metadata(service_id, upload_id)
original_file_name = metadata.get('original_file_name', request.args.get('original_file_name', ''))
return dict(
recipients=recipients,
@@ -668,7 +672,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
row_errors=get_errors_for_csv(recipients, template.template_type),
count_of_recipients=len(recipients),
count_of_displayed_recipients=len(list(recipients.displayed_rows)),
original_file_name=request.args.get('original_file_name', ''),
original_file_name=original_file_name,
upload_id=upload_id,
form=CsvUploadForm(),
remaining_messages=remaining_messages,
@@ -681,7 +685,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
first_recipient_column=recipients.recipient_column_headers[0],
preview_row=preview_row,
sent_previously=job_api_client.has_sent_previously(
service_id, template.id, db_template['version'], request.args.get('original_file_name', '')
service_id, template.id, db_template['version'], original_file_name
),
letter_too_long=is_letter_too_long(page_count),
letter_max_pages=LETTER_MAX_PAGE_COUNT,