Refactor sales property information subsection for more clarity

app/models/form/sales/subsections/property_information.rb

@@ -15,37 +15,33 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
       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),
-      (uprn_questions if form.start_date.year < 2024),
-      postcode_and_la_questions,
+      (uprn_questions if form.start_date.year == 2023),
+      (postcode_and_la_questions if form.start_date.year < 2023),
       Form::Sales::Pages::PropertyWheelchairAccessible.new(nil, nil, self),
     ].flatten.compact
   end
 
   def uprn_questions
-    if form.start_date.year >= 2023
-      [
-        Form::Sales::Pages::Uprn.new(nil, nil, self),
-        Form::Sales::Pages::UprnConfirmation.new(nil, nil, self),
-        Form::Sales::Pages::Address.new(nil, nil, self),
-        Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
-        Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
-      ]
-    end
+    [
+      Form::Sales::Pages::Uprn.new(nil, nil, self),
+      Form::Sales::Pages::UprnConfirmation.new(nil, nil, self),
+      Form::Sales::Pages::Address.new(nil, nil, self),
+      Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
+      Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
+      Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
+      Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
+    ]
   end
 
   def postcode_and_la_questions
-    if form.start_date.year < 2023
-      [
-        Form::Sales::Pages::Postcode.new(nil, nil, self),
-        Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
-        Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
-        Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
-      ]
-    end
+    [
+      Form::Sales::Pages::Postcode.new(nil, nil, self),
+      Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1IncomeMaxValueCheck.new("local_authority_buyer_1_income_max_value_check", nil, self, check_answers_card_number: nil),
+      Form::Sales::Pages::Buyer2IncomeMaxValueCheck.new("local_authority_buyer_2_income_max_value_check", nil, self, check_answers_card_number: nil),
+      Form::Sales::Pages::CombinedIncomeMaxValueCheck.new("local_authority_combined_income_max_value_check", nil, self, check_answers_card_number: nil),
+      Form::Sales::Pages::AboutPriceValueCheck.new("about_price_la_value_check", nil, self),
+    ]
   end
 end