From 545a71b11164a96c5a93ecd63eac213c3084a5f6 Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 23 Jan 2023 10:09:34 +0000 Subject: [PATCH] Add income error to ownership type and ecstat fields --- .../validations/sales/financial_validations.rb | 4 ++++ .../validations/sales/financial_validations_spec.rb | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb index 116ecf301..d4662dd49 100644 --- a/app/models/validations/sales/financial_validations.rb +++ b/app/models/validations/sales/financial_validations.rb @@ -6,8 +6,12 @@ module Validations::Sales::FinancialValidations if record.ecstat1 && record.income1 && record.ownershipsch == 1 if record.london_property? record.errors.add :income1, I18n.t("validations.financial.income1.over_hard_max", hard_max: 90_000) if record.income1 > 90_000 + record.errors.add :ecstat1, I18n.t("validations.financial.income1.over_hard_max", hard_max: 90_000) if record.income1 > 90_000 + record.errors.add :ownershipsch, I18n.t("validations.financial.income1.over_hard_max", hard_max: 90_000) if record.income1 > 90_000 elsif record.income1 > 80_000 record.errors.add :income1, I18n.t("validations.financial.income1.over_hard_max", hard_max: 80_000) + record.errors.add :ecstat1, I18n.t("validations.financial.income1.over_hard_max", hard_max: 80_000) + record.errors.add :ownershipsch, I18n.t("validations.financial.income1.over_hard_max", hard_max: 80_000) end end end diff --git a/spec/models/validations/sales/financial_validations_spec.rb b/spec/models/validations/sales/financial_validations_spec.rb index 7b5b8868b..6daccb496 100644 --- a/spec/models/validations/sales/financial_validations_spec.rb +++ b/spec/models/validations/sales/financial_validations_spec.rb @@ -17,6 +17,10 @@ RSpec.describe Validations::Sales::FinancialValidations do financial_validator.validate_income1(record) expect(record.errors["income1"]) .to include(match I18n.t("validations.financial.income1.over_hard_max", hard_max: 80_000)) + expect(record.errors["ecstat1"]) + .to include(match I18n.t("validations.financial.income1.over_hard_max", hard_max: 80_000)) + expect(record.errors["ownershipsch"]) + .to include(match I18n.t("validations.financial.income1.over_hard_max", hard_max: 80_000)) end end @@ -25,6 +29,8 @@ RSpec.describe Validations::Sales::FinancialValidations do record.ecstat1 = 1 financial_validator.validate_income1(record) expect(record.errors["income1"]).to be_empty + expect(record.errors["ecstat1"]).to be_empty + expect(record.errors["ownershipsch"]).to be_empty end end @@ -41,6 +47,10 @@ RSpec.describe Validations::Sales::FinancialValidations do financial_validator.validate_income1(record) expect(record.errors["income1"]) .to include(match I18n.t("validations.financial.income1.over_hard_max", hard_max: 90_000)) + expect(record.errors["ecstat1"]) + .to include(match I18n.t("validations.financial.income1.over_hard_max", hard_max: 90_000)) + expect(record.errors["ownershipsch"]) + .to include(match I18n.t("validations.financial.income1.over_hard_max", hard_max: 90_000)) end end @@ -49,6 +59,8 @@ RSpec.describe Validations::Sales::FinancialValidations do record.ecstat1 = 1 financial_validator.validate_income1(record) expect(record.errors["income1"]).to be_empty + expect(record.errors["ecstat1"]).to be_empty + expect(record.errors["ownershipsch"]).to be_empty end end end