diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index 71d54ad26..c9ac5e960 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -380,6 +380,11 @@ module Imports @logs_overridden << lettings_log.old_id %w[brent scharge pscharge supcharg tcharge].each { |name| attributes.delete(name) } save_lettings_log(attributes, previous_status) + elsif lettings_log.errors.of_kind?(:scharge, :outside_the_range) + @logger.warn("Log #{lettings_log.old_id}: Removing charges, because scharge is outside of the range/") + @logs_overridden << lettings_log.old_id + %w[brent scharge pscharge supcharg tcharge].each { |name| attributes.delete(name) } + save_lettings_log(attributes, previous_status) else @logger.error("Log #{lettings_log.old_id}: Failed to import") lettings_log.errors.each do |error| diff --git a/spec/services/imports/lettings_logs_import_service_spec.rb b/spec/services/imports/lettings_logs_import_service_spec.rb index 3c3b50565..0dcb1e888 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -643,6 +643,30 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and scharge is out of range" do + before do + lettings_log_xml.at_xpath("//xmlns:Q17").content = "1" + lettings_log_xml.at_xpath("//xmlns:Q18aii").content = "156" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Removing charges, because scharge is outside of the range/) + expect { lettings_log_service.send(:create_log, lettings_log_xml) } + .not_to raise_error + end + + it "clears out the charges answers" do + allow(logger).to receive(:warn) + + lettings_log_service.send(:create_log, lettings_log_xml) + lettings_log = LettingsLog.find_by(old_id: lettings_log_id) + + expect(lettings_log).not_to be_nil + expect(lettings_log.scharge).to be_nil + expect(lettings_log.tcharge).to be_nil + end + end + context "and the net income soft validation is triggered (net_income_value_check)" do before do lettings_log_xml.at_xpath("//xmlns:Q8a").content = "1 Weekly"