From 778608a2e3ed75e09d8f8b53a8314872afd9e24b Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Thu, 7 Mar 2024 09:18:19 +0000
Subject: [PATCH] More tweaks

---
 app/models/form/sales/pages/address.rb                |  4 +++-
 app/models/form/sales/questions/address_line1.rb      |  2 +-
 app/models/form/sales/questions/buyer_previous.rb     |  2 +-
 app/models/form/sales/questions/county.rb             |  2 +-
 app/models/form/sales/questions/deposit_amount.rb     |  2 +-
 app/models/form/sales/questions/deposit_discount.rb   |  2 +-
 app/models/form/sales/questions/discount.rb           |  2 +-
 app/models/form/sales/questions/equity.rb             |  2 +-
 app/models/form/sales/questions/extra_borrowing.rb    |  2 +-
 app/models/form/sales/questions/fromprop.rb           |  2 +-
 app/models/form/sales/questions/grant.rb              |  2 +-
 .../form/sales/questions/has_leasehold_charges.rb     |  4 ++--
 app/models/form/sales/questions/leasehold_charges.rb  |  2 +-
 .../form/sales/questions/living_before_purchase.rb    |  2 +-
 app/models/form/sales/questions/monthly_rent.rb       |  2 +-
 app/models/form/sales/questions/mortgage_amount.rb    |  2 +-
 app/models/form/sales/questions/mortgage_lender.rb    |  2 +-
 app/models/form/sales/questions/mortgage_length.rb    |  2 +-
 app/models/form/sales/questions/mortgageused.rb       |  2 +-
 app/models/form/sales/questions/nationality_all.rb    | 11 ++++++++++-
 .../form/sales/questions/nationality_all_group.rb     | 10 +++++++++-
 app/models/form/sales/questions/person_age.rb         |  1 +
 app/models/form/sales/questions/person_age_known.rb   |  1 +
 .../form/sales/questions/person_gender_identity.rb    |  1 +
 .../sales/questions/person_relationship_to_buyer_1.rb |  1 +
 .../form/sales/questions/person_working_situation.rb  |  1 +
 .../form/sales/questions/postcode_for_full_address.rb |  2 +-
 app/models/form/sales/questions/previous_bedrooms.rb  |  2 +-
 app/models/form/sales/questions/previous_tenure.rb    |  2 +-
 .../form/sales/questions/property_building_type.rb    |  2 +-
 .../form/sales/questions/property_local_authority.rb  |  2 +-
 .../sales/questions/property_local_authority_known.rb |  2 +-
 .../sales/questions/property_number_of_bedrooms.rb    |  2 +-
 app/models/form/sales/questions/property_unit_type.rb |  2 +-
 app/models/form/sales/questions/purchase_price.rb     |  2 +-
 app/models/form/sales/questions/town_or_city.rb       |  2 +-
 app/models/form/sales/questions/uprn.rb               |  2 +-
 app/models/form/sales/questions/uprn_known.rb         |  3 +++
 app/models/form/sales/questions/value.rb              |  2 +-
 spec/models/form/sales/pages/person_age_spec.rb       |  2 +-
 .../form/sales/pages/person_gender_identity_spec.rb   |  2 +-
 .../sales/pages/person_relationship_to_buyer1_spec.rb |  2 +-
 .../form/sales/pages/person_working_situation_spec.rb |  2 +-
 .../sales/questions/nationality_all_group_spec.rb     |  2 +-
 .../form/sales/questions/nationality_all_spec.rb      |  2 +-
 .../form/sales/questions/person_age_known_spec.rb     |  2 +-
 spec/models/form/sales/questions/person_age_spec.rb   |  2 +-
 .../sales/questions/person_gender_identity_spec.rb    |  2 +-
 .../questions/person_relationship_to_buyer1_spec.rb   |  2 +-
 .../sales/questions/person_working_situation_spec.rb  |  2 +-
 spec/models/form/sales/questions/uprn_known_spec.rb   |  2 +-
 51 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/app/models/form/sales/pages/address.rb b/app/models/form/sales/pages/address.rb
