From b685a41dc9e4d318d64916bcee0b947b95999eab Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:42:55 +0000
Subject: [PATCH] Move q19, add inference and remove redundant hint text in
 2025

---
 app/models/form/sales/pages/property_number_of_bedrooms.rb  | 1 +
 app/models/form/sales/subsections/property_information.rb   | 3 ++-
 app/models/sales_log.rb                                     | 4 ++++
 config/locales/forms/2025/sales/property_information.en.yml | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/form/sales/pages/property_number_of_bedrooms.rb b/app/models/form/sales/pages/property_number_of_bedrooms.rb
index 796a617d5..f788e4c70 100644
--- a/app/models/form/sales/pages/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/pages/property_number_of_bedrooms.rb
@@ -2,6 +2,7 @@ class Form::Sales::Pages::PropertyNumberOfBedrooms < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_number_of_bedrooms"
+    @depends_on = [{"is_beds_inferred?" => false }]
   end
 
   def questions
diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb
index 32df98af5..5d4021681 100644
--- a/app/models/form/sales/subsections/property_information.rb
+++ b/app/models/form/sales/subsections/property_information.rb
@@ -9,9 +9,10 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
   def pages
     @pages ||= [
       (uprn_questions if form.start_date.year >= 2024),
+      (Form::Sales::Pages::PropertyUnitType.new(nil, nil, self) if form.start_year_2025_or_later?),
       Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
       Form::Sales::Pages::AboutPriceValueCheck.new("about_price_bedrooms_value_check", nil, self),
-      Form::Sales::Pages::PropertyUnitType.new(nil, nil, self),
+      (Form::Sales::Pages::PropertyUnitType.new(nil, nil, self) unless form.start_year_2025_or_later?),
       Form::Sales::Pages::MonthlyChargesValueCheck.new("monthly_charges_property_type_value_check", nil, self),
       Form::Sales::Pages::PercentageDiscountValueCheck.new("percentage_discount_proptype_value_check", nil, self),
       Form::Sales::Pages::PropertyBuildingType.new(nil, nil, self),
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 23438142f..01741fbc5 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -396,6 +396,10 @@ class SalesLog < Log
     proptype == 2
   end
 
+  def is_beds_inferred?
+    form.start_year_2025_or_later? && is_bedsit?
+  end
+
   def shared_ownership_scheme?
     ownershipsch == 1
   end
diff --git a/config/locales/forms/2025/sales/property_information.en.yml b/config/locales/forms/2025/sales/property_information.en.yml
index 240c96f09..d658362ea 100644
--- a/config/locales/forms/2025/sales/property_information.en.yml
+++ b/config/locales/forms/2025/sales/property_information.en.yml
@@ -69,7 +69,7 @@ en:
           beds:
             page_header: ""
             check_answer_label: "Number of bedrooms"
-            hint_text: "A bedsit has 1 bedroom."
+            hint_text: ""
             question_text: "How many bedrooms does the property have?"
 
           proptype: