diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb index 1d60ae127..b5bad6828 100644 --- a/app/models/validations/shared_validations.rb +++ b/app/models/validations/shared_validations.rb @@ -47,7 +47,7 @@ module Validations::SharedValidations if location_inactive_status.present? date, scope, deactivation_date = location_inactive_status.values_at(:date, :scope, :deactivation_date) - record.errors.add field, I18n.t("validations.setup.startdate.location.#{scope}", postcode: record.location.postcode, date:, deactivation_date:) + record.errors.add field, :not_active, message: I18n.t("validations.setup.startdate.location.#{scope}", postcode: record.location.postcode, date:, deactivation_date:) end end diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index c9ac5e960..892178b84 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -385,6 +385,11 @@ module Imports @logs_overridden << lettings_log.old_id %w[brent scharge pscharge supcharg tcharge].each { |name| attributes.delete(name) } save_lettings_log(attributes, previous_status) + elsif lettings_log.errors.of_kind?(:location_id, :not_active) + @logger.warn("Log #{lettings_log.old_id}: Removing scheme and location because it was not active during the tenancy start date/") + @logs_overridden << lettings_log.old_id + %w[location_id scheme_id].each { |name| attributes.delete(name) } + 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 0dcb1e888..e4cf9b0b7 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -667,6 +667,33 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and location is not active during the period" do + let(:lettings_log_id) { "0b4a68df-30cc-474a-93c0-a56ce8fdad3b" } + + before do + location = Location.find_by(old_visible_id: "10") + FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.local(2021, 10, 10), location:) + end + + it "intercepts the relevant validation error" do + expect(logger).to receive(:warn).with(/Differences found when saving log/) + expect(logger).to receive(:warn).with(/Removing scheme and location because it was not active during the tenancy start date/) + expect { lettings_log_service.send(:create_log, lettings_log_xml) } + .not_to raise_error + end + + it "clears out the location 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.location).to be_nil + expect(lettings_log.scheme).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"