diff --git a/app/models/form/sales/pages/building_type.rb b/app/models/form/sales/pages/building_type.rb new file mode 100644 index 000000000..f37319ee1 --- /dev/null +++ b/app/models/form/sales/pages/building_type.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::BuildingType < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "builtype" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::BuildingType.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/building_type.rb b/app/models/form/sales/questions/building_type.rb new file mode 100644 index 000000000..2ddded5b7 --- /dev/null +++ b/app/models/form/sales/questions/building_type.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::BuildingType < ::Form::Question + def initialize(id, hsh, page) + super + @id = "builtype" + @check_answer_label = "Building type" + @header = "What type of building is the property?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "" + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Purpose built" }, + "2" => { "value" => "Converted from previous residential or non-residential property" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb index 2cc6f6886..7601bbb51 100644 --- a/app/models/form/sales/subsections/setup.rb +++ b/app/models/form/sales/subsections/setup.rb @@ -19,6 +19,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection Form::Sales::Pages::BuyerLive.new(nil, nil, self), Form::Sales::Pages::JointPurchase.new(nil, nil, self), Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self), + Form::Sales::Pages::BuildingType.new(nil, nil, self), ] end end diff --git a/db/migrate/20220927144455_add_building_type_to_sales_log.rb b/db/migrate/20220927144455_add_building_type_to_sales_log.rb new file mode 100644 index 000000000..0c5719415 --- /dev/null +++ b/db/migrate/20220927144455_add_building_type_to_sales_log.rb @@ -0,0 +1,5 @@ +class AddBuildingTypeToSalesLog < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :builtype, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 83be5a7b8..8ebce5bdf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,11 @@ # # It's strongly recommended that you check this file into your version control system. +<<<<<<< HEAD ActiveRecord::Schema[7.0].define(version: 2022_09_29_105157) do +======= +ActiveRecord::Schema[7.0].define(version: 2022_09_27_144455) do +>>>>>>> 4cbe8d92 (add type of building question to sales) # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -342,6 +346,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_29_105157) do t.integer "proptype" t.integer "age2" t.integer "age2_known" + t.integer "builtype" 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" diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index f565772cb..437ba6361 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -26,6 +26,7 @@ FactoryBot.define do proptype { 1 } age2_known { 0 } age2 { 35 } + builtype { 1 } end end end diff --git a/spec/models/form/sales/pages/building_type_spec.rb b/spec/models/form/sales/pages/building_type_spec.rb new file mode 100644 index 000000000..03824cb4e --- /dev/null +++ b/spec/models/form/sales/pages/building_type_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::BuildingType, 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[builtype]) + end + + it "has the correct id" do + expect(page.id).to eq("builtype") + 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 diff --git a/spec/models/form/sales/questions/building_type_spec.rb b/spec/models/form/sales/questions/building_type_spec.rb new file mode 100644 index 000000000..bdd806e47 --- /dev/null +++ b/spec/models/form/sales/questions/building_type_spec.rb @@ -0,0 +1,44 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::BuildingType, 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("builtype") + end + + it "has the correct header" do + expect(question.header).to eq("What type of building is the property?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Building 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_text" do + expect(question.hint_text).to eq("") + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "1" => { "value" => "Purpose built" }, + "2" => { "value" => "Converted from previous residential or non-residential property" }, + }) + end +end diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb index 054b45249..ca63d092d 100644 --- a/spec/models/form/sales/subsections/setup_spec.rb +++ b/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 buyer_live joint_purchase number_joint_buyers], + %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type buyer_live joint_purchase number_joint_buyers builtype], ) end