diff --git a/app/models/validations/sales/financial_validations.rb b/app/models/validations/sales/financial_validations.rb index 61772be93..24c031a1f 100644 --- a/app/models/validations/sales/financial_validations.rb +++ b/app/models/validations/sales/financial_validations.rb @@ -101,7 +101,7 @@ module Validations::Sales::FinancialValidations record.errors.add :equity, I18n.t("validations.financial.equity.under_min", min_equity: range.min) elsif record.equity > range.max record.errors.add :type, I18n.t("validations.financial.equity.over_max", max_equity: range.max) - record.errors.add :equity, I18n.t("validations.financial.equity.over_max", max_equity: range.max) + record.errors.add :equity, :over_max, message: I18n.t("validations.financial.equity.over_max", max_equity: range.max) end end diff --git a/app/services/imports/sales_logs_import_service.rb b/app/services/imports/sales_logs_import_service.rb index c2844e019..5f5f50571 100644 --- a/app/services/imports/sales_logs_import_service.rb +++ b/app/services/imports/sales_logs_import_service.rb @@ -214,6 +214,11 @@ module Imports @logs_overridden << sales_log.old_id attributes.delete("income1") save_sales_log(attributes, previous_status) + elsif sales_log.errors.of_kind?(:equity, :over_max) + @logger.warn("Log #{sales_log.old_id}: Removing equity as the equity is invalid") + @logs_overridden << sales_log.old_id + attributes.delete("equity") + 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 e41ffabaf..c0e32d48c 100644 --- a/spec/services/imports/sales_logs_import_service_spec.rb +++ b/spec/services/imports/sales_logs_import_service_spec.rb @@ -439,6 +439,30 @@ RSpec.describe Imports::SalesLogsImportService do end end + context "and it has a record with invalid equity" do + let(:sales_log_id) { "shared_ownership_sales_log" } + + before do + sales_log_xml.at_xpath("//xmlns:Q23Equity").content = "78" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Log shared_ownership_sales_log: Removing equity as the equity is invalid/) + expect { sales_log_service.send(:create_log, sales_log_xml) } + .not_to raise_error + end + + it "clears out the invalid answers" 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.equity).to be_nil + end + end + context "and setup field has validation error in incomplete log" do let(:sales_log_id) { "shared_ownership_sales_log" }