index 3078dfe1e..6bd74f8b7 100644
--- a/app/models/form/sales/pages/address.rb
+++ b/app/models/form/sales/pages/address.rb
@@ -2,7 +2,7 @@ class Form::Sales::Pages::Address < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "Q15 - What is the property's address?"
+    @header = "Q#{QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]} - What is the property's address?"
     @depends_on = [
       { "uprn_known" => nil },
       { "uprn_known" => 0 },
@@ -19,4 +19,6 @@ class Form::Sales::Pages::Address < ::Form::Page
       Form::Sales::Questions::PostcodeForFullAddress.new(nil, nil, self),
     ]
   end
+
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
 end
diff --git a/app/models/form/sales/questions/address_line1.rb b/app/models/form/sales/questions/address_line1.rb
index b07686512..f72aaea96 100644
--- a/app/models/form/sales/questions/address_line1.rb
+++ b/app/models/form/sales/questions/address_line1.rb
@@ -19,5 +19,5 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question
     ].select(&:present?).join("\n")
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 19 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
 end
diff --git a/app/models/form/sales/questions/buyer_previous.rb b/app/models/form/sales/questions/buyer_previous.rb
index ede878dcb..fe16969d7 100644
--- a/app/models/form/sales/questions/buyer_previous.rb
+++ b/app/models/form/sales/questions/buyer_previous.rb
@@ -26,5 +26,5 @@ class Form::Sales::Questions::BuyerPrevious < ::Form::Question
     form.start_year_after_2024?
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 84, 2024 => 86 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 84 }.freeze
 end
diff --git a/app/models/form/sales/questions/county.rb b/app/models/form/sales/questions/county.rb
index 0bd3353a9..d95d90e73 100644
--- a/app/models/form/sales/questions/county.rb
+++ b/app/models/form/sales/questions/county.rb
@@ -11,5 +11,5 @@ class Form::Sales::Questions::County < ::Form::Question
     @hide_question_number_on_page = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 19 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
 end
diff --git a/app/models/form/sales/questions/deposit_amount.rb b/app/models/form/sales/questions/deposit_amount.rb
index 0161e1f5b..9c18e3688 100644
--- a/app/models/form/sales/questions/deposit_amount.rb
+++ b/app/models/form/sales/questions/deposit_amount.rb
@@ -22,7 +22,7 @@ class Form::Sales::Questions::DepositAmount < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 1 => 95, 2 => 108, 3 => 116 },
-    2024 => { 1 => 97, 2 => 110, 3 => 117 },
+    2024 => { 1 => 96, 2 => 109, 3 => 116 },
   }.freeze
 
   def hint_text
diff --git a/app/models/form/sales/questions/deposit_discount.rb b/app/models/form/sales/questions/deposit_discount.rb
index d51012d7f..52a7e90c7 100644
--- a/app/models/form/sales/questions/deposit_discount.rb
+++ b/app/models/form/sales/questions/deposit_discount.rb
@@ -14,5 +14,5 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 98 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 96, 2024 => 97 }.freeze
 end
diff --git a/app/models/form/sales/questions/discount.rb b/app/models/form/sales/questions/discount.rb
index f38154552..dc071c00e 100644
--- a/app/models/form/sales/questions/discount.rb
+++ b/app/models/form/sales/questions/discount.rb
@@ -16,5 +16,5 @@ class Form::Sales::Questions::Discount < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 102, 2024 => 104 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 102, 2024 => 103 }.freeze
 end
diff --git a/app/models/form/sales/questions/equity.rb b/app/models/form/sales/questions/equity.rb
index 5ce5b858f..6ee8d692f 100644
--- a/app/models/form/sales/questions/equity.rb
+++ b/app/models/form/sales/questions/equity.rb
@@ -14,5 +14,5 @@ class Form::Sales::Questions::Equity < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 91 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 89, 2024 => 90 }.freeze
 end
diff --git a/app/models/form/sales/questions/extra_borrowing.rb b/app/models/form/sales/questions/extra_borrowing.rb
index 106308b22..2b4303423 100644
--- a/app/models/form/sales/questions/extra_borrowing.rb
+++ b/app/models/form/sales/questions/extra_borrowing.rb
@@ -20,6 +20,6 @@ class Form::Sales::Questions::ExtraBorrowing < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 1 => 94, 2 => 107, 3 => 115 },
-    2024 => { 1 => 96, 2 => 109, 3 => 116 },
+    2024 => { 1 => 95, 2 => 108, 3 => 115 },
   }.freeze
 end
