From 5c86ad442c3e11f7d56b13f7fe9c60f915d1629a Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:44:02 +0000 Subject: [PATCH] Handle nil --- app/models/validations/property_validations.rb | 2 +- app/models/validations/sales/property_validations.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb index e13de5272..f051a65db 100644 --- a/app/models/validations/property_validations.rb +++ b/app/models/validations/property_validations.rb @@ -50,7 +50,7 @@ module Validations::PropertyValidations end def validate_la_in_england(record) - return unless record.form.start_year_2025_or_later? || (record.startdate_changed? && record.startdate_was.year == 2025 && record.startdate.year == 2024) + return unless record.form.start_year_2025_or_later? || (record.startdate_changed? && record.startdate_was&.year == 2025 && record.startdate.year == 2024) if record.is_general_needs? return unless record.la diff --git a/app/models/validations/sales/property_validations.rb b/app/models/validations/sales/property_validations.rb index de0816060..af576c260 100644 --- a/app/models/validations/sales/property_validations.rb +++ b/app/models/validations/sales/property_validations.rb @@ -40,7 +40,7 @@ module Validations::Sales::PropertyValidations end def validate_la_in_england(record) - return unless record.form.start_year_2025_or_later? || (record.saledate_changed? && record.saledate_was.year == 2025 && record.saledate.year == 2024) + return unless record.form.start_year_2025_or_later? || (record.saledate_changed? && record.saledate_was&.year == 2025 && record.saledate.year == 2024) return unless record.la return if record.la.in?(LocalAuthority.england.pluck(:code))