diff --git a/app/models/validations/financial_validations.rb b/app/models/validations/financial_validations.rb index 622adc117..436c3a2c0 100644 --- a/app/models/validations/financial_validations.rb +++ b/app/models/validations/financial_validations.rb @@ -174,7 +174,7 @@ private maximum = CHARGE_MAXIMUMS.dig(charge, PROVIDER_TYPE[provider_type], NEEDSTYPE_VALUES[record.needstype]) if maximum.present? && record[:period].present? && record[charge].present? && !weekly_value_in_range(record, charge, 0.0, maximum) - record.errors.add charge, I18n.t("validations.financial.rent.#{charge}.#{PROVIDER_TYPE[provider_type]}.#{NEEDSTYPE_VALUES[record.needstype]}") + record.errors.add charge, :outside_the_range, message: I18n.t("validations.financial.rent.#{charge}.#{PROVIDER_TYPE[provider_type]}.#{NEEDSTYPE_VALUES[record.needstype]}") end end end diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index 4396bdec9..61e413d2f 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -378,6 +378,15 @@ module Imports @logs_overridden << lettings_log.old_id attributes.delete("referral") save_lettings_log(attributes, previous_status) + elsif lettings_log.errors.of_kind?(:pscharge, :outside_the_range) + @logger.warn("Log #{lettings_log.old_id}: Removing charges, because pscharge 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 fd66756a6..e5e822937 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -595,6 +595,30 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and pscharge is out of range" do + before do + lettings_log_xml.at_xpath("//xmlns:Q17").content = "1" + lettings_log_xml.at_xpath("//xmlns:Q18aiii").content = "36" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Removing charges, because pscharge 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.pscharge).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"