diff --git a/app/models/form/sales/questions/fromprop.rb b/app/models/form/sales/questions/fromprop.rb
index 8c1915d5b..ec17e5939 100644
--- a/app/models/form/sales/questions/fromprop.rb
+++ b/app/models/form/sales/questions/fromprop.rb
@@ -30,5 +30,5 @@ class Form::Sales::Questions::Fromprop < ::Form::Question
     }
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 88 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 86, 2024 => 87 }.freeze
 end
diff --git a/app/models/form/sales/questions/grant.rb b/app/models/form/sales/questions/grant.rb
index 8c4848181..00b54e8d2 100644
--- a/app/models/form/sales/questions/grant.rb
+++ b/app/models/form/sales/questions/grant.rb
@@ -14,5 +14,5 @@ class Form::Sales::Questions::Grant < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 101, 2024 => 103 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 101, 2024 => 102 }.freeze
 end
diff --git a/app/models/form/sales/questions/has_leasehold_charges.rb b/app/models/form/sales/questions/has_leasehold_charges.rb
index 1c9e52766..3e021daa0 100644
--- a/app/models/form/sales/questions/has_leasehold_charges.rb
+++ b/app/models/form/sales/questions/has_leasehold_charges.rb
@@ -29,9 +29,9 @@ class Form::Sales::Questions::HasLeaseholdCharges < ::Form::Question
   def question_number
     case @ownershipsch
     when 1
-      98
+      99
     when 2
-      109
+      110
     when 3
       117
     end
diff --git a/app/models/form/sales/questions/leasehold_charges.rb b/app/models/form/sales/questions/leasehold_charges.rb
index 00849b0ec..2561ccc1d 100644
--- a/app/models/form/sales/questions/leasehold_charges.rb
+++ b/app/models/form/sales/questions/leasehold_charges.rb
@@ -15,6 +15,6 @@ class Form::Sales::Questions::LeaseholdCharges < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 1 => 98, 2 => 109, 3 => 117 },
-    2024 => { 1 => 100, 2 => 111, 3 => 118 },
+    2024 => { 1 => 99, 2 => 110, 3 => 117 },
   }.freeze
 end
diff --git a/app/models/form/sales/questions/living_before_purchase.rb b/app/models/form/sales/questions/living_before_purchase.rb
index f11807e1c..9f28d61ee 100644
--- a/app/models/form/sales/questions/living_before_purchase.rb
+++ b/app/models/form/sales/questions/living_before_purchase.rb
@@ -28,6 +28,6 @@ class Form::Sales::Questions::LivingBeforePurchase < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 1 => 75, 2 => 99 },
-    2024 => { 1 => 77, 2 => 101 },
+    2024 => { 1 => 77, 2 => 100 },
   }.freeze
 end
diff --git a/app/models/form/sales/questions/monthly_rent.rb b/app/models/form/sales/questions/monthly_rent.rb
index 156e744c4..c53f1b7e6 100644
--- a/app/models/form/sales/questions/monthly_rent.rb
+++ b/app/models/form/sales/questions/monthly_rent.rb
@@ -13,5 +13,5 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 99 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 97, 2024 => 98 }.freeze
 end
diff --git a/app/models/form/sales/questions/mortgage_amount.rb b/app/models/form/sales/questions/mortgage_amount.rb
index ec27e027a..97d0fdf5c 100644
--- a/app/models/form/sales/questions/mortgage_amount.rb
+++ b/app/models/form/sales/questions/mortgage_amount.rb
@@ -16,6 +16,6 @@ class Form::Sales::Questions::MortgageAmount < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 1 => 91, 2 => 104, 3 => 112 },
-    2024 => { 1 => 93, 2 => 106, 3 => 114 },
+    2024 => { 1 => 92, 2 => 105, 3 => 113 },
   }.freeze
 end
diff --git a/app/models/form/sales/questions/mortgage_lender.rb b/app/models/form/sales/questions/mortgage_lender.rb
index b292c246b..bf4c93b55 100644
--- a/app/models/form/sales/questions/mortgage_lender.rb
+++ b/app/models/form/sales/questions/mortgage_lender.rb
@@ -75,6 +75,6 @@ class Form::Sales::Questions::MortgageLender < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 1 => 92, 2 => 105, 3 => 113 },
-    2024 => { 1 => 94, 2 => 107 },
+    2024 => { 1 => 93, 2 => 106 },
   }.freeze
 end
