diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index 1d761f988..6c697de14 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -533,29 +533,25 @@ private def validate_dont_know_disabled_needs_conjunction if field_60 == 1 && [field_55, field_56, field_57, field_58].count(1).positive? - errors.add(:field_60, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) - errors.add(:field_55, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if field_55 == 1 - errors.add(:field_56, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if field_56 == 1 - errors.add(:field_57, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if field_57 == 1 - errors.add(:field_58, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if field_58 == 1 + %i[field_60 field_55 field_56 field_57 field_58].each do |field| + errors.add(field, I18n.t("validations.household.housingneeds.dont_know_disabled_needs_conjunction")) if send(field) == 1 + end end end def validate_no_disabled_needs_conjunction if field_59 == 1 && [field_55, field_56, field_57, field_58].count(1).positive? - errors.add(:field_59, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) - errors.add(:field_55, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if field_55 == 1 - errors.add(:field_56, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if field_56 == 1 - errors.add(:field_57, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if field_57 == 1 - errors.add(:field_58, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if field_58 == 1 + %i[field_59 field_55 field_56 field_57 field_58].each do |field| + errors.add(field, I18n.t("validations.household.housingneeds.no_disabled_needs_conjunction")) if send(field) == 1 + end end end def validate_only_one_housing_needs_type if [field_55, field_56, field_57].count(1) > 1 - errors.add(:field_55, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) if field_55 == 1 - errors.add(:field_56, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) if field_56 == 1 - errors.add(:field_57, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) if field_57 == 1 + %i[field_55 field_56 field_57].each do |field| + errors.add(field, I18n.t("validations.household.housingneeds_type.only_one_option_permitted")) if send(field) == 1 + end end end