From 0712c694e7d702e73266116f1c6b7bdaca8a58ae Mon Sep 17 00:00:00 2001 From: Dushan <47317567+dushan-madetech@users.noreply.github.com> Date: Tue, 27 Sep 2022 16:20:12 +0100 Subject: [PATCH] changes for buyer live (#892) feat: add migration and updated schema fix specs fix schema fix db field name and specs --- app/models/form/sales/pages/buyer_live.rb | 18 +++++++++ app/models/form/sales/questions/buyer_live.rb | 16 ++++++++ app/models/form/sales/subsections/setup.rb | 1 + ...21154025_add_company_buyer_to_sales_log.rb | 5 +++ ...0927133123_add_buy_live_in_to_sales_log.rb | 5 +++ db/schema.rb | 6 ++- .../form/sales/pages/buyer_live_spec.rb | 35 ++++++++++++++++ .../form/sales/questions/buyer_live_spec.rb | 40 +++++++++++++++++++ .../form/sales/subsections/setup_spec.rb | 2 +- spec/models/form_handler_spec.rb | 4 +- spec/models/form_spec.rb | 4 +- 11 files changed, 129 insertions(+), 7 deletions(-) create mode 100644 app/models/form/sales/pages/buyer_live.rb create mode 100644 app/models/form/sales/questions/buyer_live.rb create mode 100644 db/migrate/20220921154025_add_company_buyer_to_sales_log.rb create mode 100644 db/migrate/20220927133123_add_buy_live_in_to_sales_log.rb create mode 100644 spec/models/form/sales/pages/buyer_live_spec.rb create mode 100644 spec/models/form/sales/questions/buyer_live_spec.rb diff --git a/app/models/form/sales/pages/buyer_live.rb b/app/models/form/sales/pages/buyer_live.rb new file mode 100644 index 000000000..bf1302058 --- /dev/null +++ b/app/models/form/sales/pages/buyer_live.rb @@ -0,0 +1,18 @@ +class Form::Sales::Pages::BuyerLive < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_live" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [{ + "companybuy" => 2, + }] + end + + def questions + @questions ||= [ + Form::Sales::Questions::BuyerLive.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer_live.rb b/app/models/form/sales/questions/buyer_live.rb new file mode 100644 index 000000000..ad5ec7f22 --- /dev/null +++ b/app/models/form/sales/questions/buyer_live.rb @@ -0,0 +1,16 @@ +class Form::Sales::Questions::BuyerLive < ::Form::Question + def initialize(id, hsh, page) + super + @id = "buylivein" + @check_answer_label = "Buyers living in property" + @header = "Will the buyers live in the property?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb index 0eba081e2..2cc6f6886 100644 --- a/app/models/form/sales/subsections/setup.rb +++ b/app/models/form/sales/subsections/setup.rb @@ -16,6 +16,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection Form::Sales::Pages::SharedOwnershipType.new(nil, nil, self), Form::Sales::Pages::DiscountedOwnershipType.new(nil, nil, self), Form::Sales::Pages::OutrightOwnershipType.new(nil, nil, self), + Form::Sales::Pages::BuyerLive.new(nil, nil, self), Form::Sales::Pages::JointPurchase.new(nil, nil, self), Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self), ] diff --git a/db/migrate/20220921154025_add_company_buyer_to_sales_log.rb b/db/migrate/20220921154025_add_company_buyer_to_sales_log.rb new file mode 100644 index 000000000..89de76ca9 --- /dev/null +++ b/db/migrate/20220921154025_add_company_buyer_to_sales_log.rb @@ -0,0 +1,5 @@ +class AddCompanyBuyerToSalesLog < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :companybuy, :integer + end +end diff --git a/db/migrate/20220927133123_add_buy_live_in_to_sales_log.rb b/db/migrate/20220927133123_add_buy_live_in_to_sales_log.rb new file mode 100644 index 000000000..f656c6505 --- /dev/null +++ b/db/migrate/20220927133123_add_buy_live_in_to_sales_log.rb @@ -0,0 +1,5 @@ +class AddBuyLiveInToSalesLog < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :buylivein, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 53346ce42..5f86d013b 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_105552) do +ActiveRecord::Schema[7.0].define(version: 2022_09_27_133123) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -330,13 +330,15 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_27_105552) do t.integer "type" t.integer "ownershipsch" t.string "othtype" - t.integer "jointpur" t.integer "jointmore" + t.integer "jointpur" t.integer "beds" + t.integer "companybuy" t.integer "age1" t.integer "age1_known" t.string "sex1" t.integer "buy1livein" + t.integer "buylivein" 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/models/form/sales/pages/buyer_live_spec.rb b/spec/models/form/sales/pages/buyer_live_spec.rb new file mode 100644 index 000000000..70bab20bd --- /dev/null +++ b/spec/models/form/sales/pages/buyer_live_spec.rb @@ -0,0 +1,35 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::BuyerLive, 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[buylivein]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_live") + 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([{ + "companybuy" => 2, + }]) + end +end diff --git a/spec/models/form/sales/questions/buyer_live_spec.rb b/spec/models/form/sales/questions/buyer_live_spec.rb new file mode 100644 index 000000000..a946a7905 --- /dev/null +++ b/spec/models/form/sales/questions/buyer_live_spec.rb @@ -0,0 +1,40 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::BuyerLive, 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("buylivein") + end + + it "has the correct header" do + expect(question.header).to eq("Will the buyers live in the property?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyers living in property") + 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" => "Yes" }, + "2" => { "value" => "No" }, + }) + end +end diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb index 1aab686ac..054b45249 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 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], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 9fe6804a2..2fbcb5900 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(14) + expect(form.pages.count).to eq(15) 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(14) + expect(form.pages.count).to eq(15) expect(form.name).to eq("2021_2022_sales") end end diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb index 7eb2fee3f..a55c404d7 100644 --- a/spec/models/form_spec.rb +++ b/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(10) + expect(form.pages.count).to eq(11) expect(form.pages.first.id).to eq("organisation") - expect(form.questions.count).to eq(11) + expect(form.questions.count).to eq(12) 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"))