diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb index 540f237ae..d2b6d2a0b 100644 --- a/app/models/validations/property_validations.rb +++ b/app/models/validations/property_validations.rb @@ -36,7 +36,7 @@ module Validations::PropertyValidations if record.is_relet_to_temp_tenant? && REFERRAL_INVALID_TMP.include?(record.referral) record.errors.add :rsnvac, I18n.t("validations.property.rsnvac.referral_invalid") - record.errors.add :referral, I18n.t("validations.household.referral.rsnvac_non_temp") + record.errors.add :referral, :referral_invalid, message: I18n.t("validations.household.referral.rsnvac_non_temp") end if record.renewal.present? && record.renewal.zero? && record.rsnvac == 14 diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index a374112d0..4396bdec9 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -373,6 +373,11 @@ module Imports attributes.delete("tshortfall") attributes.delete("tshortfall_known") save_lettings_log(attributes, previous_status) + elsif lettings_log.errors.of_kind?(:referral, :referral_invalid) + @logger.warn("Log #{lettings_log.old_id}: Removing referral, because it is not a temporary accommodation/") + @logs_overridden << lettings_log.old_id + attributes.delete("referral") + 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 c98d2cc58..fd66756a6 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -572,6 +572,29 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and it has temporary referral in non temporary accommodation" do + before do + lettings_log_xml.at_xpath("//xmlns:Q27").content = "9" + lettings_log_xml.at_xpath("//xmlns:Q16").content = "8" + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Removing referral, because it is not a temporary accommodation/) + 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.referral).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"