From 1f618f79c734ba99f4035b693dc2fca8971da417 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 28 Mar 2023 14:54:46 +0100 Subject: [PATCH] Clear charges if supcharg is outside the range --- .../imports/lettings_logs_import_service.rb | 9 +++++++ .../lettings_logs_import_service_spec.rb | 24 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index 61e413d2f..1a15e4bfc 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -387,6 +387,15 @@ module Imports attributes.delete("supcharg") attributes.delete("tcharge") save_lettings_log(attributes, previous_status) + elsif lettings_log.errors.of_kind?(:supcharg, :outside_the_range) + @logger.warn("Log #{lettings_log.old_id}: Removing charges, because supcharg is outside of the range/") + @logs_overridden << lettings_log.old_id + attributes.delete("brent") + attributes.delete("scharge") + attributes.delete("pscharge") + attributes.delete("supcharg") + attributes.delete("tcharge") + 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 e5e822937..3c3b50565 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -619,6 +619,30 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and supcharg is out of range" do + before do + lettings_log_xml.at_xpath("//xmlns:Q17").content = "1" + lettings_log_xml.at_xpath("//xmlns:Q18aiv").content = "46" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Removing charges, because supcharg 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.supcharg).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"