From d629677cc4186842501893a8efee1fc650390de7 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 23 Mar 2023 11:50:12 +0000 Subject: [PATCH] Clear offered if the value is above the maximum of 20 --- .../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 2e53b8385..dafe6f6dd 100644 --- a/app/models/validations/property_validations.rb +++ b/app/models/validations/property_validations.rb @@ -16,7 +16,7 @@ module Validations::PropertyValidations end if record.offered.negative? || record.offered > 20 - record.errors.add :offered, I18n.t("validations.property.offered.relet_number") + record.errors.add :offered, :over_20, message: I18n.t("validations.property.offered.relet_number") end end diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index a39f4f4f0..9382f4a6a 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -322,6 +322,11 @@ module Imports @logs_overridden << lettings_log.old_id attributes.delete("joint") save_lettings_log(attributes, previous_status) + elsif lettings_log.errors.of_kind?(:offered, :over_20) + @logger.warn("Log #{lettings_log.old_id}: Removing offered as the value is above the maximum of 20") + @logs_overridden << lettings_log.old_id + attributes.delete("offered") + 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 6afe4e0d3..12117e96f 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -396,6 +396,28 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and the number the property was relet is over 20" do + before do + lettings_log_xml.at_xpath("//xmlns:Q20").content = "25" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Removing offered as the value is above the maximum of 20/) + 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.offered).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"