diff --git a/app/models/form/sales/questions/mortgage_length.rb b/app/models/form/sales/questions/mortgage_length.rb
index 8bd8653b5..e1bda4ea0 100644
--- a/app/models/form/sales/questions/mortgage_length.rb
+++ b/app/models/form/sales/questions/mortgage_length.rb
@@ -20,6 +20,6 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 1 => 93, 2 => 106, 3 => 114 },
-    2024 => { 1 => 95, 2 => 108, 3 => 115 },
+    2024 => { 1 => 94, 2 => 107, 3 => 114 },
   }.freeze
 end
diff --git a/app/models/form/sales/questions/mortgageused.rb b/app/models/form/sales/questions/mortgageused.rb
index 75509ccd8..ea855083b 100644
--- a/app/models/form/sales/questions/mortgageused.rb
+++ b/app/models/form/sales/questions/mortgageused.rb
@@ -29,6 +29,6 @@ class Form::Sales::Questions::Mortgageused < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 1 => 90, 2 => 103, 3 => 111 },
-    2024 => { 1 => 92, 2 => 105, 3 => 113 },
+    2024 => { 1 => 91, 2 => 104, 3 => 112 },
   }.freeze
 end
diff --git a/app/models/form/sales/questions/nationality_all.rb b/app/models/form/sales/questions/nationality_all.rb
index 4e2f95adb..dd8377830 100644
--- a/app/models/form/sales/questions/nationality_all.rb
+++ b/app/models/form/sales/questions/nationality_all.rb
@@ -6,10 +6,19 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question
     @type = "select"
     @answer_options = GlobalConstants::COUNTRIES_ANSWER_OPTIONS
     @check_answers_card_number = buyer_index
-    @question_number = buyer_index == 1 ? 24 : 32
+    @buyer_index = buyer_index
+    @question_number = question_number
   end
 
   def answer_label(log, _current_user = nil)
     answer_options[log.send(id).to_s]["name"]
   end
+
+  def question_number
+    if form.start_date.year == 2023
+      @buyer_index == 1 ? 24 : 32
+    else
+      @buyer_index == 1 ? 26 : 34
+    end
+  end
 end
diff --git a/app/models/form/sales/questions/nationality_all_group.rb b/app/models/form/sales/questions/nationality_all_group.rb
index faf29487e..f0ab1bc6e 100644
--- a/app/models/form/sales/questions/nationality_all_group.rb
+++ b/app/models/form/sales/questions/nationality_all_group.rb
@@ -7,10 +7,10 @@ class Form::Sales::Questions::NationalityAllGroup < ::Form::Question
     @hint_text = buyer_index == 1 ? "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest." : ""
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = buyer_index
-    @question_number = buyer_index == 1 ? 24 : 32
     @conditional_for = buyer_index == 1 ? { "nationality_all" => [12] } : { "nationality_all_buyer2" => [12] }
     @hidden_in_check_answers = { "depends_on" => [{ id => 12 }] }
     @buyer_index = buyer_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = {
@@ -26,4 +26,12 @@ class Form::Sales::Questions::NationalityAllGroup < ::Form::Question
       "If buyer 2 is a dual national of the United Kingdom and another country, enter United Kingdom. If they are a dual national of two other countries, the buyer should decide which country to enter."
     end
   end
+
+  def question_number
+    if form.start_date.year == 2023
+      @buyer_index == 1 ? 24 : 32
+    else
+      @buyer_index == 1 ? 26 : 34
+    end
+  end
 end
diff --git a/app/models/form/sales/questions/person_age.rb b/app/models/form/sales/questions/person_age.rb
index 27b68eed7..34944c8f1 100644
--- a/app/models/form/sales/questions/person_age.rb
+++ b/app/models/form/sales/questions/person_age.rb
@@ -14,6 +14,7 @@ class Form::Sales::Questions::PersonAge < ::Form::Question
     @max = 110
     @step = 1
     @person_index = person_index
+    @question_number = question_number
   end
 
   def question_number
diff --git a/app/models/form/sales/questions/person_age_known.rb b/app/models/form/sales/questions/person_age_known.rb
index 46509429d..b53724e67 100644
--- a/app/models/form/sales/questions/person_age_known.rb
+++ b/app/models/form/sales/questions/person_age_known.rb
@@ -20,6 +20,7 @@ class Form::Sales::Questions::PersonAgeKnown < ::Form::Question
     }
     @check_answers_card_number = person_index
     @person_index = person_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/person_gender_identity.rb b/app/models/form/sales/questions/person_gender_identity.rb
