From b295d8bba8fa1760a75ebaf7425f4f7e2544cf3f Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 24 Mar 2023 10:33:26 +0000 Subject: [PATCH] Don't care about the age in gender validation --- app/models/validations/soft_validations.rb | 8 +++++++- spec/models/validations/soft_validations_spec.rb | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/models/validations/soft_validations.rb b/app/models/validations/soft_validations.rb index a96e39898..fbc5ab3b9 100644 --- a/app/models/validations/soft_validations.rb +++ b/app/models/validations/soft_validations.rb @@ -53,7 +53,7 @@ module Validations::SoftValidations end def no_females_in_a_pregnant_household? - !females_in_the_household? && all_tenants_age_and_gender_information_completed? && preg_occ == 1 + !females_in_the_household? && all_tenants_gender_information_completed? && preg_occ == 1 end def female_in_pregnant_household_in_soft_validation_range? @@ -66,6 +66,12 @@ module Validations::SoftValidations end end + def all_tenants_gender_information_completed? + (1..hhmemb).all? do |n| + public_send("sex#{n}").present? && details_known_or_lead_tenant?(n) + end + end + TWO_YEARS_IN_DAYS = 730 TEN_YEARS_IN_DAYS = 3650 diff --git a/spec/models/validations/soft_validations_spec.rb b/spec/models/validations/soft_validations_spec.rb index 137073c77..d355f2fbd 100644 --- a/spec/models/validations/soft_validations_spec.rb +++ b/spec/models/validations/soft_validations_spec.rb @@ -175,6 +175,13 @@ RSpec.describe Validations::SoftValidations do end end + context "when there are no female tenants and age of other tenants is unknown" do + it "shows the interruption screen" do + record.update!(sex1: "M", preg_occ: 1, hhmemb: 1, age1_known: 1) + expect(record.no_females_in_a_pregnant_household?).to be true + end + end + context "when female tenants are under 16" do it "shows the interruption screen" do record.update!(age2: 14, sex2: "F", preg_occ: 1, hhmemb: 2, details_known_2: 0, age2_known: 0, age1: 18, sex1: "M", age1_known: 0)