diff --git a/app/helpers/collection_time_helper.rb b/app/helpers/collection_time_helper.rb index ed0fdf839..34426bab2 100644 --- a/app/helpers/collection_time_helper.rb +++ b/app/helpers/collection_time_helper.rb @@ -1,15 +1,15 @@ module CollectionTimeHelper - def collection_start_year(date) + def collection_start_year_for_date(date) window_end_date = Time.zone.local(date.year, 4, 1) date < window_end_date ? date.year - 1 : date.year end def current_collection_start_year - collection_start_year(Time.zone.now) + collection_start_year_for_date(Time.zone.now) end def collection_start_date(date) - Time.zone.local(collection_start_year(date), 4, 1) + Time.zone.local(collection_start_year_for_date(date), 4, 1) end def date_mid_collection_year_formatted(date) @@ -22,7 +22,7 @@ module CollectionTimeHelper end def collection_end_date(date) - Time.zone.local(collection_start_year(date) + 1, 3, 31).end_of_day + Time.zone.local(collection_start_year_for_date(date) + 1, 3, 31).end_of_day end def current_collection_end_date diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb index e4714e81a..42dbde2a5 100644 --- a/app/models/validations/sales/sale_information_validations.rb +++ b/app/models/validations/sales/sale_information_validations.rb @@ -48,7 +48,7 @@ module Validations::Sales::SaleInformationValidations end def validate_discounted_ownership_value(record) - return unless record.saledate && collection_start_year(record.saledate) >= 2024 + return unless record.saledate && collection_start_year_for_date(record.saledate) >= 2024 return unless record.value && record.deposit && record.ownershipsch return unless record.mortgage || record.mortgageused == 2 return unless record.discount || record.grant || record.type == 29 diff --git a/spec/helpers/collection_time_helper_spec.rb b/spec/helpers/collection_time_helper_spec.rb index 1537926ab..e9ec52292 100644 --- a/spec/helpers/collection_time_helper_spec.rb +++ b/spec/helpers/collection_time_helper_spec.rb @@ -50,7 +50,7 @@ RSpec.describe CollectionTimeHelper do let(:now) { Time.utc(2022, 8, 3) } it "returns the same year as the current start year" do - expect(collection_start_year(now)).to eq(2022) + expect(collection_start_year_for_date(now)).to eq(2022) end it "returns the correct current start date" do @@ -66,7 +66,7 @@ RSpec.describe CollectionTimeHelper do let(:now) { Time.utc(2022, 2, 3) } it "returns the previous year as the current start year" do - expect(collection_start_year(now)).to eq(2021) + expect(collection_start_year_for_date(now)).to eq(2021) end it "returns the correct current start date" do