From 0d2d590e1f82a0b8ec7b67e7e53a9a10be860dde Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Mon, 20 Jan 2025 11:43:07 +0000
Subject: [PATCH] Update previous tenure options for 2025 (#2906)

---
 .../lettings/questions/previous_tenure.rb     | 32 ++++++++++++++-
 .../pages/previous_housing_situation_spec.rb  |  2 +-
 .../questions/previous_tenure_spec.rb         | 39 ++++++++++++++++++-
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/app/models/form/lettings/questions/previous_tenure.rb b/app/models/form/lettings/questions/previous_tenure.rb
index 360f1960a..73585c412 100644
--- a/app/models/form/lettings/questions/previous_tenure.rb
+++ b/app/models/form/lettings/questions/previous_tenure.rb
@@ -5,7 +5,7 @@ class Form::Lettings::Questions::PreviousTenure < ::Form::Question
     @copy_key = "lettings.household_situation.prevten.not_renewal"
     @type = "radio"
     @check_answers_card_number = 0
-    @answer_options = ANSWER_OPTIONS
+    @answer_options = form.start_year_2025_or_later? ? ANSWER_OPTIONS_2025 : ANSWER_OPTIONS
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
@@ -38,5 +38,35 @@ class Form::Lettings::Questions::PreviousTenure < ::Form::Question
     "25" => { "value" => "Any other accommodation" },
   }.freeze
 
+  ANSWER_OPTIONS_2025 = {
+    "30" => { "value" => "Fixed-term local authority general needs tenancy" },
+    "32" => { "value" => "Fixed-term private registered provider (PRP) general needs tenancy" },
+    "31" => { "value" => "Lifetime local authority general needs tenancy" },
+    "33" => { "value" => "Lifetime private registered provider (PRP) general needs tenancy" },
+    "34" => { "value" => "Specialist retirement housing" },
+    "36" => { "value" => "Sheltered housing for adults aged under 55 years" },
+    "35" => { "value" => "Extra care housing" },
+    "6" => { "value" => "Other supported housing" },
+    "3" => { "value" => "Private sector tenancy" },
+    "27" => { "value" => "Owner occupation (low-cost home ownership)" },
+    "26" => { "value" => "Owner occupation (private)" },
+    "28" => { "value" => "Living with friends and family (long-term)" },
+    "38" => { "value" => "Sofa surfing (moving regularly between family and friends, no permanent bed)" },
+    "14" => { "value" => "Bed and breakfast" },
+    "7" => { "value" => "Direct access hostel" },
+    "10" => { "value" => "Hospital" },
+    "29" => { "value" => "Prison or approved probation hostel" },
+    "19" => { "value" => "Rough sleeping" },
+    "18" => { "value" => "Any other temporary accommodation" },
+    "13" => { "value" => "Children’s home or foster care" },
+    "24" => { "value" => "Home Office Asylum Support" },
+    "37" => { "value" => "Host family or similar refugee accommodation" },
+    "23" => { "value" => "Mobile home or caravan" },
+    "21" => { "value" => "Refuge" },
+    "9" => { "value" => "Residential care home" },
+    "4" => { "value" => "Tied housing or rented with job" },
+    "25" => { "value" => "Any other accommodation" },
+  }.freeze
+
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 77 }.freeze
 end
diff --git a/spec/models/form/lettings/pages/previous_housing_situation_spec.rb b/spec/models/form/lettings/pages/previous_housing_situation_spec.rb
index 9c86a5827..907c8671e 100644
--- a/spec/models/form/lettings/pages/previous_housing_situation_spec.rb
+++ b/spec/models/form/lettings/pages/previous_housing_situation_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe Form::Lettings::Pages::PreviousHousingSituation, type: :model do
   subject(:page) { described_class.new(nil, nil, subsection) }
 
-  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1))) }
+  let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: false)) }
 
   it "has correct subsection" do
     expect(page.subsection).to eq(subsection)
diff --git a/spec/models/form/lettings/questions/previous_tenure_spec.rb b/spec/models/form/lettings/questions/previous_tenure_spec.rb
index 2b8dcc338..d5eaae5fe 100644
--- a/spec/models/form/lettings/questions/previous_tenure_spec.rb
+++ b/spec/models/form/lettings/questions/previous_tenure_spec.rb
@@ -3,7 +3,8 @@ require "rails_helper"
 RSpec.describe Form::Lettings::Questions::PreviousTenure, type: :model do
   subject(:question) { described_class.new(nil, nil, 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(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1), start_year_2025_or_later?: false) }
+  let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form:)) }
 
   it "has the correct id" do
     expect(question.id).to eq("prevten")
@@ -51,4 +52,40 @@ RSpec.describe Form::Lettings::Questions::PreviousTenure, type: :model do
       "25" => { "value" => "Any other accommodation" },
     })
   end
+
+  context "with 2025 logs" do
+    let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 1), start_year_2025_or_later?: true) }
+
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "30" => { "value" => "Fixed-term local authority general needs tenancy" },
+        "32" => { "value" => "Fixed-term private registered provider (PRP) general needs tenancy" },
+        "31" => { "value" => "Lifetime local authority general needs tenancy" },
+        "33" => { "value" => "Lifetime private registered provider (PRP) general needs tenancy" },
+        "34" => { "value" => "Specialist retirement housing" },
+        "35" => { "value" => "Extra care housing" },
+        "6" => { "value" => "Other supported housing" },
+        "3" => { "value" => "Private sector tenancy" },
+        "27" => { "value" => "Owner occupation (low-cost home ownership)" },
+        "26" => { "value" => "Owner occupation (private)" },
+        "28" => { "value" => "Living with friends and family (long-term)" },
+        "38" => { "value" => "Sofa surfing (moving regularly between family and friends, no permanent bed)" },
+        "14" => { "value" => "Bed and breakfast" },
+        "7" => { "value" => "Direct access hostel" },
+        "10" => { "value" => "Hospital" },
+        "29" => { "value" => "Prison or approved probation hostel" },
+        "19" => { "value" => "Rough sleeping" },
+        "18" => { "value" => "Any other temporary accommodation" },
+        "13" => { "value" => "Children’s home or foster care" },
+        "24" => { "value" => "Home Office Asylum Support" },
+        "23" => { "value" => "Mobile home or caravan" },
+        "21" => { "value" => "Refuge" },
+        "9" => { "value" => "Residential care home" },
+        "4" => { "value" => "Tied housing or rented with job" },
+        "36" => { "value" => "Sheltered housing for adults aged under 55 years" },
+        "37" => { "value" => "Host family or similar refugee accommodation" },
+        "25" => { "value" => "Any other accommodation" },
+      })
+    end
+  end
 end