From cb6c3b3ec8bd67cfa3b11b349bbbb88b8c01d96e Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Tue, 17 Jan 2023 17:34:35 +0000 Subject: [PATCH] feat: add partner number validation to relevant fields rather than base --- app/models/validations/shared_validations.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb index 791492c4b..93a81e938 100644 --- a/app/models/validations/shared_validations.rb +++ b/app/models/validations/shared_validations.rb @@ -91,9 +91,11 @@ module Validations::SharedValidations end def shared_validate_partner_count(record, max_people) - partner_count = (2..max_people).count { |n| person_is_partner?(record["relat#{n}"]) } - if partner_count > 1 - record.errors.add :base, I18n.t("validations.household.relat.one_partner") + partner_numbers = (2..max_people).select { |n| person_is_partner?(record["relat#{n}"]) } + if partner_numbers.count > 1 + partner_numbers.each do |n| + record.errors.add "relat#{n}", I18n.t("validations.household.relat.one_partner") + end end end