Browse Source

feat: undo validation file tweaks as shared/specific overlap could do with a more general refactor

pull/1570/head
natdeanlewissoftwire 3 years ago
parent
commit
6251fb2b97
  1. 1
      app/models/lettings_log.rb
  2. 2
      app/models/sales_log.rb
  3. 9
      app/models/validations/local_authority_validations.rb
  4. 8
      app/models/validations/shared_validations.rb

1
app/models/lettings_log.rb

@ -7,6 +7,7 @@ class LettingsLogValidator < ActiveModel::Validator
include Validations::FinancialValidations include Validations::FinancialValidations
include Validations::TenancyValidations include Validations::TenancyValidations
include Validations::DateValidations include Validations::DateValidations
include Validations::LocalAuthorityValidations
def validate(record) def validate(record)
validation_methods = public_methods.select { |method| method.starts_with?("validate_") } validation_methods = public_methods.select { |method| method.starts_with?("validate_") }

2
app/models/sales_log.rb

@ -2,10 +2,10 @@ class SalesLogValidator < ActiveModel::Validator
include Validations::Sales::SetupValidations include Validations::Sales::SetupValidations
include Validations::Sales::HouseholdValidations include Validations::Sales::HouseholdValidations
include Validations::Sales::PropertyValidations include Validations::Sales::PropertyValidations
include Validations::SharedValidations
include Validations::Sales::FinancialValidations include Validations::Sales::FinancialValidations
include Validations::Sales::SaleInformationValidations include Validations::Sales::SaleInformationValidations
include Validations::SharedValidations include Validations::SharedValidations
include Validations::LocalAuthorityValidations
def validate(record) def validate(record)
validation_methods = public_methods.select { |method| method.starts_with?("validate_") } validation_methods = public_methods.select { |method| method.starts_with?("validate_") }

9
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

8
app/models/validations/shared_validations.rb

@ -64,14 +64,6 @@ module Validations::SharedValidations
end end
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) def location_during_startdate_validation(record, field)
location_inactive_status = inactive_status(record.startdate, record.location) location_inactive_status = inactive_status(record.startdate, record.location)

Loading…
Cancel
Save