From f97a1775870a7990bd75d57b7982d769983557dc Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Wed, 24 Jan 2024 11:07:51 +0000
Subject: [PATCH] feat: don't show soft validations in deletion report

---
 app/helpers/logs_helper.rb                                  | 6 +++++-
 .../bulk_upload_lettings_results/deletion_report.html.erb   | 4 ++--
 app/views/bulk_upload_lettings_results/show.html.erb        | 4 ++++
 .../bulk_upload_sales_results/deletion_report.html.erb      | 4 ++--
 app/views/bulk_upload_sales_results/show.html.erb           | 4 ++++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/helpers/logs_helper.rb b/app/helpers/logs_helper.rb
index ee7711055..e499f2585 100644
--- a/app/helpers/logs_helper.rb
+++ b/app/helpers/logs_helper.rb
@@ -73,8 +73,12 @@ module LogsHelper
     "#{pluralize(unique_answers_to_be_cleared_count, 'answer')} will be deleted because #{it_is_or_they_are} invalid. You will have to answer #{this_or_these} #{'question'.pluralize(unique_answers_to_be_cleared_count)} again on the site."
   end
 
+  def all_answers_to_be_cleared(bulk_upload_errors)
+    bulk_upload_errors.reject { |e| %w[not_answered soft_validation].include?(e.category) }
+  end
+
   def unique_answers_to_be_cleared(bulk_upload)
-    bulk_upload.bulk_upload_errors.reject { |e| e.category == "not_answered" }.uniq(&:field)
+    all_answers_to_be_cleared(bulk_upload.bulk_upload_errors).uniq(&:field)
   end
 
   def answers_to_be_deleted_title_text(bulk_upload)
diff --git a/app/views/bulk_upload_lettings_results/deletion_report.html.erb b/app/views/bulk_upload_lettings_results/deletion_report.html.erb
index eb9a0840c..2624012d4 100644
--- a/app/views/bulk_upload_lettings_results/deletion_report.html.erb
+++ b/app/views/bulk_upload_lettings_results/deletion_report.html.erb
@@ -18,13 +18,13 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
     <% @bulk_upload.bulk_upload_errors.order_by_row.order_by_cell.group_by(&:row).each do |_row, errors_for_row| %>
-      <%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: errors_for_row.reject { |e| e.category == "not_answered" }) %>
+      <%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: all_answers_to_be_cleared(errors_for_row)) %>
     <% end %>
   </div>
 </div>
 
 <div class="govuk-button-group">
-  <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, page: "confirm"), method: :patch do |f| %>
+  <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, "confirm"), method: :patch do |f| %>
     <%= f.govuk_submit "Clear this data and upload the logs" %>
     <%= govuk_button_link_to "I have fixed these errors and I want to reupload the file", start_bulk_upload_lettings_logs_path, secondary: true %>
   <% end %>
diff --git a/app/views/bulk_upload_lettings_results/show.html.erb b/app/views/bulk_upload_lettings_results/show.html.erb
index d42ad40f9..56448f24e 100644
--- a/app/views/bulk_upload_lettings_results/show.html.erb
+++ b/app/views/bulk_upload_lettings_results/show.html.erb
@@ -1,3 +1,7 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link(href: :back) %>
+<% end %>
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
diff --git a/app/views/bulk_upload_sales_results/deletion_report.html.erb b/app/views/bulk_upload_sales_results/deletion_report.html.erb
index a1badbbf9..3b6088c3c 100644
--- a/app/views/bulk_upload_sales_results/deletion_report.html.erb
+++ b/app/views/bulk_upload_sales_results/deletion_report.html.erb
@@ -18,13 +18,13 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
     <% @bulk_upload.bulk_upload_errors.order_by_row.order_by_cell.group_by(&:row).each do |_row, errors_for_row| %>
-      <%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: errors_for_row.reject { |e| e.category == "not_answered" }) %>
+      <%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: all_answers_to_be_cleared(errors_for_row)) %>
     <% end %>
   </div>
 </div>
 
 <div class="govuk-button-group">
-  <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_resume_path(@bulk_upload, page: "confirm"), method: :patch do |f| %>
+  <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_resume_path(@bulk_upload, "confirm"), method: :patch do |f| %>
     <%= f.govuk_submit "Clear this data and upload the logs" %>
     <%= govuk_button_link_to "I have fixed these errors and I want to reupload the file", start_bulk_upload_sales_logs_path, secondary: true %>
   <% end %>
diff --git a/app/views/bulk_upload_sales_results/show.html.erb b/app/views/bulk_upload_sales_results/show.html.erb
index fd77a5d75..b7c838567 100644
--- a/app/views/bulk_upload_sales_results/show.html.erb
+++ b/app/views/bulk_upload_sales_results/show.html.erb
@@ -1,3 +1,7 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link(href: :back) %>
+<% end %>
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <span class="govuk-caption-l">Bulk Upload for sales (<%= @bulk_upload.year_combo %>)</span>