From 08e13f72b415a9a652764d4b092cc25e4138fb28 Mon Sep 17 00:00:00 2001
From: Samuel <samuel.young@softwire.com>
Date: Wed, 14 May 2025 14:25:14 +0100
Subject: [PATCH] fix tests after merge

---
 app/services/csv/sales_log_csv_service.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/services/csv/sales_log_csv_service.rb b/app/services/csv/sales_log_csv_service.rb
index 51e0f9602..5ca263b43 100644
--- a/app/services/csv/sales_log_csv_service.rb
+++ b/app/services/csv/sales_log_csv_service.rb
@@ -259,10 +259,10 @@ module Csv
       ordered_questions = FormHandler.instance.ordered_questions_for_year(@year, "sales")
       ordered_questions.reject! { |q| q.id.match?(/((?<!la)_known)|(_check)|(_asked)|nationality_all_group|nationality_all_buyer2_group/) }
       ordered_questions.reject! { |q| q.id.match?(/organisation_id|created_by|assigned_to|soctenant|has_management_fee|management_fee|grant|discount|has_mscharge|mscharge|extrabor/) } if @year >= 2025
+      order_saledate_question_before_owning_organisation_question(ordered_questions)
       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
 
@@ -322,11 +322,12 @@ 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")
+    def order_saledate_question_before_owning_organisation_question(ordered_questions)
+      saledate_question_index = ordered_questions.find_index { |q| q.id == "saledate" }
+      owning_organisation_index = ordered_questions.find_index { |q| q.id == "owning_organisation_id" }
+      if saledate_question_index && owning_organisation_index
+        saledate_question = ordered_questions.delete_at(saledate_question_index)
+        ordered_questions.insert(owning_organisation_index, saledate_question)
       end
     end