From 697898c47ab60ea93805599c391f5cb86b93e47d Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 22 Mar 2023 08:39:27 +0000 Subject: [PATCH] Use LA instead of postcode if postcode is in invalid format --- app/models/validations/shared_validations.rb | 2 +- .../imports/sales_logs_import_service.rb | 6 ++++ .../imports/sales_logs_import_service_spec.rb | 29 ++++++++++++++++++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb index 32a8b22bd..e0f93515c 100644 --- a/app/models/validations/shared_validations.rb +++ b/app/models/validations/shared_validations.rb @@ -38,7 +38,7 @@ module Validations::SharedValidations postcode = record.postcode_full if record.postcode_known? && (postcode.blank? || !postcode.match(POSTCODE_REGEXP)) error_message = I18n.t("validations.postcode") - record.errors.add :postcode_full, error_message + record.errors.add :postcode_full, :wrong_format, message: error_message end end diff --git a/app/services/imports/sales_logs_import_service.rb b/app/services/imports/sales_logs_import_service.rb index f79f05cf1..cf0cf416d 100644 --- a/app/services/imports/sales_logs_import_service.rb +++ b/app/services/imports/sales_logs_import_service.rb @@ -219,6 +219,12 @@ module Imports @logs_overridden << sales_log.old_id attributes.delete("equity") save_sales_log(attributes, previous_status) + elsif sales_log.errors.of_kind?(:postcode_full, :wrong_format) + @logger.warn("Log #{sales_log.old_id}: Removing postcode as the postcode is invalid") + @logs_overridden << sales_log.old_id + attributes.delete("postcode_full") + attributes["pcodenk"] = attributes["la"].present? ? 1 : nil + save_sales_log(attributes, previous_status) else @logger.error("Log #{sales_log.old_id}: Failed to import") sales_log.errors.each do |error| diff --git a/spec/services/imports/sales_logs_import_service_spec.rb b/spec/services/imports/sales_logs_import_service_spec.rb index 928b8db7a..5ce2d561a 100644 --- a/spec/services/imports/sales_logs_import_service_spec.rb +++ b/spec/services/imports/sales_logs_import_service_spec.rb @@ -487,6 +487,33 @@ RSpec.describe Imports::SalesLogsImportService do end end + context "and it has a record with postcode in invalid format" do + let(:sales_log_id) { "shared_ownership_sales_log" } + + before do + sales_log_xml.at_xpath("//xmlns:Q14Postcode").content = "L3132AF" + sales_log_xml.at_xpath("//xmlns:Q14ONSLACode").content = "E07000223" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Log shared_ownership_sales_log: Removing postcode as the postcode is invalid/) + expect { sales_log_service.send(:create_log, sales_log_xml) } + .not_to raise_error + end + + it "clears out the invalid answers and sets correct la" do + allow(logger).to receive(:warn) + + sales_log_service.send(:create_log, sales_log_xml) + sales_log = SalesLog.find_by(old_id: sales_log_id) + + expect(sales_log).not_to be_nil + expect(sales_log.postcode_full).to be_nil + expect(sales_log.pcodenk).to eq(1) # not known + expect(sales_log.la).to eq("E07000223") # not known + end + end + context "and setup field has validation error in incomplete log" do let(:sales_log_id) { "shared_ownership_sales_log" } @@ -549,7 +576,7 @@ RSpec.describe Imports::SalesLogsImportService do end it "intercepts the relevant validation error" do - expect(logger).to receive(:warn).with(/Enter a postcode in the correct format, for example AA1 1AA/) + expect(logger).to receive(:warn).with(/Removing field postcode_full from log triggering validation: wrong_format/) expect { sales_log_service.send(:create_log, sales_log_xml) } .not_to raise_error end