index 2e918e8aa..8b1a0ff2b 100644
--- a/app/models/form/sales/questions/person_gender_identity.rb
+++ b/app/models/form/sales/questions/person_gender_identity.rb
@@ -13,6 +13,7 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Question
       "value" => "Prefers not to say",
     }]
     @person_index = person_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/person_relationship_to_buyer_1.rb b/app/models/form/sales/questions/person_relationship_to_buyer_1.rb
index 0e3c21e2e..872b46d4f 100644
--- a/app/models/form/sales/questions/person_relationship_to_buyer_1.rb
+++ b/app/models/form/sales/questions/person_relationship_to_buyer_1.rb
@@ -13,6 +13,7 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Question
       "value" => "Prefers not to say",
     }]
     @person_index = person_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/person_working_situation.rb b/app/models/form/sales/questions/person_working_situation.rb
index 29ae4d1bb..e73f7debd 100644
--- a/app/models/form/sales/questions/person_working_situation.rb
+++ b/app/models/form/sales/questions/person_working_situation.rb
@@ -13,6 +13,7 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Question
       "value" => "Prefers not to say",
     }]
     @person_index = person_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/postcode_for_full_address.rb b/app/models/form/sales/questions/postcode_for_full_address.rb
index 1e1e8c41e..74c235ab7 100644
--- a/app/models/form/sales/questions/postcode_for_full_address.rb
+++ b/app/models/form/sales/questions/postcode_for_full_address.rb
@@ -23,5 +23,5 @@ class Form::Sales::Questions::PostcodeForFullAddress < ::Form::Question
     @hide_question_number_on_page = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 19 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
 end
diff --git a/app/models/form/sales/questions/previous_bedrooms.rb b/app/models/form/sales/questions/previous_bedrooms.rb
index 8bca91990..50970bc89 100644
--- a/app/models/form/sales/questions/previous_bedrooms.rb
+++ b/app/models/form/sales/questions/previous_bedrooms.rb
@@ -13,5 +13,5 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 87 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 86 }.freeze
 end
diff --git a/app/models/form/sales/questions/previous_tenure.rb b/app/models/form/sales/questions/previous_tenure.rb
index 6bd1b3c91..7227fa00e 100644
--- a/app/models/form/sales/questions/previous_tenure.rb
+++ b/app/models/form/sales/questions/previous_tenure.rb
@@ -19,5 +19,5 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question
     "10" => { "value" => "Don’t know" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 89 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 88 }.freeze
 end
diff --git a/app/models/form/sales/questions/property_building_type.rb b/app/models/form/sales/questions/property_building_type.rb
index 2041ad71e..f8f7e3905 100644
--- a/app/models/form/sales/questions/property_building_type.rb
+++ b/app/models/form/sales/questions/property_building_type.rb
@@ -14,5 +14,5 @@ class Form::Sales::Questions::PropertyBuildingType < ::Form::Question
     "2" => { "value" => "Converted from previous residential or non-residential property" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 17 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 13, 2024 => 20 }.freeze
 end
diff --git a/app/models/form/sales/questions/property_local_authority.rb b/app/models/form/sales/questions/property_local_authority.rb
index b8e16a013..2a8d3cc69 100644
--- a/app/models/form/sales/questions/property_local_authority.rb
+++ b/app/models/form/sales/questions/property_local_authority.rb
@@ -17,5 +17,5 @@ class Form::Sales::Questions::PropertyLocalAuthority < ::Form::Question
     log.saledate && log.saledate.year >= 2023 && log.is_la_inferred?
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 20 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 17 }.freeze
 end
diff --git a/app/models/form/sales/questions/property_local_authority_known.rb b/app/models/form/sales/questions/property_local_authority_known.rb
index b356956fb..b18486c6a 100644
--- a/app/models/form/sales/questions/property_local_authority_known.rb
+++ b/app/models/form/sales/questions/property_local_authority_known.rb
@@ -22,5 +22,5 @@ class Form::Sales::Questions::PropertyLocalAuthorityKnown < ::Form::Question
     "0" => { "value" => "No" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 20 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 16, 2024 => 17 }.freeze
 end
