From 93428e6d5ab141192590aaef67df68ebe39686f0 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 28 Mar 2023 09:55:34 +0100 Subject: [PATCH] Clear beds if over max --- .../validations/property_validations.rb | 2 +- .../imports/lettings_logs_import_service.rb | 5 +++++ .../lettings_logs_import_service_spec.rb | 22 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb index dafe6f6dd..540f237ae 100644 --- a/app/models/validations/property_validations.rb +++ b/app/models/validations/property_validations.rb @@ -72,7 +72,7 @@ module Validations::PropertyValidations end if record.beds.present? && record.beds > 12 - record.errors.add :beds, I18n.t("validations.property.beds.over_max") + record.errors.add :beds, :over_max, message: I18n.t("validations.property.beds.over_max") end end diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index d6a6efbd4..d3899d73f 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -344,6 +344,11 @@ module Imports attributes.delete("age2") attributes.delete("age2_known") save_lettings_log(attributes, previous_status) + elsif lettings_log.errors.of_kind?(:beds, :over_max) + @logger.warn("Log #{lettings_log.old_id}: Removing number of bedrooms because it is over the max/") + @logs_overridden << lettings_log.old_id + attributes.delete("beds") + 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 4fc379b31..92189c6e8 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -465,6 +465,28 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and beds over the max" do + before do + lettings_log_xml.at_xpath("//xmlns:Q22").content = "13" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Removing number of bedrooms because it is over the max/) + 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.beds).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"