From b2dc92e4026ed5a4bbc8c12f3fad84c464668bad Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 2 Feb 2024 16:02:49 +0000 Subject: [PATCH] Remove soft grant validation for 2024 onwards --- app/models/validations/sales/soft_validations.rb | 1 + spec/models/validations/sales/soft_validations_spec.rb | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/app/models/validations/sales/soft_validations.rb b/app/models/validations/sales/soft_validations.rb index fce544754..aa7394f9e 100644 --- a/app/models/validations/sales/soft_validations.rb +++ b/app/models/validations/sales/soft_validations.rb @@ -117,6 +117,7 @@ module Validations::Sales::SoftValidations def grant_outside_common_range? return unless grant + return unless saledate && !form.start_year_after_2024? !grant.between?(9_000, 16_000) end diff --git a/spec/models/validations/sales/soft_validations_spec.rb b/spec/models/validations/sales/soft_validations_spec.rb index 8718eee86..9cfe9e18b 100644 --- a/spec/models/validations/sales/soft_validations_spec.rb +++ b/spec/models/validations/sales/soft_validations_spec.rb @@ -660,18 +660,28 @@ RSpec.describe Validations::Sales::SoftValidations do describe "#grant_outside_common_range?" do it "returns true if grant is below 9000" do record.grant = 1_000 + record.saledate = Time.zone.local(2024, 1, 1) expect(record).to be_grant_outside_common_range end it "returns true if grant is above 16000" do record.grant = 100_000 + record.saledate = Time.zone.local(2024, 1, 1) expect(record).to be_grant_outside_common_range end it "returns false if grant is within expected range" do record.grant = 10_000 + record.saledate = Time.zone.local(2024, 1, 1) + + expect(record).not_to be_grant_outside_common_range + end + + it "returns false for logs after 2024" do + record.grant = 100_000 + record.saledate = Time.zone.local(2025, 1, 1) expect(record).not_to be_grant_outside_common_range end