From 5ba13880df396872a0edd3b8900d7552e0784912 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Fri, 21 Apr 2023 11:24:54 +0100 Subject: [PATCH] feat: add postcodenk error so can clear on validation --- app/models/log.rb | 3 --- app/models/validations/local_authority_validations.rb | 4 ++-- app/services/bulk_upload/processor.rb | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/models/log.rb b/app/models/log.rb index 54596f733..4ee748eda 100644 --- a/app/models/log.rb +++ b/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 diff --git a/app/models/validations/local_authority_validations.rb b/app/models/validations/local_authority_validations.rb index c895880bd..f3d57c563 100644 --- a/app/models/validations/local_authority_validations.rb +++ b/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 diff --git a/app/services/bulk_upload/processor.rb b/app/services/bulk_upload/processor.rb index 23b28c28e..66c6b9d10 100644 --- a/app/services/bulk_upload/processor.rb +++ b/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?