CLDC-1747 Add previous property type question (#1159)

* Add fromprop field to the sales log

* Fix gender identity typo

* Add previous property type page and questions

* Add previous property type to the shared ownership section

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

@@ -0,0 +1,18 @@
+class Form::Sales::Pages::PreviousPropertyType < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "previous_property_type"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [{
+      "soctenant" => 1,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::Fromprop.new(nil, nil, self),
+    ]
+  end
+end

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

@@ -0,0 +1,20 @@
+class Form::Sales::Questions::Fromprop < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "fromprop"
+    @check_answer_label = "Previous property type"
+    @header = "What was the previous property type?"
+    @type = "radio"
+    @hint_text = ""
+    @page = page
+    @answer_options = ANSWER_OPTIONS
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Flat or maisonette" },
+    "2" => { "value" => "Bedsit" },
+    "3" => { "value" => "House" },
+    "4" => { "value" => "Bungalow" },
+    "9" => { "value" => "Other" },
+  }.freeze
+end

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

@@ -14,6 +14,6 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
     "F" => { "value" => "Female" },
     "M" => { "value" => "Male" },
     "X" => { "value" => "Non-binary" },
-    "R" => { "value" => "Prefers not to say " },
+    "R" => { "value" => "Prefers not to say" },
   }.freeze
 end

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

@@ -17,6 +17,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::LaNominations.new(nil, nil, self),
       Form::Sales::Pages::BuyerPrevious.new(nil, nil, self),
       Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self),
+      Form::Sales::Pages::PreviousPropertyType.new(nil, nil, self),
       Form::Sales::Pages::AboutPriceSharedOwnership.new(nil, nil, self),
       Form::Sales::Pages::Mortgageused.new("mortgage_used_shared_ownership", nil, self),
       Form::Sales::Pages::MortgageAmount.new("mortgage_amount_shared_ownership", nil, self),

db/migrate/20230109124623_add_fromprop_to_sales.rb

@@ -0,0 +1,7 @@
+class AddFrompropToSales < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :fromprop, :integer
+    end
+  end
+end

db/schema.rb

@@ -471,6 +471,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_09_160738) do
     t.integer "hoday"
     t.integer "homonth"
     t.integer "hoyear"
+    t.integer "fromprop"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

spec/models/form/sales/pages/previous_property_type_spec.rb

@@ -0,0 +1,35 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::PreviousPropertyType, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { nil }
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection) }
+
+  it "has correct subsection" do
+    expect(page.subsection).to eq(subsection)
+  end
+
+  it "has correct questions" do
+    expect(page.questions.map(&:id)).to eq(%w[fromprop])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("previous_property_type")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to eq("")
+  end
+
+  it "has the correct description" do
+    expect(page.description).to eq("")
+  end
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([{
+      "soctenant" => 1,
+    }])
+  end
+end

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

@@ -0,0 +1,47 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::Fromprop, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page) }
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("fromprop")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("What was the previous property type?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Previous property type")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("radio")
+  end
+
+  it "is not marked as derived" do
+    expect(question.derived?).to be false
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("")
+  end
+
+  it "has the correct answer_options" do
+    expect(question.answer_options).to eq({
+      "1" => { "value" => "Flat or maisonette" },
+      "2" => { "value" => "Bedsit" },
+      "3" => { "value" => "House" },
+      "4" => { "value" => "Bungalow" },
+      "9" => { "value" => "Other" },
+    })
+  end
+end

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

@@ -40,7 +40,7 @@ RSpec.describe Form::Sales::Questions::GenderIdentity1, type: :model do
       "F" => { "value" => "Female" },
       "M" => { "value" => "Male" },
       "X" => { "value" => "Non-binary" },
-      "R" => { "value" => "Prefers not to say " },
+      "R" => { "value" => "Prefers not to say" },
     })
   end
 

spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb

@@ -23,6 +23,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do
         la_nominations
         buyer_previous
         previous_bedrooms
+        previous_property_type
         about_price_shared_ownership
         mortgage_used_shared_ownership
         mortgage_amount_shared_ownership

spec/models/form_handler_spec.rb

@@ -52,14 +52,14 @@ RSpec.describe FormHandler do
     it "is able to load a current sales form" do
       form = form_handler.get_form("current_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(135)
+      expect(form.pages.count).to eq(136)
       expect(form.name).to eq("2022_2023_sales")
     end
 
     it "is able to load a previous sales form" do
       form = form_handler.get_form("previous_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(135)
+      expect(form.pages.count).to eq(136)
       expect(form.name).to eq("2021_2022_sales")
     end
   end