LaSaleRange validations bug (#1481)

app/models/la_sale_range.rb

@@ -1,2 +1,3 @@
 class LaSaleRange < ApplicationRecord
+  MAX_BEDS = 4
 end

app/models/sales_log.rb

@@ -353,4 +353,8 @@ class SalesLog < Log
     mortgage_amount = mortgage || 0
     mortgage_amount + deposit + grant_amount
   end
+
+  def beds_for_la_sale_range
+    beds.nil? ? nil : [beds, LaSaleRange::MAX_BEDS].min
+  end
 end

app/models/validations/sales/soft_validations.rb

@@ -126,6 +126,10 @@ module Validations::Sales::SoftValidations
 private
 
   def sale_range
-    LaSaleRange.find_by(start_year: collection_start_year, la:, bedrooms: beds)
+    LaSaleRange.find_by(
+      start_year: collection_start_year,
+      la:,
+      bedrooms: beds_for_la_sale_range,
+    )
   end
 end

app/models/validations/soft_validations.rb

@@ -28,7 +28,12 @@ module Validations::SoftValidations
   def rent_in_soft_min_range?
     return unless brent && weekly_value(brent) && startdate
 
-    rent_range = LaRentRange.find_by(start_year: collection_start_year, la:, beds: beds_for_la_rent_range, lettype: get_lettype)
+    rent_range = LaRentRange.find_by(
+      start_year: collection_start_year,
+      la:,
+      beds: beds_for_la_rent_range,
+      lettype: get_lettype,
+    )
     rent_range.present? && weekly_value(brent).between?(rent_range.hard_min, rent_range.soft_min)
   end
 

spec/models/lettings_log_spec.rb

@@ -3086,5 +3086,31 @@ RSpec.describe LettingsLog do
       end
     end
   end
+
+  describe "#beds_for_la_rent_range" do
+    context "when beds nil" do
+      let(:lettings_log) { build(:lettings_log, beds: nil) }
+
+      it "returns nil" do
+        expect(lettings_log.beds_for_la_rent_range).to be_nil
+      end
+    end
+
+    context "when beds <= 4" do
+      let(:lettings_log) { build(:lettings_log, beds: 4) }
+
+      it "returns number of beds" do
+        expect(lettings_log.beds_for_la_rent_range).to eq(4)
+      end
+    end
+
+    context "when beds > 4" do
+      let(:lettings_log) { build(:lettings_log, beds: 40) }
+
+      it "returns max number of beds" do
+        expect(lettings_log.beds_for_la_rent_range).to eq(4)
+      end
+    end
+  end
 end
 # rubocop:enable RSpec/AnyInstance

spec/models/sales_log_spec.rb

@@ -579,5 +579,31 @@ RSpec.describe SalesLog, type: :model do
       end
     end
   end
+
+  describe "#beds_for_la_sale_range" do
+    context "when beds nil" do
+      let(:sales_log) { build(:sales_log, beds: nil) }
+
+      it "returns nil" do
+        expect(sales_log.beds_for_la_sale_range).to be_nil
+      end
+    end
+
+    context "when beds <= 4" do
+      let(:sales_log) { build(:sales_log, beds: 4) }
+
+      it "returns number of beds" do
+        expect(sales_log.beds_for_la_sale_range).to eq(4)
+      end
+    end
+
+    context "when beds > 4" do
+      let(:sales_log) { build(:sales_log, beds: 40) }
+
+      it "returns max number of beds" do
+        expect(sales_log.beds_for_la_sale_range).to eq(4)
+      end
+    end
+  end
 end
 # rubocop:enable RSpec/AnyInstance