fix tests

app/services/csv/sales_log_csv_service.rb

@@ -262,6 +262,7 @@ module Csv
       attributes = insert_checkbox_options(ordered_questions)
       final_attributes = insert_derived_and_related_attributes(non_question_fields + attributes)
       order_address_fields_for_support(final_attributes)
+      order_organisation_fields_before_sales_date_field(final_attributes)
       @user.support? ? final_attributes : final_attributes - SUPPORT_ONLY_ATTRIBUTES
     end
 
@@ -321,6 +322,14 @@ module Csv
       end
     end
 
+    def order_organisation_fields_before_sales_date_field(attributes)
+      sales_date_index = attributes.find_index { |q| q == "saledate" }
+      if sales_date_index
+        attributes.reject! { |q| q == "owning_organisation_name" || q == "managing_organisation_name" }
+        attributes.insert(sales_date_index, "owning_organisation_name", "managing_organisation_name")
+      end
+    end
+
     def non_question_fields
       case @year
       when 2022

spec/models/form/sales/subsections/setup_spec.rb

@@ -29,9 +29,9 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
     it "has correct pages" do
       expect(setup.pages.map(&:id)).to eq(
         %w[
-          completion_date
           owning_organisation
           managing_organisation
+          completion_date
           assigned_to
           purchaser_code
           ownership_scheme
@@ -56,9 +56,9 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
     it "has correct pages" do
       expect(setup.pages.map(&:id)).to eq(
         %w[
-          completion_date
           owning_organisation
           managing_organisation
+          completion_date
           assigned_to
           purchaser_code
           ownership_scheme
@@ -87,9 +87,9 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
     it "has correct pages" do
       expect(setup.pages.map(&:id)).to eq(
         %w[
-          completion_date
           owning_organisation
           managing_organisation
+          completion_date
           assigned_to
           purchaser_code
           ownership_scheme

spec/requests/form_controller_spec.rb

@@ -182,7 +182,7 @@ RSpec.describe FormController, type: :request do
 
       it "correctly sets owning organisation" do
         post "/sales-logs/#{sales_log.id}/owning-organisation", params: params
-        expect(response).to redirect_to("/sales-logs/#{sales_log.id}/assigned-to")
+        expect(response).to redirect_to("/sales-logs/#{sales_log.id}/completion-date")
         follow_redirect!
         sales_log.reload
         expect(sales_log.owning_organisation).to eq(managing_organisation)
@@ -209,7 +209,7 @@ RSpec.describe FormController, type: :request do
 
       it "does not reset assigned to" do
         post "/sales-logs/#{sales_log.id}/owning-organisation", params: params
-        expect(response).to redirect_to("/sales-logs/#{sales_log.id}/assigned-to")
+        expect(response).to redirect_to("/sales-logs/#{sales_log.id}/completion-date")
         follow_redirect!
         sales_log.reload
         expect(sales_log.assigned_to).to eq(assigned_to)
@@ -238,7 +238,7 @@ RSpec.describe FormController, type: :request do
 
       it "does not reset assigned to" do
         post "/sales-logs/#{sales_log.id}/owning-organisation", params: params
-        expect(response).to redirect_to("/sales-logs/#{sales_log.id}/assigned-to")
+        expect(response).to redirect_to("/sales-logs/#{sales_log.id}/completion-date")
         follow_redirect!
         sales_log.reload
         expect(sales_log.assigned_to).to eq(assigned_to)