handle bulk upload when not in crossover

app/controllers/bulk_upload_lettings_logs_controller.rb

@@ -5,7 +5,7 @@ class BulkUploadLettingsLogsController < ApplicationController
     if in_crossover_period?
       redirect_to bulk_upload_lettings_log_path(id: "year")
     else
-      redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file")
+      redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: current_year })
     end
   end
 
@@ -23,6 +23,10 @@ class BulkUploadLettingsLogsController < ApplicationController
 
 private
 
+  def current_year
+    FormHandler.instance.forms["current_lettings"].start_date.year
+  end
+
   def in_crossover_period?
     FormHandler.instance.forms.values.any?(&:in_crossover_period?)
   end

app/controllers/bulk_upload_sales_logs_controller.rb

@@ -5,7 +5,7 @@ class BulkUploadSalesLogsController < ApplicationController
     if in_crossover_period?
       redirect_to bulk_upload_sales_log_path(id: "year")
     else
-      redirect_to bulk_upload_sales_log_path(id: "prepare-your-file")
+      redirect_to bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: current_year })
     end
   end
 
@@ -23,6 +23,10 @@ class BulkUploadSalesLogsController < ApplicationController
 
 private
 
+  def current_year
+    FormHandler.instance.forms["current_sales"].start_date.year
+  end
+
   def in_crossover_period?
     FormHandler.instance.forms.values.any?(&:in_crossover_period?)
   end

spec/features/bulk_upload_lettings_logs_spec.rb

@@ -33,4 +33,19 @@ RSpec.describe "Bulk upload lettings log" do
       end
     end
   end
+
+  context "when not it crossover period" do
+    it "shows journey with year option" do
+      Timecop.freeze(2023, 10, 1) do
+        visit("/lettings-logs")
+        expect(page).to have_link("Upload lettings log in bulk")
+        click_link("Upload lettings log in bulk")
+
+        expect(page).to have_content("Upload lettings logs in bulk (2022/23)")
+        click_button("Continue")
+
+        expect(page).to have_content("Upload your file")
+      end
+    end
+  end
 end

spec/features/bulk_upload_sales_logs_spec.rb

@@ -33,4 +33,19 @@ RSpec.describe "Bulk upload sales log" do
       end
     end
   end
+
+  context "when not it crossover period" do
+    it "shows journey with year option" do
+      Timecop.freeze(2023, 10, 1) do
+        visit("/sales-logs")
+        expect(page).to have_link("Upload sales log in bulk")
+        click_link("Upload sales log in bulk")
+
+        expect(page).to have_content("Upload sales logs in bulk (2022/23)")
+        click_button("Continue")
+
+        expect(page).to have_content("Upload your file")
+      end
+    end
+  end
 end