Browse Source

CLDC-1748 Add previous tenure question (#1160)

* Add previous tenure to sales table

* Add page and question for previous tenure

* Add previous tenure to the shared ownership subsection
pull/1180/head
kosiakkatrina 2 years ago committed by GitHub
parent
commit
7056115f57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      app/models/form/sales/pages/previous_tenure.rb
  2. 20
      app/models/form/sales/questions/previous_tenure.rb
  3. 1
      app/models/form/sales/subsections/shared_ownership_scheme.rb
  4. 7
      db/migrate/20230109140532_add_previous_tenure_to_sales.rb
  5. 1
      db/schema.rb
  6. 35
      spec/models/form/sales/pages/previous_tenure_spec.rb
  7. 47
      spec/models/form/sales/questions/previous_tenure_spec.rb
  8. 1
      spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
  9. 4
      spec/models/form_handler_spec.rb

18
app/models/form/sales/pages/previous_tenure.rb

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

20
app/models/form/sales/questions/previous_tenure.rb

@ -0,0 +1,20 @@
class Form::Sales::Questions::PreviousTenure < ::Form::Question
def initialize(id, hsh, page)
super
@id = "socprevten"
@check_answer_label = "Previous property tenure"
@header = "What was the previous tenure of the buyer?"
@type = "radio"
@hint_text = ""
@page = page
@answer_options = ANSWER_OPTIONS
end
ANSWER_OPTIONS = {
"1" => { "value" => "Social Rent" },
"2" => { "value" => "Affordable Rent" },
"3" => { "value" => "London Affordable Rent" },
"9" => { "value" => "Other" },
"10" => { "value" => "Don’t know" },
}.freeze
end

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

@ -18,6 +18,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
Form::Sales::Pages::BuyerPrevious.new(nil, nil, self), Form::Sales::Pages::BuyerPrevious.new(nil, nil, self),
Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self), Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self),
Form::Sales::Pages::PreviousPropertyType.new(nil, nil, self), Form::Sales::Pages::PreviousPropertyType.new(nil, nil, self),
Form::Sales::Pages::PreviousTenure.new(nil, nil, self),
Form::Sales::Pages::AboutPriceSharedOwnership.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::Mortgageused.new("mortgage_used_shared_ownership", nil, self),
Form::Sales::Pages::MortgageAmount.new("mortgage_amount_shared_ownership", nil, self), Form::Sales::Pages::MortgageAmount.new("mortgage_amount_shared_ownership", nil, self),

7
db/migrate/20230109140532_add_previous_tenure_to_sales.rb

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

1
db/schema.rb

@ -472,6 +472,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_09_160738) do
t.integer "homonth" t.integer "homonth"
t.integer "hoyear" t.integer "hoyear"
t.integer "fromprop" t.integer "fromprop"
t.integer "socprevten"
t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" 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 ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

35
spec/models/form/sales/pages/previous_tenure_spec.rb

@ -0,0 +1,35 @@
require "rails_helper"
RSpec.describe Form::Sales::Pages::PreviousTenure, 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[socprevten])
end
it "has the correct id" do
expect(page.id).to eq("shared_ownership_previous_tenure")
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

47
spec/models/form/sales/questions/previous_tenure_spec.rb

@ -0,0 +1,47 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::PreviousTenure, 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("socprevten")
end
it "has the correct header" do
expect(question.header).to eq("What was the previous tenure of the buyer?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Previous property tenure")
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" => "Social Rent" },
"2" => { "value" => "Affordable Rent" },
"3" => { "value" => "London Affordable Rent" },
"9" => { "value" => "Other" },
"10" => { "value" => "Don’t know" },
})
end
end

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

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

4
spec/models/form_handler_spec.rb

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

Loading…
Cancel
Save