From b3b06337eb1ceb23d05d1d557053837e11dfe808 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Thu, 23 Feb 2023 10:46:28 +0000
Subject: [PATCH] refactor: tidying

---
 app/controllers/bulk_upload_lettings_logs_controller.rb | 4 +---
 app/controllers/bulk_upload_sales_logs_controller.rb    | 4 +---
 app/views/bulk_upload_shared/guidance.html.erb          | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb
index f8cb6c80d..9b37cd2b5 100644
--- a/app/controllers/bulk_upload_lettings_logs_controller.rb
+++ b/app/controllers/bulk_upload_lettings_logs_controller.rb
@@ -22,9 +22,7 @@ class BulkUploadLettingsLogsController < ApplicationController
   end
 
   def guidance
-    path_form = Forms::BulkUploadLettings::PrepareYourFile.new
-    @template_path = path_form.template_path
-    @specification_path = path_form.specification_path
+    @form = Forms::BulkUploadLettings::PrepareYourFile.new
     render "bulk_upload_shared/guidance"
   end
 
diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb
index 0cb3269b9..2b3432399 100644
--- a/app/controllers/bulk_upload_sales_logs_controller.rb
+++ b/app/controllers/bulk_upload_sales_logs_controller.rb
@@ -22,9 +22,7 @@ class BulkUploadSalesLogsController < ApplicationController
   end
 
   def guidance
-    path_form = Forms::BulkUploadSales::PrepareYourFile.new
-    @template_path = path_form.template_path
-    @specification_path = path_form.specification_path
+    @form = Forms::BulkUploadSales::PrepareYourFile.new
     render "bulk_upload_shared/guidance"
   end
 
diff --git a/app/views/bulk_upload_shared/guidance.html.erb b/app/views/bulk_upload_shared/guidance.html.erb
index 0523208ca..0c1f67bcc 100644
--- a/app/views/bulk_upload_shared/guidance.html.erb
+++ b/app/views/bulk_upload_shared/guidance.html.erb
@@ -33,19 +33,19 @@
         <p class="govuk-!-font-weight-bold">It can take HMS providers a while to update these per new collection year, so you may have to wait for updates to export, or adjust your data manually post-export.</p>
       <% end %>
       <%= govuk_details(summary_text: "My organisation does not have a CMS") do %>
-        <p class="govuk-body">Your organisation’s IT team may be able to export CSV data for you - <%= govuk_link_to "find out more about data specification", @specification_path %>. This document outlines:</p>
+        <p class="govuk-body">Your organisation’s IT team may be able to export CSV data for you - <%= govuk_link_to "find out more about data specification", @form.specification_path %>. This document outlines:</p>
         <ul class="govuk-list govuk-list--bullet">
           <li>required fields</li>
           <li>each field's valid response</li>
           <li>if/when certain fields can be left blank</li>
         </ul>
-        <p class="govuk-body">Fields can appear in any order, as long as you include the <%= govuk_link_to "template document", @template_path %> headers, to easily identify what each column represents. You can rearrange data columns to match your system exports, copy-pasting multiple columns at once. For data stored in multiple systems, you can copy-paste all columns for one system next to each other, repeating this for subsequent system exports.</p>
+        <p class="govuk-body">Fields can appear in any order, as long as you include the <%= govuk_link_to "template document", @form.template_path %> headers, to easily identify what each column represents. You can rearrange data columns to match your system exports, copy-pasting multiple columns at once. For data stored in multiple systems, you can copy-paste all columns for one system next to each other, repeating this for subsequent system exports.</p>
       <% end %>
     </div>
 
     <div class="govuk-!-padding-bottom-4">
       <h2 class="govuk-heading-s">Getting help</h2>
-      <p class="govuk-body">There is no step-by-step bulk upload guide like there is with single log upload. However, you can download <%= govuk_link_to "our template", @template_path %>, which you can copy-paste data into from your systems column-by-column. You can also view a post-upload report showing any data errors, and our <%= govuk_link_to "data specification", @specification_path %> can help fix these.</p>
+      <p class="govuk-body">There is no step-by-step bulk upload guide like there is with single log upload. However, you can download <%= govuk_link_to "our template", @form.template_path %>, which you can copy-paste data into from your systems column-by-column. You can also view a post-upload report showing any data errors, and our <%= govuk_link_to "data specification", @form.specification_path %> can help fix these.</p>
       <p class="govuk-body">If you still need support mapping data in the way we need, DLUHC’s helpdesk can help. If your data is across multiple systems, or is hard to export as a single file in the correct format, you could try different exports, or copy-pasting data by hand.</p>
     </div>
   </div>