Browse Source

Add beds question to saleslog

pull/890/head
Ted-U 3 years ago
parent
commit
ea4407c76a
  1. 15
      app/models/form/sales/pages/property_number_of_bedrooms.rb
  2. 12
      app/models/form/sales/questions/property_number_of_bedrooms.rb
  3. 1
      app/models/form/sales/subsections/setup.rb
  4. 5
      db/migrate/20220921125813_add_property_number_of_bedrooms_to_sales_log.rb
  5. 3
      db/schema.rb
  6. 1
      spec/factories/sales_log.rb
  7. 29
      spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb
  8. 37
      spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
  9. 2
      spec/models/form/sales/subsections/setup_spec.rb
  10. 4
      spec/models/form_handler_spec.rb
  11. 4
      spec/models/form_spec.rb

15
app/models/form/sales/pages/property_number_of_bedrooms.rb

@ -0,0 +1,15 @@
class Form::Sales::Pages::PropertyNumberOfBedrooms < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "property_number_of_bedrooms"
@header = ""
@description = ""
@subsection = subsection
end
def questions
@questions ||= [
Form::Sales::Questions::PropertyNumberOfBedrooms.new(nil, nil, self),
]
end
end

12
app/models/form/sales/questions/property_number_of_bedrooms.rb

@ -0,0 +1,12 @@
class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question
def initialize(id, hsh, page)
super
@id = "beds"
@check_answer_label = "Number of bedrooms"
@header = "How many bedrooms does the property have?"
@hint_text = "A bedsit has 1 bedroom"
@type = "text"
@width = 10
@page = page
end
end

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

@ -17,6 +17,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
Form::Sales::Pages::DiscountedOwnershipType.new(nil, nil, self),
Form::Sales::Pages::OutrightOwnershipType.new(nil, nil, self),
Form::Sales::Pages::JointPurchase.new(nil, nil, self),
Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
]
end
end

5
db/migrate/20220921125813_add_property_number_of_bedrooms_to_sales_log.rb

@ -0,0 +1,5 @@
class AddPropertyNumberOfBedroomsToSalesLog < ActiveRecord::Migration[7.0]
def change
add_column :sales_logs, :beds, :integer
end
end

3
db/schema.rb

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.0].define(version: 2022_09_20_132907) do
ActiveRecord::Schema[7.0].define(version: 2022_09_21_125813) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -326,6 +326,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_20_132907) do
t.integer "ownershipsch"
t.integer "jointpur"
t.string "othtype"
t.integer "beds"
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"

1
spec/factories/sales_log.rb

@ -11,6 +11,7 @@ FactoryBot.define do
type { 8 }
saledate { Time.utc(2022, 2, 2, 10, 36, 49) }
jointpur { 1 }
beds { 2 }
end
end
end

29
spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb

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

37
spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb

@ -0,0 +1,37 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::PropertyNumberOfBedrooms, 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("beds")
end
it "has the correct header" do
expect(question.header).to eq("How many bedrooms does the property have?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Number of bedrooms")
end
it "has the correct type" do
expect(question.type).to eq("text")
end
it "is not marked as derived" do
expect(question.derived?).to be false
end
it "has the correct hint_text" do
expect(question.hint_text).to eq("A bedsit has 1 bedroom")
end
end

2
spec/models/form/sales/subsections/setup_spec.rb

@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
it "has correct pages" do
expect(setup.pages.map(&:id)).to eq(
%w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase],
%w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase property_number_of_bedrooms],
)
end

4
spec/models/form_handler_spec.rb

@ -61,14 +61,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(9)
expect(form.pages.count).to eq(10)
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(9)
expect(form.pages.count).to eq(10)
expect(form.name).to eq("2021_2022_sales")
end
end

4
spec/models/form_spec.rb

@ -218,9 +218,9 @@ RSpec.describe Form, type: :model do
expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup)
expect(form.subsections.count).to eq(1)
expect(form.subsections.first.id).to eq("setup")
expect(form.pages.count).to eq(9)
expect(form.pages.count).to eq(10)
expect(form.pages.first.id).to eq("organisation")
expect(form.questions.count).to eq(10)
expect(form.questions.count).to eq(11)
expect(form.questions.first.id).to eq("owning_organisation_id")
expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))

Loading…
Cancel
Save