From 2bee5d2d8166501fff2a6f2ba8c38de277fcbae6 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 28 Mar 2023 11:23:31 +0100 Subject: [PATCH] Clear charges if scharge is under 0 --- app/models/validations/shared_validations.rb | 2 +- .../imports/lettings_logs_import_service.rb | 10 +++++++ .../lettings_logs_import_service_spec.rb | 28 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb index d4c7a9d98..1d60ae127 100644 --- a/app/models/validations/shared_validations.rb +++ b/app/models/validations/shared_validations.rb @@ -122,7 +122,7 @@ private if min && max record.errors.add question.id.to_sym, :outside_the_range, message: I18n.t("validations.numeric.within_range", field:, min:, max:) elsif min - record.errors.add question.id.to_sym, I18n.t("validations.numeric.above_min", field:, min:) + record.errors.add question.id.to_sym, :under_min, message: I18n.t("validations.numeric.above_min", field:, min:) end end end diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index d741503c2..786dae8f9 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -356,6 +356,16 @@ module Imports attributes.delete("scharge") attributes.delete("pscharge") attributes.delete("supcharg") + attributes.delete("tcharge") + save_lettings_log(attributes, previous_status) + elsif lettings_log.errors.of_kind?(:scharge, :under_min) + @logger.warn("Log #{lettings_log.old_id}: Removing charges, because service charge is under 0/") + @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") diff --git a/spec/services/imports/lettings_logs_import_service_spec.rb b/spec/services/imports/lettings_logs_import_service_spec.rb index 9c3f35602..2b0980461 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -517,6 +517,34 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and scharge is under 0" do + let(:lettings_log_id) { "0b4a68df-30cc-474a-93c0-a56ce8fdad3b" } + + before do + lettings_log_xml.at_xpath("//xmlns:Q18aii").content = "-1" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Removing charges, because service charge is under 0/) + expect { lettings_log_service.send(:create_log, lettings_log_xml) } + .not_to raise_error + end + + it "clears out the referral answer" 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.brent).to be_nil + expect(lettings_log.scharge).to be_nil + expect(lettings_log.pscharge).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"