From a37cb3c2664093da5efbc38bca36f1cdc6136833 Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 12 Dec 2022 15:41:39 +0000 Subject: [PATCH] Remove child vlidation because buyer cannot be a child --- app/models/sales_log.rb | 4 ---- .../validations/sales/financial_validations.rb | 4 +--- .../sales/financial_validations_spec.rb | 16 ---------------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 651a34343..9986523cb 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -63,10 +63,6 @@ class SalesLog < Log false end - def buyer_1_child? - ecstat1 == 9 - end - LONDON_BOROUGHS = %w[ E09000001 E09000033 diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb index 2bfa37c05..04f6a1d06 100644 --- a/app/models/validations/sales/financial_validations.rb +++ b/app/models/validations/sales/financial_validations.rb @@ -4,9 +4,7 @@ module Validations::Sales::FinancialValidations def validate_income1(record) if record.ecstat1 && record.income1 && record.ownershipsch == 1 - if record.buyer_1_child? && record.income1.positive? - record.errors.add :income1, I18n.t("validations.financial.income1.child_income") - elsif record.london_property? + 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 elsif record.income1 > 80_000 record.errors.add :income1, I18n.t("validations.financial.income1.over_hard_max", hard_max: 80_000) diff --git a/spec/models/validations/sales/financial_validations_spec.rb b/spec/models/validations/sales/financial_validations_spec.rb index 22533f331..b736878dc 100644 --- a/spec/models/validations/sales/financial_validations_spec.rb +++ b/spec/models/validations/sales/financial_validations_spec.rb @@ -26,14 +26,6 @@ RSpec.describe Validations::Sales::FinancialValidations do financial_validator.validate_income1(record) expect(record.errors["income1"]).to be_empty end - - it "validates income correctly if the ecstat is child" do - record.income1 = 1 - record.ecstat1 = 9 - financial_validator.validate_income1(record) - expect(record.errors["income1"]) - .to include(match I18n.t("validations.financial.income1.child_income")) - end end context "and a london borough" do @@ -58,14 +50,6 @@ RSpec.describe Validations::Sales::FinancialValidations do financial_validator.validate_income1(record) expect(record.errors["income1"]).to be_empty end - - it "validates income correctly if the ecstat is child" do - record.income1 = 1 - record.ecstat1 = 9 - financial_validator.validate_income1(record) - expect(record.errors["income1"]) - .to include(match I18n.t("validations.financial.income1.child_income")) - end end end end