From f7adfd246dbfd9d3cef5283af33314daddefa95e Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Mon, 9 Feb 2026 17:48:23 +0000 Subject: [PATCH] CLDC-4151: Add final question numbers --- app/models/form/lettings/questions/referral_noms.rb | 4 ++-- app/models/form/lettings/questions/referral_org.rb | 4 ++-- .../form/lettings/questions/referral_register.rb | 5 +++-- .../form/lettings/questions/referral_noms_spec.rb | 2 +- .../form/lettings/questions/referral_org_spec.rb | 2 +- .../form/lettings/questions/referral_register_spec.rb | 10 +++++++--- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/models/form/lettings/questions/referral_noms.rb b/app/models/form/lettings/questions/referral_noms.rb index b1675f773..9cdd60c4a 100644 --- a/app/models/form/lettings/questions/referral_noms.rb +++ b/app/models/form/lettings/questions/referral_noms.rb @@ -6,7 +6,7 @@ class Form::Lettings::Questions::ReferralNoms < ::Form::Question @copy_key = "lettings.household_situation.referral.noms" @type = "radio" @check_answers_card_number = 0 - @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] + @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] @referral_register = referral_register end @@ -45,5 +45,5 @@ class Form::Lettings::Questions::ReferralNoms < ::Form::Question end end - QUESTION_NUMBER_FROM_YEAR = { 2026 => 84 }.freeze + QUESTION_NUMBER_FROM_YEAR = { 2026 => 92 }.freeze end diff --git a/app/models/form/lettings/questions/referral_org.rb b/app/models/form/lettings/questions/referral_org.rb index e8bc730d8..034645ceb 100644 --- a/app/models/form/lettings/questions/referral_org.rb +++ b/app/models/form/lettings/questions/referral_org.rb @@ -6,7 +6,7 @@ class Form::Lettings::Questions::ReferralOrg < ::Form::Question @copy_key = "lettings.household_situation.referral.org" @type = "radio" @check_answers_card_number = 0 - @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] + @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] @referral_noms = referral_noms end @@ -81,5 +81,5 @@ class Form::Lettings::Questions::ReferralOrg < ::Form::Question end end - QUESTION_NUMBER_FROM_YEAR = { 2026 => 84 }.freeze + QUESTION_NUMBER_FROM_YEAR = { 2026 => 92 }.freeze end diff --git a/app/models/form/lettings/questions/referral_register.rb b/app/models/form/lettings/questions/referral_register.rb index 1e0964be0..92de6fa1b 100644 --- a/app/models/form/lettings/questions/referral_register.rb +++ b/app/models/form/lettings/questions/referral_register.rb @@ -6,8 +6,9 @@ class Form::Lettings::Questions::ReferralRegister < ::Form::Question @copy_key = "lettings.household_situation.referral.register" @type = "radio" @check_answers_card_number = 0 - @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] @provider_type = provider_type + @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] + @question_number += 1 if @provider_type == :prp end def answer_options @@ -51,5 +52,5 @@ class Form::Lettings::Questions::ReferralRegister < ::Form::Question log.is_renewal? end - QUESTION_NUMBER_FROM_YEAR = { 2026 => 84 }.freeze + QUESTION_NUMBER_FROM_YEAR = { 2026 => 91 }.freeze end diff --git a/spec/models/form/lettings/questions/referral_noms_spec.rb b/spec/models/form/lettings/questions/referral_noms_spec.rb index 809a722cc..01fa26c9c 100644 --- a/spec/models/form/lettings/questions/referral_noms_spec.rb +++ b/spec/models/form/lettings/questions/referral_noms_spec.rb @@ -78,6 +78,6 @@ RSpec.describe Form::Lettings::Questions::ReferralNoms, type: :model do end it "has the correct question_number" do - expect(question.question_number).to eq(84) + expect(question.question_number).to eq(92) end end diff --git a/spec/models/form/lettings/questions/referral_org_spec.rb b/spec/models/form/lettings/questions/referral_org_spec.rb index b407ea796..e6962be23 100644 --- a/spec/models/form/lettings/questions/referral_org_spec.rb +++ b/spec/models/form/lettings/questions/referral_org_spec.rb @@ -114,6 +114,6 @@ RSpec.describe Form::Lettings::Questions::ReferralOrg, type: :model do end it "has the correct question_number" do - expect(question.question_number).to eq(84) + expect(question.question_number).to eq(92) end end diff --git a/spec/models/form/lettings/questions/referral_register_spec.rb b/spec/models/form/lettings/questions/referral_register_spec.rb index 4cf53cd23..3722adc1f 100644 --- a/spec/models/form/lettings/questions/referral_register_spec.rb +++ b/spec/models/form/lettings/questions/referral_register_spec.rb @@ -66,6 +66,10 @@ RSpec.describe Form::Lettings::Questions::ReferralRegister, type: :model do }.freeze, ) end + + it "has the correct question_number" do + expect(question.question_number).to eq(91) + end end context "when log is owned by an PRP" do @@ -92,9 +96,9 @@ RSpec.describe Form::Lettings::Questions::ReferralRegister, type: :model do }.freeze, ) end - end - it "has the correct question_number" do - expect(question.question_number).to eq(84) + it "has the correct question_number" do + expect(question.question_number).to eq(92) + end end end