From d3f775eaaa4df5cc89a36b7f4d8ca3e1879dbef0 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 11 Sep 2024 13:24:19 +0100
Subject: [PATCH] Handle back link for checking file page

---
 app/controllers/bulk_upload_lettings_logs_controller.rb   | 2 +-
 app/controllers/bulk_upload_sales_logs_controller.rb      | 2 +-
 app/models/forms/bulk_upload_lettings/checking_file.rb    | 8 +++++++-
 app/models/forms/bulk_upload_lettings/upload_your_file.rb | 2 +-
 app/models/forms/bulk_upload_sales/checking_file.rb       | 8 +++++++-
 app/models/forms/bulk_upload_sales/upload_your_file.rb    | 2 +-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb
index c7d78df5c..6f3568c87 100644
--- a/app/controllers/bulk_upload_lettings_logs_controller.rb
+++ b/app/controllers/bulk_upload_lettings_logs_controller.rb
@@ -55,7 +55,7 @@ private
               when "upload-your-file"
                 Forms::BulkUploadLettings::UploadYourFile.new(form_params.merge(current_user:, request:))
               when "checking-file"
-                Forms::BulkUploadLettings::CheckingFile.new(form_params)
+                Forms::BulkUploadLettings::CheckingFile.new(form_params.merge(request:))
               else
                 raise "Page not found for path #{params[:id]}"
               end
diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb
index 923fa2bd6..fbeb9e033 100644
--- a/app/controllers/bulk_upload_sales_logs_controller.rb
+++ b/app/controllers/bulk_upload_sales_logs_controller.rb
@@ -53,7 +53,7 @@ private
               when "upload-your-file"
                 Forms::BulkUploadSales::UploadYourFile.new(form_params.merge(current_user:, request:))
               when "checking-file"
-                Forms::BulkUploadSales::CheckingFile.new(form_params)
+                Forms::BulkUploadSales::CheckingFile.new(form_params.merge(request:))
               else
                 raise "Page not found for path #{params[:id]}"
               end
diff --git a/app/models/forms/bulk_upload_lettings/checking_file.rb b/app/models/forms/bulk_upload_lettings/checking_file.rb
index 8cd9ee696..c1ca7f003 100644
--- a/app/models/forms/bulk_upload_lettings/checking_file.rb
+++ b/app/models/forms/bulk_upload_lettings/checking_file.rb
@@ -6,13 +6,19 @@ module Forms
       include Rails.application.routes.url_helpers
 
       attribute :year, :integer
+      attribute :organisation_id, :integer
 
       def view_path
         "bulk_upload_lettings_logs/forms/checking_file"
       end
 
       def back_path
-        bulk_upload_lettings_log_path(id: "start")
+        organisation_id = request.query_parameters[:organisation_id]
+        if organisation_id.present?
+          lettings_logs_organisation_path(organisation_id)
+        else
+          bulk_upload_lettings_log_path(id: "start")
+        end
       end
 
       def year_combo
diff --git a/app/models/forms/bulk_upload_lettings/upload_your_file.rb b/app/models/forms/bulk_upload_lettings/upload_your_file.rb
index f501da811..73a47fe2f 100644
--- a/app/models/forms/bulk_upload_lettings/upload_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/upload_your_file.rb
@@ -36,7 +36,7 @@ module Forms
       end
 
       def next_path
-        bulk_upload_lettings_log_path(id: "checking-file", form: { year: })
+        bulk_upload_lettings_log_path(id: "checking-file", form: { year:, organisation_id: })
       end
 
       def save!
diff --git a/app/models/forms/bulk_upload_sales/checking_file.rb b/app/models/forms/bulk_upload_sales/checking_file.rb
index a37be3ccb..bdcc94db1 100644
--- a/app/models/forms/bulk_upload_sales/checking_file.rb
+++ b/app/models/forms/bulk_upload_sales/checking_file.rb
@@ -6,13 +6,19 @@ module Forms
       include Rails.application.routes.url_helpers
 
       attribute :year, :integer
+      attribute :organisation_id, :integer
 
       def view_path
         "bulk_upload_sales_logs/forms/checking_file"
       end
 
       def back_path
-        bulk_upload_sales_log_path(id: "start")
+        organisation_id = request.query_parameters[:organisation_id]
+        if organisation_id.present?
+          sales_logs_organisation_path(organisation_id)
+        else
+          bulk_upload_sales_log_path(id: "start")
+        end
       end
 
       def year_combo
diff --git a/app/models/forms/bulk_upload_sales/upload_your_file.rb b/app/models/forms/bulk_upload_sales/upload_your_file.rb
index 83cc12def..8f601614f 100644
--- a/app/models/forms/bulk_upload_sales/upload_your_file.rb
+++ b/app/models/forms/bulk_upload_sales/upload_your_file.rb
@@ -34,7 +34,7 @@ module Forms
       end
 
       def next_path
-        bulk_upload_sales_log_path(id: "checking-file", form: { year: })
+        bulk_upload_sales_log_path(id: "checking-file", form: { year:, organisation_id: })
       end
 
       def save!