Merge d4a29a1583 into 3df65b8998

app/models/form/sales/pages/service_charge.rb

@@ -6,8 +6,8 @@ class Form::Sales::Pages::ServiceCharge < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::HasServiceCharge.new(nil, nil, self),
+      Form::Sales::Questions::HasServiceCharge.new(nil, nil, self, staircasing: false),
-      Form::Sales::Questions::ServiceCharge.new(nil, nil, self),
+      Form::Sales::Questions::ServiceCharge.new(nil, nil, self, staircasing: false),
     ]
   end
 end

app/models/form/sales/pages/service_charge_staircasing.rb

@@ -0,0 +1,13 @@
+class Form::Sales::Pages::ServiceChargeStaircasing < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @copy_key = "sales.sale_information.servicecharges"
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::HasServiceCharge.new(nil, nil, self, staircasing: true),
+      Form::Sales::Questions::ServiceCharge.new(nil, nil, self, staircasing: true),
+    ]
+  end
+end

app/models/form/sales/questions/has_service_charge.rb

@@ -1,6 +1,6 @@
 class Form::Sales::Questions::HasServiceCharge < ::Form::Question
-  def initialize(id, hsh, subsection)
+  def initialize(id, hsh, subsection, staircasing:)
-    super
+    super(id, hsh, subsection)
     @id = "has_mscharge"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
@@ -15,7 +15,8 @@ class Form::Sales::Questions::HasServiceCharge < ::Form::Question
       ],
     }
     @copy_key = "sales.sale_information.servicecharges.has_servicecharge"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @staircasing = staircasing
+    @question_number = question_number_from_year[form.start_date.year] || question_number_from_year[question_number_from_year.keys.max]
   end
 
   ANSWER_OPTIONS = {
@@ -23,5 +24,11 @@ class Form::Sales::Questions::HasServiceCharge < ::Form::Question
     "0" => { "value" => "No" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2025 => 88 }.freeze
+  def question_number_from_year
+    if @staircasing
+      { 2026 => 0 }.freeze
+    else
+      { 2025 => 88, 2026 => 0 }.freeze
+    end
+  end
 end

app/models/form/sales/questions/service_charge.rb

@@ -1,16 +1,24 @@
 class Form::Sales::Questions::ServiceCharge < ::Form::Question
-  def initialize(id, hsh, subsection)
+  def initialize(id, hsh, subsection, staircasing:)
-    super
+    super(id, hsh, subsection)
     @id = "mscharge"
     @type = "numeric"
     @min = 1
+    @max = 9999.99
     @step = 0.01
     @width = 5
     @prefix = "£"
     @copy_key = "sales.sale_information.servicecharges.servicecharge"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @staircasing = staircasing
+    @question_number = question_number_from_year[form.start_date.year] || question_number_from_year[question_number_from_year.keys.max]
     @strip_commas = true
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2025 => 88 }.freeze
+  def question_number_from_year
+    if @staircasing
+      { 2026 => 0 }.freeze
+    else
+      { 2025 => 88, 2026 => 0 }.freeze
+    end
+  end
 end

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

@@ -25,6 +25,7 @@ class Form::Sales::Subsections::SharedOwnershipStaircasingTransaction < ::Form::
       Form::Sales::Pages::Mortgageused.new("staircase_mortgage_used_shared_ownership", nil, self, ownershipsch: 1),
       Form::Sales::Pages::MonthlyRentStaircasingOwned.new(nil, nil, self),
       Form::Sales::Pages::MonthlyRentStaircasing.new(nil, nil, self),
+      (Form::Sales::Pages::ServiceChargeStaircasing.new("service_charge_staircasing", nil, self) if form.start_year_2026_or_later?),
       Form::Sales::Pages::MonthlyChargesValueCheck.new("monthly_charges_shared_ownership_value_check", nil, self),
     ].compact
   end

spec/models/form/sales/questions/has_service_charge_spec.rb

@@ -1,12 +1,15 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Questions::HasServiceCharge, type: :model do
-  subject(:question) { described_class.new(question_id, question_definition, page) }
+  subject(:question) { described_class.new(question_id, question_definition, page, staircasing:) }
 
-  let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 4)) }
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, id: "shared_ownership", form:)) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) }
+  let(:page) { instance_double(Form::Page, subsection:) }
+  let(:start_date) { Time.utc(2025, 5, 1) }
+  let(:staircasing) { false }
+
 
   it "has correct page" do
     expect(question.page).to eq(page)
@@ -46,4 +49,45 @@ RSpec.describe Form::Sales::Questions::HasServiceCharge, type: :model do
       ],
     })
   end
+
+  context "with 2025/26 form" do
+    let(:start_date) { Time.utc(2025, 4, 1) }
+
+    before do
+      allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+    end
+
+    context "when not staircasing" do
+      let(:staircasing) { false }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(88)
+      end
+    end
+  end
+
+  context "with 2026/27 form" do
+    let(:start_date) { Time.utc(2026, 4, 1) }
+
+    before do
+      allow(subsection.form).to receive(:start_year_2026_or_later?).and_return(true)
+    end
+
+    context "when staircasing" do
+      let(:staircasing) { true }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(0)
+      end
+    end
+
+    context "when not staircasing" do
+      let(:staircasing) { false }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(0)
+      end
+    end
+  end
+
 end

spec/models/form/sales/questions/service_charge_spec.rb

@@ -1,11 +1,14 @@
 require "rails_helper"
 
 RSpec.describe Form::Sales::Questions::ServiceCharge, type: :model do
-  subject(:question) { described_class.new(question_id, question_definition, page) }
+  subject(:question) { described_class.new(question_id, question_definition, page, staircasing:) }
 
   let(:question_id) { nil }
   let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1)))) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) }
+  let(:page) { instance_double(Form::Page, subsection:) }
+  let(:start_date) { Time.utc(2023, 4, 1) }
+  let(:staircasing) { false }
 
   it "has correct page" do
     expect(question.page).to eq(page)
@@ -34,4 +37,44 @@ RSpec.describe Form::Sales::Questions::ServiceCharge, type: :model do
   it "has the correct prefix" do
     expect(question.prefix).to eq("£")
   end
+
+  context "with 2025/26 form" do
+    let(:start_date) { Time.utc(2025, 4, 1) }
+
+    before do
+      allow(subsection.form).to receive(:start_year_2025_or_later?).and_return(true)
+    end
+
+    context "when not staircasing" do
+      let(:staircasing) { false }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(88)
+      end
+    end
+  end
+
+  context "with 2026/27 form" do
+    let(:start_date) { Time.utc(2026, 4, 1) }
+
+    before do
+      allow(subsection.form).to receive(:start_year_2026_or_later?).and_return(true)
+    end
+
+    context "when staircasing" do
+      let(:staircasing) { true }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(0)
+      end
+    end
+
+    context "when not staircasing" do
+      let(:staircasing) { false }
+
+      it "has the correct question number" do
+        expect(question.question_number).to eq(0)
+      end
+    end
+  end
 end