From 9aa07099b547f6ef2121a47c3d1cfa4469980e4e Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Fri, 12 May 2023 11:52:29 +0100
Subject: [PATCH] Display the soft validation errors on the soft-errors-valid
 page

---
 .../soft_errors_valid.html.erb                            | 8 ++++++++
 .../soft_errors_valid.html.erb                            | 8 ++++++++
 .../bulk_upload_lettings_data_check_controller_spec.rb    | 8 ++++++++
 .../bulk_upload_sales_data_check_controller_spec.rb       | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb b/app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb
index 7429c808e..db0251ccc 100644
--- a/app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb
+++ b/app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb
@@ -12,6 +12,14 @@
         <%= @bulk_upload.filename %>
       </div>
 
+      <div class="govuk-grid-row">
+        <div class="govuk-grid-column-full">
+          <% @bulk_upload.bulk_upload_errors.order_by_cell.group_by(&:row).each do |_row, errors_for_row| %>
+            <%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: errors_for_row) %>
+          <% end %>
+        </div>
+      </div>
+
       <%= f.govuk_collection_radio_buttons :soft_errors_valid,
             @form.options,
             :id,
diff --git a/app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb b/app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb
index a8f246f7d..2d4fec214 100644
--- a/app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb
+++ b/app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb
@@ -12,6 +12,14 @@
         <%= @bulk_upload.filename %>
       </div>
 
+      <div class="govuk-grid-row">
+        <div class="govuk-grid-column-full">
+          <% @bulk_upload.bulk_upload_errors.order_by_cell.group_by(&:row).each do |_row, errors_for_row| %>
+            <%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: errors_for_row) %>
+          <% end %>
+        </div>
+      </div>
+
       <%= f.govuk_collection_radio_buttons :soft_errors_valid,
             @form.options,
             :id,
diff --git a/spec/requests/bulk_upload_lettings_data_check_controller_spec.rb b/spec/requests/bulk_upload_lettings_data_check_controller_spec.rb
index cefe8bc39..7ac6fb3cf 100644
--- a/spec/requests/bulk_upload_lettings_data_check_controller_spec.rb
+++ b/spec/requests/bulk_upload_lettings_data_check_controller_spec.rb
@@ -20,6 +20,14 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do
       expect(response.body).to include(bulk_upload.filename)
       expect(response.body).to include("Are there any errors in these fields?")
     end
+
+    it "shows the soft validation and lists the errors" do
+      get "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid"
+
+      expect(response.body).to include("Row #{bulk_upload_errors.first.row}")
+      expect(response.body).to include("Tenant code")
+      expect(response.body).to include("some error")
+    end
   end
 
   describe "PATCH /lettings-logs/bulk-upload-data-check/:ID/soft-errors-valid" do
diff --git a/spec/requests/bulk_upload_sales_data_check_controller_spec.rb b/spec/requests/bulk_upload_sales_data_check_controller_spec.rb
index 6a5a59ae7..a9fbd64ca 100644
--- a/spec/requests/bulk_upload_sales_data_check_controller_spec.rb
+++ b/spec/requests/bulk_upload_sales_data_check_controller_spec.rb
@@ -20,6 +20,14 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do
       expect(response.body).to include(bulk_upload.filename)
       expect(response.body).to include("Are there any errors in these fields?")
     end
+
+    it "shows the soft validation and lists the errors" do
+      get "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid"
+
+      expect(response.body).to include("Row #{bulk_upload_errors.first.row}")
+      expect(response.body).to include("Purchaser code")
+      expect(response.body).to include("some error")
+    end
   end
 
   describe "PATCH /sales-logs/bulk-upload-data-check/:ID/soft-errors-valid" do