From f93c1d1b1fd1ec0a6c628f9909e9bc2ec90a7ad1 Mon Sep 17 00:00:00 2001 From: Dushan Despotovic Date: Tue, 27 Sep 2022 11:04:30 +0100 Subject: [PATCH] model changes --- .../form/sales/pages/property_unit_type.rb | 15 +++++++ .../sales/questions/property_unit_type.rb | 19 ++++++++ .../sales/subsections/property_information.rb | 1 + ...220928132657_add_prop_type_to_sales_log.rb | 5 +++ db/schema.rb | 3 +- spec/factories/sales_log.rb | 1 + .../sales/pages/property_unit_type_spec.rb | 29 +++++++++++++ .../questions/property_unit_type_spec.rb | 43 +++++++++++++++++++ .../subsections/property_information_spec.rb | 2 +- spec/models/form_handler_spec.rb | 4 +- 10 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 app/models/form/sales/pages/property_unit_type.rb create mode 100644 app/models/form/sales/questions/property_unit_type.rb create mode 100644 db/migrate/20220928132657_add_prop_type_to_sales_log.rb create mode 100644 spec/models/form/sales/pages/property_unit_type_spec.rb create mode 100644 spec/models/form/sales/questions/property_unit_type_spec.rb diff --git a/app/models/form/sales/pages/property_unit_type.rb b/app/models/form/sales/pages/property_unit_type.rb new file mode 100644 index 000000000..9ee5506ca --- /dev/null +++ b/app/models/form/sales/pages/property_unit_type.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::PropertyUnitType < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "property_unit_type" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::PropertyUnitType.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/property_unit_type.rb b/app/models/form/sales/questions/property_unit_type.rb new file mode 100644 index 000000000..2ebc1a8c2 --- /dev/null +++ b/app/models/form/sales/questions/property_unit_type.rb @@ -0,0 +1,19 @@ +class Form::Sales::Questions::PropertyUnitType < ::Form::Question + def initialize(id, hsh, page) + super + @id = "proptype" + @check_answer_label = "Type of unit" + @header = "What type of unit is the property?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Flat or maisonette" }, + "2" => { "value" => "Bedsit" }, + "3" => { "value" => "House" }, + "4" => { "value" => "Bungalow" }, + "9" => { "value" => "Other" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb index 22983049b..6a0287de4 100644 --- a/app/models/form/sales/subsections/property_information.rb +++ b/app/models/form/sales/subsections/property_information.rb @@ -10,6 +10,7 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection def pages @pages ||= [ Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self), + Form::Sales::Pages::PropertyUnitType.new(nil, nil, self), ] end end diff --git a/db/migrate/20220928132657_add_prop_type_to_sales_log.rb b/db/migrate/20220928132657_add_prop_type_to_sales_log.rb new file mode 100644 index 000000000..4be6f5d21 --- /dev/null +++ b/db/migrate/20220928132657_add_prop_type_to_sales_log.rb @@ -0,0 +1,5 @@ +class AddPropTypeToSalesLog < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :proptype, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 5f86d013b..e6037aac8 100644 --- a/db/schema.rb +++ b/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_27_133123) do +ActiveRecord::Schema[7.0].define(version: 2022_09_28_132657) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -339,6 +339,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_27_133123) do t.string "sex1" t.integer "buy1livein" t.integer "buylivein" + t.integer "proptype" 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 035c981b1..17b89957b 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -23,6 +23,7 @@ FactoryBot.define do age1 { 30 } sex1 { "X" } buy1livein { 1 } + proptype { 1 } end end end diff --git a/spec/models/form/sales/pages/property_unit_type_spec.rb b/spec/models/form/sales/pages/property_unit_type_spec.rb new file mode 100644 index 000000000..b9e9aa450 --- /dev/null +++ b/spec/models/form/sales/pages/property_unit_type_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::PropertyUnitType, 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[proptype]) + end + + it "has the correct id" do + expect(page.id).to eq("property_unit_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 +end diff --git a/spec/models/form/sales/questions/property_unit_type_spec.rb b/spec/models/form/sales/questions/property_unit_type_spec.rb new file mode 100644 index 000000000..967ffe32d --- /dev/null +++ b/spec/models/form/sales/questions/property_unit_type_spec.rb @@ -0,0 +1,43 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::PropertyUnitType, 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("proptype") + end + + it "has the correct header" do + expect(question.header).to eq("What type of unit is the property?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Type of unit") + 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 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 diff --git a/spec/models/form/sales/subsections/property_information_spec.rb b/spec/models/form/sales/subsections/property_information_spec.rb index 95c09f016..76985d7c0 100644 --- a/spec/models/form/sales/subsections/property_information_spec.rb +++ b/spec/models/form/sales/subsections/property_information_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do it "has correct pages" do expect(property_information.pages.map(&:id)).to eq( - %w[property_number_of_bedrooms], + %w[property_number_of_bedrooms property_unit_type], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 2fbcb5900..a9f2cb139 100644 --- a/spec/models/form_handler_spec.rb +++ b/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(15) + expect(form.pages.count).to eq(16) 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(15) + expect(form.pages.count).to eq(16) expect(form.name).to eq("2021_2022_sales") end end