diff --git a/app/models/form/sales/questions/property_number_of_bedrooms.rb b/app/models/form/sales/questions/property_number_of_bedrooms.rb
index 226328f75..b8462b6fa 100644
--- a/app/models/form/sales/questions/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/questions/property_number_of_bedrooms.rb
@@ -13,5 +13,5 @@ class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 15 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 18 }.freeze
 end
diff --git a/app/models/form/sales/questions/property_unit_type.rb b/app/models/form/sales/questions/property_unit_type.rb
index c7a4a92b8..1622473ec 100644
--- a/app/models/form/sales/questions/property_unit_type.rb
+++ b/app/models/form/sales/questions/property_unit_type.rb
@@ -17,5 +17,5 @@ class Form::Sales::Questions::PropertyUnitType < ::Form::Question
     "9" => { "value" => "Other" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 16 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 19 }.freeze
 end
diff --git a/app/models/form/sales/questions/purchase_price.rb b/app/models/form/sales/questions/purchase_price.rb
index afe414855..428d0cce0 100644
--- a/app/models/form/sales/questions/purchase_price.rb
+++ b/app/models/form/sales/questions/purchase_price.rb
@@ -16,7 +16,7 @@ class Form::Sales::Questions::PurchasePrice < ::Form::Question
 
   QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP = {
     2023 => { 2 => 100, 3 => 110 },
-    2024 => { 2 => 102, 3 => 112 },
+    2024 => { 2 => 101, 3 => 111 },
   }.freeze
 
   def hint_text
diff --git a/app/models/form/sales/questions/town_or_city.rb b/app/models/form/sales/questions/town_or_city.rb
index efc97a8dc..18f6298f3 100644
--- a/app/models/form/sales/questions/town_or_city.rb
+++ b/app/models/form/sales/questions/town_or_city.rb
@@ -11,5 +11,5 @@ class Form::Sales::Questions::TownOrCity < ::Form::Question
     @hide_question_number_on_page = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 19 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 15, 2024 => 16 }.freeze
 end
diff --git a/app/models/form/sales/questions/uprn.rb b/app/models/form/sales/questions/uprn.rb
index 6c95ebd26..75a41a0ec 100644
--- a/app/models/form/sales/questions/uprn.rb
+++ b/app/models/form/sales/questions/uprn.rb
@@ -36,5 +36,5 @@ class Form::Sales::Questions::Uprn < ::Form::Question
     "\n\n#{value.join("\n")}"
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 14, 2024 => 18 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 14, 2024 => 15 }.freeze
 end
diff --git a/app/models/form/sales/questions/uprn_known.rb b/app/models/form/sales/questions/uprn_known.rb
index f88629fe4..44ce03cad 100644
--- a/app/models/form/sales/questions/uprn_known.rb
+++ b/app/models/form/sales/questions/uprn_known.rb
@@ -22,6 +22,7 @@ class Form::Sales::Questions::UprnKnown < ::Form::Question
         { "uprn_known" => 1 },
       ],
     }
+    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
   ANSWER_OPTIONS = {
@@ -32,4 +33,6 @@ class Form::Sales::Questions::UprnKnown < ::Form::Question
   def unanswered_error_message
     I18n.t("validations.property.uprn_known.invalid")
   end
+
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 14, 2024 => 15 }.freeze
 end
diff --git a/app/models/form/sales/questions/value.rb b/app/models/form/sales/questions/value.rb
index 7c4526908..61668aa83 100644
--- a/app/models/form/sales/questions/value.rb
+++ b/app/models/form/sales/questions/value.rb
@@ -13,5 +13,5 @@ class Form::Sales::Questions::Value < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 88, 2024 => 90 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 88, 2024 => 89 }.freeze
 end
diff --git a/spec/models/form/sales/pages/person_age_spec.rb b/spec/models/form/sales/pages/person_age_spec.rb
index b1ffc165b..a6ee73e96 100644
--- a/spec/models/form/sales/pages/person_age_spec.rb
+++ b/spec/models/form/sales/pages/person_age_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Pages::PersonAge, type: :model do
 
   let(:page_id) { "person_1_age" }
   let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
   let(:person_index) { 1 }
 
   it "has correct subsection" do
diff --git a/spec/models/form/sales/pages/person_gender_identity_spec.rb b/spec/models/form/sales/pages/person_gender_identity_spec.rb
index 634d2231b..05a1fe0be 100644
--- a/spec/models/form/sales/pages/person_gender_identity_spec.rb
+++ b/spec/models/form/sales/pages/person_gender_identity_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Sales::Pages::PersonGenderIdentity, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
   let(:person_index) { 1 }
 
   let(:page_id) { "person_2_gender_identity" }
