diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 39519b645..6853370aa 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -219,6 +219,10 @@ class CaseLog < ApplicationRecord rent_type == 2 || rent_type == 4 end + def previous_tenancy_was_foster_care? + prevten == 13 + end + private PIO = Postcodes::IO.new diff --git a/app/models/validations/household_validations.rb b/app/models/validations/household_validations.rb index a036eb70f..5d6e73751 100644 --- a/app/models/validations/household_validations.rb +++ b/app/models/validations/household_validations.rb @@ -65,7 +65,7 @@ module Validations::HouseholdValidations record.errors.add :prevten, I18n.t("validations.household.prevten.non_temp_accommodation") end - if record.age1.present? && record.age1 > 19 && record.prevten == 13 + if record.age1.present? && record.age1 > 19 && record.previous_tenancy_was_foster_care? record.errors.add :prevten, I18n.t("validations.household.prevten.over_20_foster_care") record.errors.add :age1, I18n.t("validations.household.age.lead.over_20") end diff --git a/spec/models/validations/household_validations_spec.rb b/spec/models/validations/household_validations_spec.rb index dcd52e44c..b07e6adbb 100644 --- a/spec/models/validations/household_validations_spec.rb +++ b/spec/models/validations/household_validations_spec.rb @@ -570,7 +570,7 @@ RSpec.describe Validations::HouseholdValidations do expect(record.errors["prevten"]) .to include(match I18n.t("validations.household.prevten.over_20_foster_care")) expect(record.errors["age1"]) - .to include(match I18n.t("validations.household.age.lead.over_20")) + .to include(match I18n.t("validations.household.age.lead.over_20")) end end @@ -582,7 +582,7 @@ RSpec.describe Validations::HouseholdValidations do expect(record.errors["prevten"]) .to include(match I18n.t("validations.household.prevten.male_refuge")) expect(record.errors["sex1"]) - .to include(match I18n.t("validations.household.gender.male_refuge")) + .to include(match I18n.t("validations.household.gender.male_refuge")) end end @@ -594,7 +594,7 @@ RSpec.describe Validations::HouseholdValidations do expect(record.errors["prevten"]) .to include(match I18n.t("validations.household.prevten.internal_transfer", prevten: "")) expect(record.errors["referral"]) - .to include(match I18n.t("validations.household.referral.prevten_invalid", prevten: "")) + .to include(match I18n.t("validations.household.referral.prevten_invalid", prevten: "")) end it "cannot be 4, 10, 13, 19, 23, 24, 25, 26, 28, 29" do @@ -602,9 +602,9 @@ RSpec.describe Validations::HouseholdValidations do record.prevten = 4 household_validator.validate_previous_housing_situation(record) expect(record.errors["prevten"]) - .to include(match I18n.t("validations.household.prevten.internal_transfer", prevten: "")) + .to include(match I18n.t("validations.household.prevten.internal_transfer", prevten: "")) expect(record.errors["referral"]) - .to include(match I18n.t("validations.household.referral.prevten_invalid", prevten: "")) + .to include(match I18n.t("validations.household.referral.prevten_invalid", prevten: "")) end end end