From 303d9af655f6896ad8186073b4bda008b2e64edd Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 26 Jul 2023 16:54:37 +0100 Subject: [PATCH] Clear beds over the max for the number of tenants --- .../validations/property_validations.rb | 2 +- .../imports/lettings_logs_import_service.rb | 1 + .../lettings_logs_import_service_spec.rb | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb index e9680facf..2f2d8d6b8 100644 --- a/app/models/validations/property_validations.rb +++ b/app/models/validations/property_validations.rb @@ -42,7 +42,7 @@ module Validations::PropertyValidations if record.hhmemb == 1 && record.is_shared_housing? && !record.beds.to_i.between?(1, 3) && record.beds.present? record.errors.add :unittype_gn, I18n.t("validations.property.unittype_gn.one_three_bedroom_single_tenant_shared") - record.errors.add :beds, I18n.t("validations.property.unittype_gn.one_three_bedroom_single_tenant_shared") + record.errors.add :beds, :one_three_bedroom_single_tenant_shared, message: I18n.t("validations.property.unittype_gn.one_three_bedroom_single_tenant_shared") elsif record.is_shared_housing? && record.beds.present? && !record.beds.to_i.between?(1, 7) record.errors.add :unittype_gn, I18n.t("validations.property.unittype_gn.one_seven_bedroom_shared") record.errors.add :beds, I18n.t("validations.property.unittype_gn.one_seven_bedroom_shared") diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index cb20b8282..f1a86c023 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -323,6 +323,7 @@ module Imports %i[voiddate after_mrcdate] => %w[voiddate mrcdate majorrepairs], %i[tshortfall more_than_rent] => %w[tshortfall tshortfall_known], %i[scheme_id no_completed_locations] => %w[scheme_id location_id], + %i[beds one_three_bedroom_single_tenant_shared] => %w[beds], } (2..8).each do |person| diff --git a/spec/services/imports/lettings_logs_import_service_spec.rb b/spec/services/imports/lettings_logs_import_service_spec.rb index 2b5664721..738d2ed39 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -535,6 +535,29 @@ RSpec.describe Imports::LettingsLogsImportService do end end + context "and beds over the max for the number of tenants" do + before do + lettings_log_xml.at_xpath("//xmlns:Q22").content = "4" + lettings_log_xml.at_xpath("//xmlns:HHMEMB").content = "1" + lettings_log_xml.at_xpath("//xmlns:Q23").content = "4" + end + + it "intercepts the relevant validation error" do + expect { lettings_log_service.send(:create_log, lettings_log_xml) } + .not_to raise_error + end + + it "clears out the bedrooms 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 carehome charges and other charges are entered" do let(:lettings_log_id) { "0b4a68df-30cc-474a-93c0-a56ce8fdad3b" }