Only run validate_discounted_ownership_value as a hard validation on and after 24/25

app/models/validations/sales/sale_information_validations.rb

@@ -1,4 +1,6 @@
 module Validations::Sales::SaleInformationValidations
+  include CollectionTimeHelper
+
   def validate_practical_completion_date_before_saledate(record)
     return if record.saledate.blank? || record.hodate.blank?
 
@@ -45,6 +47,7 @@ module Validations::Sales::SaleInformationValidations
   end
 
   def validate_discounted_ownership_value(record)
+    return unless record.saledate && collection_start_year(record.saledate) <= 2023
     return unless record.value && record.deposit && record.ownershipsch
     return unless record.mortgage || record.mortgageused == 2
     return unless record.discount || record.grant || record.type == 29

spec/models/validations/sales/sale_information_validations_spec.rb

@@ -226,8 +226,9 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
   end
 
   describe "#validate_discounted_ownership_value" do
+    context "when sale is on or after 24/25 collection window" do
       context "when grant is routed to" do
-      let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, deposit: 5_000, value: 30_000, ownershipsch: 2, type: 8) }
+        let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, deposit: 5_000, value: 30_000, ownershipsch: 2, type: 8, saledate: Time.zone.local(2023, 4, 3)) }
 
         context "and not provided" do
           before do
@@ -261,7 +262,7 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
       end
 
       context "when discount is routed to" do
-      let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, deposit: 5_000, value: 30_000, ownershipsch: 2, type: 9) }
+        let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, deposit: 5_000, value: 30_000, ownershipsch: 2, type: 9, saledate: Time.zone.local(2023, 4, 3)) }
 
         context "and not provided" do
           before do
@@ -295,7 +296,7 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
       end
 
       context "when neither discount nor grant is routed to" do
-      let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, value: 30_000, ownershipsch: 2, type: 29) }
+        let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, value: 30_000, ownershipsch: 2, type: 29, saledate: Time.zone.local(2023, 4, 3)) }
 
         it "adds an error if mortgage and deposit total does not equal market value" do
           record.deposit = 2_000
@@ -315,7 +316,7 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
       end
 
       context "when mortgage is routed to" do
-      let(:record) { FactoryBot.build(:sales_log, mortgageused: 1, deposit: 5_000, grant: 3_000, value: 20_000, discount: 10, ownershipsch: 2) }
+        let(:record) { FactoryBot.build(:sales_log, mortgageused: 1, deposit: 5_000, grant: 3_000, value: 20_000, discount: 10, ownershipsch: 2, saledate: Time.zone.local(2023, 4, 3)) }
 
         context "and not provided" do
           before do
@@ -349,7 +350,7 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
       end
 
       context "when mortgage is not routed to" do
-      let(:record) { FactoryBot.build(:sales_log, mortgageused: 2, deposit: 5_000, grant: 3_000, value: 20_000, discount: 10, ownershipsch: 2) }
+        let(:record) { FactoryBot.build(:sales_log, mortgageused: 2, deposit: 5_000, grant: 3_000, value: 20_000, discount: 10, ownershipsch: 2, saledate: Time.zone.local(2023, 4, 3)) }
 
         it "adds an error if grant and deposit total does not equal market value - discount" do
           sale_information_validator.validate_discounted_ownership_value(record)
@@ -368,7 +369,18 @@ RSpec.describe Validations::Sales::SaleInformationValidations do
       end
 
       context "when ownership is not discounted" do
-      let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, deposit: 5_000, grant: 3_000, value: 20_000, discount: 10, ownershipsch: 1) }
+        let(:record) { FactoryBot.build(:sales_log, mortgage: 10_000, deposit: 5_000, grant: 3_000, value: 20_000, discount: 10, ownershipsch: 1, saledate: Time.zone.local(2023, 4, 3)) }
+
+        it "does not add an error" do
+          sale_information_validator.validate_discounted_ownership_value(record)
+
+          expect(record.errors).to be_empty
+        end
+      end
+    end
+
+    context "when sale is before 24/25 collection" do
+      let(:record) { FactoryBot.build(:sales_log, mortgageused: 2, deposit: 5_000, grant: 3_000, value: 20_000, discount: 10, ownershipsch: 2, saledate: Time.zone.local(2024, 4, 4)) }
 
       it "does not add an error" do
         sale_information_validator.validate_discounted_ownership_value(record)