diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index ca68931a2..b43650bfc 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -695,7 +695,7 @@ private errors.add(:field_70, I18n.t("validations.household.reasonpref.not_homeless")) else reason_fields = %i[field_70 field_71 field_72 field_73 field_74] - if field_69 == 1 && reason_fields.all? { |field| attributes[field.to_sym].blank? } + if field_69 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? } reason_fields.each do |field| errors.add(field, I18n.t("validations.not_answered", question: "reason for reasonable preference")) end @@ -704,14 +704,14 @@ private end def validate_condition_effects + illness_option_fields = %i[field_119 field_120 field_121 field_122 field_123 field_124 field_125 field_126 field_127 field_128] if household_no_illness? - illness_option_fields = %i[field_119 field_120 field_121 field_122 field_123 field_124 field_125 field_126 field_127 field_128] illness_option_fields.each do |field| if attributes[field.to_s] == 1 - errors.add(field.to_sym, I18n.t("validations.household.condition_effects.no_choices")) + errors.add(field, I18n.t("validations.household.condition_effects.no_choices")) end end - elsif illness_option_fields.all? { |field| attributes[field.to_sym].blank? } + elsif illness_option_fields.all? { |field| attributes[field.to_s].blank? } illness_option_fields.each do |field| errors.add(field, I18n.t("validations.not_answered", question: "how is person affected by condition or illness")) end diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb index bb33acc99..0fe2d7238 100644 --- a/app/services/bulk_upload/lettings/year2023/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb @@ -624,7 +624,7 @@ private errors.add(:field_111, I18n.t("validations.household.reasonpref.not_homeless")) else reason_fields = %i[field_111 field_112 field_113 field_114 field_115] - if field_110 == 1 && reason_fields.all? { |field| attributes[field.to_sym].blank? } + if field_110 == 1 && reason_fields.all? { |field| attributes[field.to_s].blank? } reason_fields.each do |field| errors.add(field, I18n.t("validations.not_answered", question: "reason for reasonable preference")) end @@ -640,7 +640,7 @@ private errors.add(field, I18n.t("validations.household.condition_effects.no_choices")) end end - elsif illness_option_fields.all? { |field| attributes[field.to_sym].blank? } + elsif illness_option_fields.all? { |field| attributes[field.to_s].blank? } illness_option_fields.each do |field| errors.add(field, I18n.t("validations.not_answered", question: "how is person affected by condition or illness")) end diff --git a/app/services/bulk_upload/sales/year2022/row_parser.rb b/app/services/bulk_upload/sales/year2022/row_parser.rb index 16a7f0795..1acb9ddf2 100644 --- a/app/services/bulk_upload/sales/year2022/row_parser.rb +++ b/app/services/bulk_upload/sales/year2022/row_parser.rb @@ -470,7 +470,7 @@ private def validate_buyers_organisations organisations_fields = %i[field_44 field_45 field_46 field_47] - if organisations_fields.all? { |field| attributes[field.to_sym].blank? } + if organisations_fields.all? { |field| attributes[field.to_s].blank? } organisations_fields.each do |field| errors.add(field, "At least one option must be selected of these four") end diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb index a1db9d310..3a9f7ed41 100644 --- a/app/services/bulk_upload/sales/year2023/row_parser.rb +++ b/app/services/bulk_upload/sales/year2023/row_parser.rb @@ -565,7 +565,7 @@ private def validate_buyers_organisations organisations_fields = %i[field_67 field_68 field_69 field_70] - if organisations_fields.all? { |field| attributes[field.to_sym].blank? } + if organisations_fields.all? { |field| attributes[field.to_s].blank? } organisations_fields.each do |field| errors.add(field, "At least one option must be selected of these four") end