diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb index f1ed219cf..2b3aae5d5 100644 --- a/app/services/bulk_upload/lettings/year2024/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb @@ -752,15 +752,6 @@ private end end - def validate_reasonable_preference_homeless - reason_fields = %i[field_107 field_108 field_109 field_110 field_111] - if field_106 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? } - reason_fields.each do |field| - errors.add(field, I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "reason for reasonable preference.")) - end - end - end - def validate_reasonable_preference_dont_know if rp_dontknow_conflict? errors.add(:field_111, I18n.t("#{ERROR_BASE_KEY}.reasonpref.conflict.dont_know")) @@ -770,6 +761,15 @@ private end end + def validate_reasonable_preference_homeless + reason_fields = %i[field_107 field_108 field_109 field_110 field_111] + if field_106 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? } + reason_fields.each do |field| + errors.add(field, I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "reason for reasonable preference.")) + end + end + end + def validate_condition_effects illness_option_fields = %i[field_94 field_88 field_91 field_86 field_87 field_89 field_90 field_93 field_92 field_95] if household_no_illness? diff --git a/app/services/bulk_upload/lettings/year2025/row_parser.rb b/app/services/bulk_upload/lettings/year2025/row_parser.rb index b44c8796d..25e71f8c4 100644 --- a/app/services/bulk_upload/lettings/year2025/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2025/row_parser.rb @@ -751,15 +751,6 @@ private end end - def validate_reasonable_preference_homeless - reason_fields = %i[field_107 field_108 field_109 field_110 field_111] - if field_106 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? } - reason_fields.each do |field| - errors.add(field, I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "reason for reasonable preference.")) - end - end - end - def validate_reasonable_preference_dont_know if rp_dontknow_conflict? errors.add(:field_111, I18n.t("#{ERROR_BASE_KEY}.reasonpref.conflict.dont_know")) @@ -769,6 +760,15 @@ private end end + def validate_reasonable_preference_homeless + reason_fields = %i[field_107 field_108 field_109 field_110 field_111] + if field_106 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? } + reason_fields.each do |field| + errors.add(field, I18n.t("#{ERROR_BASE_KEY}.not_answered", question: "reason for reasonable preference.")) + end + end + end + def validate_condition_effects illness_option_fields = %i[field_94 field_88 field_91 field_86 field_87 field_89 field_90 field_93 field_92 field_95] if household_no_illness?