CLDC-4389: BU validation prioritisation (#3317)

app/services/bulk_upload/lettings/year2025/row_parser.rb

@@ -461,7 +461,6 @@ class BulkUpload::Lettings::Year2025::RowParser
   validate :validate_uprn_exists_if_any_key_address_fields_are_blank, on: :after_log, unless: -> { supported_housing? }
   validate :validate_address_fields, on: :after_log, unless: -> { supported_housing? }
 
-  validate :validate_incomplete_soft_validations, on: :after_log
   validate :validate_nationality, on: :after_log
   validate :validate_reasonpref_reason_values, on: :after_log
   validate :validate_prevten_value_when_renewal, on: :after_log
@@ -506,6 +505,8 @@ class BulkUpload::Lettings::Year2025::RowParser
       end
     end
 
+    validate_incomplete_soft_validations
+
     add_errors_for_invalid_fields
 
     @valid = errors.blank?

app/services/bulk_upload/lettings/year2026/row_parser.rb

@@ -496,7 +496,6 @@ class BulkUpload::Lettings::Year2026::RowParser
   validate :validate_uprn_exists_if_any_key_address_fields_are_blank, on: :after_log
   validate :validate_address_fields, on: :after_log
 
-  validate :validate_incomplete_soft_validations, on: :after_log
   validate :validate_nationality, on: :after_log
   validate :validate_reasonpref_reason_values, on: :after_log
   validate :validate_prevten_value_when_renewal, on: :after_log
@@ -541,6 +540,8 @@ class BulkUpload::Lettings::Year2026::RowParser
       end
     end
 
+    validate_incomplete_soft_validations
+
     add_errors_for_invalid_fields
 
     @valid = errors.blank?

app/services/bulk_upload/sales/year2025/row_parser.rb

@@ -439,8 +439,6 @@ class BulkUpload::Sales::Year2025::RowParser
   validate :validate_assigned_to_when_support, on: :after_log
   validate :validate_managing_org_related, on: :after_log
   validate :validate_relevant_collection_window, on: :after_log
-  validate :validate_incomplete_soft_validations, on: :after_log
-
   validate :validate_uprn_exists_if_any_key_address_fields_are_blank, on: :after_log
   validate :validate_address_fields, on: :after_log
   validate :validate_if_log_already_exists, on: :after_log, if: -> { FeatureToggle.bulk_upload_duplicate_log_check_enabled? }
@@ -504,6 +502,8 @@ class BulkUpload::Sales::Year2025::RowParser
       end
     end
 
+    validate_incomplete_soft_validations
+
     add_errors_for_invalid_fields
 
     errors.blank?
@@ -1519,7 +1519,7 @@ private
         next if log.form.questions.none? { |q| q.id == interruption_screen_question_id && q.page.routed_to?(log, nil) }
 
         field_mapping_for_errors[interruption_screen_question_id.to_sym]&.each do |field|
-          if errors.none? { |e| e.options[:category] == :soft_validation && field_mapping_for_errors[interruption_screen_question_id.to_sym].include?(e.attribute) }
+          if errors.none? { |e| field_mapping_for_errors[interruption_screen_question_id.to_sym].include?(e.attribute) }
             error_message = [display_title_text(question.page.title_text, log), display_informative_text(question.page.informative_text, log)].reject(&:empty?).join(" ")
             errors.add(field, message: error_message, category: :soft_validation)
           end

app/services/bulk_upload/sales/year2026/row_parser.rb

@@ -493,7 +493,6 @@ class BulkUpload::Sales::Year2026::RowParser
   validate :validate_assigned_to_when_support, on: :after_log
   validate :validate_managing_org_related, on: :after_log
   validate :validate_relevant_collection_window, on: :after_log
-  validate :validate_incomplete_soft_validations, on: :after_log
 
   validate :validate_uprn_exists_if_any_key_address_fields_are_blank, on: :after_log
   validate :validate_address_fields, on: :after_log
@@ -561,6 +560,8 @@ class BulkUpload::Sales::Year2026::RowParser
       end
     end
 
+    validate_incomplete_soft_validations
+
     add_errors_for_invalid_fields
 
     errors.blank?
@@ -1672,7 +1673,7 @@ private
         next if log.form.questions.none? { |q| q.id == interruption_screen_question_id && q.page.routed_to?(log, nil) }
 
         field_mapping_for_errors[interruption_screen_question_id.to_sym]&.each do |field|
-          if errors.none? { |e| e.options[:category] == :soft_validation && field_mapping_for_errors[interruption_screen_question_id.to_sym].include?(e.attribute) }
+          if errors.none? { |e| field_mapping_for_errors[interruption_screen_question_id.to_sym].include?(e.attribute) }
             error_message = [display_title_text(question.page.title_text, log), display_informative_text(question.page.informative_text, log)].reject(&:empty?).join(" ")
             errors.add(field, message: error_message, category: :soft_validation)
           end