From f4ff4c0276288ccd40a5489e18eae5c1e7477910 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Wed, 11 Sep 2024 12:57:59 +0100
Subject: [PATCH] Change back link redirect logic

---
 .../bulk_upload_lettings_logs_controller.rb          | 12 +++---------
 app/controllers/bulk_upload_sales_logs_controller.rb | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb
index 42046ca07..c7d78df5c 100644
--- a/app/controllers/bulk_upload_lettings_logs_controller.rb
+++ b/app/controllers/bulk_upload_lettings_logs_controller.rb
@@ -3,9 +3,9 @@ class BulkUploadLettingsLogsController < ApplicationController
   before_action :validate_data_protection_agrement_signed!
 
   def start
-    support_user_redirection if current_user.support?
-
-    if have_choice_of_year?
+    if current_user.support? && params[:organisation_id].present?
+      redirect_to bulk_upload_lettings_log_path(id: "upload-your-file", form: { year: current_year }, organisation_id: params[:organisation_id])
+    elsif have_choice_of_year?
       redirect_to bulk_upload_lettings_log_path(id: "year")
     else
       redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: current_year })
@@ -64,10 +64,4 @@ private
   def form_params
     params.fetch(:form, {}).permit(:year, :needstype, :file, :organisation_id)
   end
-
-  def support_user_redirection
-    if params[:organisation_id].present?
-      redirect_to bulk_upload_lettings_log_path(id: "upload-your-file", form: { year: current_year }, organisation_id: params[:organisation_id])
-    end
-  end
 end
diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb
index 61dc8b86f..923fa2bd6 100644
--- a/app/controllers/bulk_upload_sales_logs_controller.rb
+++ b/app/controllers/bulk_upload_sales_logs_controller.rb
@@ -3,9 +3,9 @@ class BulkUploadSalesLogsController < ApplicationController
   before_action :validate_data_protection_agrement_signed!
 
   def start
-    support_user_redirection if current_user.support?
-
-    if have_choice_of_year?
+    if current_user.support? && params[:organisation_id].present?
+      redirect_to bulk_upload_sales_log_path(id: "upload-your-file", form: { year: current_year }, organisation_id: params[:organisation_id])
+    elsif have_choice_of_year?
       redirect_to bulk_upload_sales_log_path(id: "year")
     else
       redirect_to bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: current_year })
@@ -62,10 +62,4 @@ private
   def form_params
     params.fetch(:form, {}).permit(:year, :file, :organisation_id)
   end
-
-  def support_user_redirection
-    if params[:organisation_id].present?
-      redirect_to bulk_upload_sales_log_path(id: "upload-your-file", form: { year: current_year }, organisation_id: params[:organisation_id])
-    end
-  end
 end