From 6251fb2b97ca73d531fd94badd4c85261808afee Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 11 May 2023 11:34:24 +0100 Subject: [PATCH] feat: undo validation file tweaks as shared/specific overlap could do with a more general refactor --- app/models/lettings_log.rb | 1 + app/models/sales_log.rb | 2 +- app/models/validations/local_authority_validations.rb | 9 +++++++++ app/models/validations/shared_validations.rb | 8 -------- 4 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 app/models/validations/local_authority_validations.rb diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index 13f4ef148..097729599 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -7,6 +7,7 @@ class LettingsLogValidator < ActiveModel::Validator include Validations::FinancialValidations include Validations::TenancyValidations include Validations::DateValidations + include Validations::LocalAuthorityValidations def validate(record) validation_methods = public_methods.select { |method| method.starts_with?("validate_") } diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index db31edfbe..8002ac815 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -2,10 +2,10 @@ class SalesLogValidator < ActiveModel::Validator include Validations::Sales::SetupValidations include Validations::Sales::HouseholdValidations include Validations::Sales::PropertyValidations - include Validations::SharedValidations include Validations::Sales::FinancialValidations include Validations::Sales::SaleInformationValidations include Validations::SharedValidations + include Validations::LocalAuthorityValidations def validate(record) validation_methods = public_methods.select { |method| method.starts_with?("validate_") } diff --git a/app/models/validations/local_authority_validations.rb b/app/models/validations/local_authority_validations.rb new file mode 100644 index 000000000..3bdd79166 --- /dev/null +++ b/app/models/validations/local_authority_validations.rb @@ -0,0 +1,9 @@ +module Validations::LocalAuthorityValidations + def validate_previous_accommodation_postcode(record) + postcode = record.ppostcode_full + if record.previous_postcode_known? && (postcode.blank? || !postcode.match(POSTCODE_REGEXP)) + error_message = I18n.t("validations.postcode") + record.errors.add :ppostcode_full, :wrong_format, message: error_message + end + end +end diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb index 950afb617..6a32563a7 100644 --- a/app/models/validations/shared_validations.rb +++ b/app/models/validations/shared_validations.rb @@ -64,14 +64,6 @@ module Validations::SharedValidations end end - def validate_previous_accommodation_postcode(record) - postcode = record.ppostcode_full - if record.previous_postcode_known? && (postcode.blank? || !postcode.match(POSTCODE_REGEXP)) - error_message = I18n.t("validations.postcode") - record.errors.add :ppostcode_full, :wrong_format, message: error_message - end - end - def location_during_startdate_validation(record, field) location_inactive_status = inactive_status(record.startdate, record.location)