diff --git a/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb b/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
index 1a617ab10..2efad476a 100644
--- a/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/pages/person_relationship_to_buyer1_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Sales::Pages::PersonRelationshipToBuyer1, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
   let(:person_index) { 1 }
 
   let(:page_id) { "person_1_relationship_to_buyer_1" }
diff --git a/spec/models/form/sales/pages/person_working_situation_spec.rb b/spec/models/form/sales/pages/person_working_situation_spec.rb
index 2517df99f..aeee1aaec 100644
--- a/spec/models/form/sales/pages/person_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/person_working_situation_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Form::Sales::Pages::PersonWorkingSituation, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
-  let(:subsection) { instance_double(Form::Subsection) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) }
   let(:person_index) { 2 }
 
   let(:page_id) { "person_2_working_situation" }
diff --git a/spec/models/form/sales/questions/nationality_all_group_spec.rb b/spec/models/form/sales/questions/nationality_all_group_spec.rb
index cd70b2a12..6625f9353 100644
--- a/spec/models/form/sales/questions/nationality_all_group_spec.rb
+++ b/spec/models/form/sales/questions/nationality_all_group_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::NationalityAllGroup, type: :model do
 
   let(:buyer_index) { 1 }
 
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to be page
diff --git a/spec/models/form/sales/questions/nationality_all_spec.rb b/spec/models/form/sales/questions/nationality_all_spec.rb
index c228c459d..171e9f96d 100644
--- a/spec/models/form/sales/questions/nationality_all_spec.rb
+++ b/spec/models/form/sales/questions/nationality_all_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::NationalityAll, type: :model do
 
   let(:buyer_index) { 1 }
 
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to be page
diff --git a/spec/models/form/sales/questions/person_age_known_spec.rb b/spec/models/form/sales/questions/person_age_known_spec.rb
index f9731fa34..27023b372 100644
--- a/spec/models/form/sales/questions/person_age_known_spec.rb
+++ b/spec/models/form/sales/questions/person_age_known_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PersonAgeKnown, type: :model do
 
   let(:question_id) { "age3_known" }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:person_index) { 2 }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/person_age_spec.rb b/spec/models/form/sales/questions/person_age_spec.rb
index 1358ec4d2..983d5667e 100644
--- a/spec/models/form/sales/questions/person_age_spec.rb
+++ b/spec/models/form/sales/questions/person_age_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PersonAge, type: :model do
 
   let(:question_id) { "age3" }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:person_index) { 2 }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/person_gender_identity_spec.rb b/spec/models/form/sales/questions/person_gender_identity_spec.rb
index 6c0691d25..b967a7f13 100644
--- a/spec/models/form/sales/questions/person_gender_identity_spec.rb
+++ b/spec/models/form/sales/questions/person_gender_identity_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Form::Sales::Questions::PersonGenderIdentity, type: :model do
   let(:page) { instance_double(Form::Page) }
   let(:person_index) { 2 }
   let(:subsection) { instance_double(Form::Subsection) }
-  let(:form) { instance_double(Form) }
+  let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) }
 
   before do
     allow(page).to receive(:subsection).and_return(subsection)
diff --git a/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb b/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
index 424d82498..ad0d17034 100644
--- a/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/questions/person_relationship_to_buyer1_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PersonRelationshipToBuyer1, type: :model
 
   let(:question_id) { "relat2" }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:person_index) { 2 }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/person_working_situation_spec.rb b/spec/models/form/sales/questions/person_working_situation_spec.rb
index 4c2d1f85d..77ec1267b 100644
--- a/spec/models/form/sales/questions/person_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/person_working_situation_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::PersonWorkingSituation, type: :model do
 
   let(:question_id) { "ecstat2" }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
   let(:person_index) { 2 }
 
   it "has correct page" do
diff --git a/spec/models/form/sales/questions/uprn_known_spec.rb b/spec/models/form/sales/questions/uprn_known_spec.rb
index 9f5d4e604..663971191 100644
--- a/spec/models/form/sales/questions/uprn_known_spec.rb
+++ b/spec/models/form/sales/questions/uprn_known_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe Form::Sales::Questions::UprnKnown, type: :model do
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
 
   it "has correct page" do
     expect(question.page).to eq(page)