Merge pull request #1998 from alphagov/expanding-session

Don’t store info about bad uploads in session

app/main/views/send.py

@@ -541,8 +541,14 @@ def _check_messages(service_id, template_type, upload_id, preview_row, letters_a
     elif preview_row > 2:
         abort(404)
 
-    session['file_uploads'][upload_id]['notification_count'] = len(recipients)
-    session['file_uploads'][upload_id]['valid'] = not recipients.has_errors
+    original_file_name = session['file_uploads'][upload_id].get('original_file_name')
+
+    if any(recipients) and not recipients.has_errors:
+        session['file_uploads'][upload_id]['notification_count'] = len(recipients)
+        session['file_uploads'][upload_id]['valid'] = True
+    else:
+        session['file_uploads'].pop(upload_id)
+
     return dict(
         recipients=recipients,
         template=template,
@@ -550,7 +556,7 @@ def _check_messages(service_id, template_type, upload_id, preview_row, letters_a
         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=session['file_uploads'][upload_id].get('original_file_name'),
+        original_file_name=original_file_name,
         upload_id=upload_id,
         form=CsvUploadForm(),
         remaining_messages=remaining_messages,
@@ -610,17 +616,6 @@ def check_messages_preview(service_id, template_type, upload_id, filetype, row_i
     return TemplatePreview.from_utils_template(template, filetype)
 
 
-@main.route("/services/<service_id>/<template_type>/check/<upload_id>", methods=['POST'])
-@main.route("/services/<service_id>/<template_type>/check/<upload_id>/row-<int:row_index>", methods=['POST'])
-@login_required
-@user_has_permissions('send_messages', restrict_admin_usage=True)
-def recheck_messages(service_id, template_type, upload_id, row_index=0):
-    if not session.get('file_uploads', {}).get(upload_id):
-        return redirect(url_for('main.choose_template', service_id=service_id), code=301)
-
-    return send_messages(service_id, session['file_uploads'][upload_id].get('template_id'))
-
-
 @main.route("/services/<service_id>/start-job/<upload_id>", methods=['POST'])
 @login_required
 @user_has_permissions('send_messages', restrict_admin_usage=True)
@@ -628,6 +623,7 @@ def start_job(service_id, upload_id):
     try:
         upload_data = session['file_uploads'][upload_id]
     except KeyError:
+        current_app.logger.exception('upload_id not in session')
         return redirect(url_for('main.choose_template', service_id=service_id), code=301)
 
     if request.files or not upload_data.get('valid'):

app/templates/components/file-upload.html

@@ -1,5 +1,11 @@
-{% macro file_upload(field, button_text="Choose file", alternate_link=None, alternate_link_text=None) %}
-  <form method="post" enctype="multipart/form-data" class="{% if field.errors %}form-group-error{% endif %}" data-module="file-upload">
+{% macro file_upload(
+  field,
+  action=None,
+  button_text="Choose file",
+  alternate_link=None,
+  alternate_link_text=None
+) %}
+  <form method="post" enctype="multipart/form-data" {% if action %}action="{{ action }}"{% endif %} class="{% if field.errors %}form-group-error{% endif %}" data-module="file-upload">
     <label class="file-upload-label" for="{{ field.name }}">
       <span class="visually-hidden">{{ field.label.text }}</span>
       {% if hint %}

app/templates/views/check/column-errors.html

@@ -135,7 +135,11 @@
       {% if request.args.from_test %}
         <a href="{{ back_link }}" class="page-footer-back-link">Back</a>
       {% else %}
-        {{file_upload(form.file, button_text='Re-upload your file')}}
+        {{ file_upload(
+          form.file,
+          action=url_for('.send_messages', service_id=current_service.id, template_id=template.id),
+          button_text='Re-upload your file'
+        ) }}
       {% endif %}
     </div>
     <a href="#content" class="back-to-top-link">Back to top</a>

app/templates/views/check/row-errors.html

@@ -47,7 +47,11 @@
 
   <div class="js-stick-at-top-when-scrolling">
     <div class="form-group">
-      {{ file_upload(form.file, button_text='Re-upload your file') }}
+      {{ file_upload(
+        form.file,
+        action=url_for('.send_messages', service_id=current_service.id, template_id=template.id),
+        button_text='Re-upload your file'
+      ) }}
     </div>
     <a href="#content" class="back-to-top-link">Back to top</a>
   </div>