From e9ff793de5776ec8e256a2c4786367fe6c581aaf Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 24 Mar 2023 12:09:27 +0000 Subject: [PATCH] Clear mortgage if it's 0 --- .../sales/financial_validations.rb | 2 +- .../imports/sales_logs_import_service.rb | 5 ++++ .../imports/sales_logs_import_service_spec.rb | 24 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb index 8f81aa117..2cd06b9ba 100644 --- a/app/models/validations/sales/financial_validations.rb +++ b/app/models/validations/sales/financial_validations.rb @@ -37,7 +37,7 @@ module Validations::Sales::FinancialValidations end def validate_mortgage(record) - record.errors.add :mortgage, I18n.t("validations.financial.mortgage") if record.mortgage_used? && record.mortgage&.zero? + record.errors.add :mortgage, :cannot_be_0, message: I18n.t("validations.financial.mortgage") if record.mortgage_used? && record.mortgage&.zero? end def validate_cash_discount(record) diff --git a/app/services/imports/sales_logs_import_service.rb b/app/services/imports/sales_logs_import_service.rb index e6f735b3e..4d26639da 100644 --- a/app/services/imports/sales_logs_import_service.rb +++ b/app/services/imports/sales_logs_import_service.rb @@ -225,6 +225,11 @@ module Imports attributes.delete("postcode_full") attributes["pcodenk"] = attributes["la"].present? ? 1 : nil save_sales_log(attributes, previous_status) + elsif sales_log.errors.of_kind?(:mortgage, :cannot_be_0) + @logger.warn("Log #{sales_log.old_id}: Removing mortgage because it cannot be 0") + @logs_overridden << sales_log.old_id + attributes.delete("mortgage") + 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 f0168ba11..3ab0c4a97 100644 --- a/spec/services/imports/sales_logs_import_service_spec.rb +++ b/spec/services/imports/sales_logs_import_service_spec.rb @@ -637,6 +637,30 @@ RSpec.describe Imports::SalesLogsImportService do end end + context "when mortgage value is 0" do + let(:sales_log_id) { "shared_ownership_sales_log" } + + before do + sales_log_xml.at_xpath("//xmlns:CALCMORT").content = "0" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Removing mortgage because it cannot be 0/) + expect { sales_log_service.send(:create_log, sales_log_xml) } + .not_to raise_error + end + + it "clears out the referral answer" 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.mortgage).to be_nil + end + end + context "and it has an invalid income" do let(:sales_log_id) { "shared_ownership_sales_log" }