Browse Source

feat: add postcodenk error so can clear on validation

pull/1570/head
natdeanlewissoftwire 3 years ago
parent
commit
5ba13880df
  1. 3
      app/models/log.rb
  2. 4
      app/models/validations/local_authority_validations.rb
  3. 2
      app/services/bulk_upload/processor.rb

3
app/models/log.rb

@ -102,9 +102,6 @@ class Log < ApplicationRecord
next if setup_ids.include?(error.attribute.to_s)
public_send("#{error.attribute}=", nil)
form.conditional_question_conditions.map { |c| c[:from] if c[:to] == error.attribute.to_s }.compact.each do |conditional_attribute|
public_send("#{conditional_attribute}=", nil)
end
end
end

4
app/models/validations/local_authority_validations.rb

@ -2,8 +2,8 @@ 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, error_message
record.errors.add :ppostcode_full, I18n.t("validations.postcode")
record.errors.add :ppcodenk, I18n.t("validations.postcode")
end
end
end

2
app/services/bulk_upload/processor.rb

@ -14,12 +14,10 @@ class BulkUpload::Processor
if validator.any_setup_errors?
send_setup_errors_mail
# emulate rescue_validation_or_raise here
elsif validator.create_logs?
create_logs
if created_logs_but_incompleted?
send_how_fix_upload_mail
elsif created_logs_and_all_completed?

Loading…
Cancel
Save