From 680e9add68766a3912c7500e043be7c94aaddbf5 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire <94526761+natdeanlewissoftwire@users.noreply.github.com> Date: Fri, 30 Sep 2022 12:29:51 +0100 Subject: [PATCH] Cldc 1482 sales log buyer company (#893) * feat: add boyer_company page and question (migration still to be committed) * feat: add migration and updated schema * feat: update tests (and add housingneeds_type to schema that was previously missing) * tests: add tests for question and page * refactor: spacing * feat: update schema * feat: add boyer_company page and question (migration still to be committed) * feat: add migration and updated schema * feat: update tests (and add housingneeds_type to schema that was previously missing) * tests: add tests for question and page * refactor: spacing * feat: update test * feat: add boyer_company page and question (migration still to be committed) * feat: add migration and updated schema * feat: update tests (and add housingneeds_type to schema that was previously missing) * tests: add tests for question and page * refactor: spacing * feat: add boyer_company page and question (migration still to be committed) * feat: add migration and updated schema * feat: update tests (and add housingneeds_type to schema that was previously missing) * tests: add tests for question and page * refactor: spacing * feat: add migration and updated schema * feat: update tests (and add housingneeds_type to schema that was previously missing) * feat: add migration and updated schema * feat: update tests (and add housingneeds_type to schema that was previously missing) * feat: add migration and updated schema * feat: update tests (and add housingneeds_type to schema that was previously missing) * test: update tests --- app/models/form/sales/pages/buyer_company.rb | 15 +++++++ .../form/sales/questions/buyer_company.rb | 17 ++++++++ app/models/form/sales/subsections/setup.rb | 1 + spec/factories/sales_log.rb | 1 + .../form/sales/pages/buyer_company_spec.rb | 29 ++++++++++++++ .../sales/questions/buyer_company_spec.rb | 40 +++++++++++++++++++ .../form/sales/subsections/setup_spec.rb | 2 +- spec/models/form_handler_spec.rb | 4 +- spec/models/form_spec.rb | 4 +- 9 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 app/models/form/sales/pages/buyer_company.rb create mode 100644 app/models/form/sales/questions/buyer_company.rb create mode 100644 spec/models/form/sales/pages/buyer_company_spec.rb create mode 100644 spec/models/form/sales/questions/buyer_company_spec.rb diff --git a/app/models/form/sales/pages/buyer_company.rb b/app/models/form/sales/pages/buyer_company.rb new file mode 100644 index 000000000..6985a3908 --- /dev/null +++ b/app/models/form/sales/pages/buyer_company.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::BuyerCompany < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_company" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::BuyerCompany.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer_company.rb b/app/models/form/sales/questions/buyer_company.rb new file mode 100644 index 000000000..70c732866 --- /dev/null +++ b/app/models/form/sales/questions/buyer_company.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::BuyerCompany < ::Form::Question + def initialize(id, hsh, page) + super + @id = "companybuy" + @check_answer_label = "Company buyer" + @header = "Is the buyer a company?" + @hint_text = "" + @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 7601bbb51..b9ba89dcf 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::BuyerCompany.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/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 670131681..0a8a56ee0 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -16,6 +16,7 @@ FactoryBot.define do ownershipsch { 2 } type { 8 } saledate { Time.utc(2022, 2, 2, 10, 36, 49) } + companybuy { 1 } jointpur { 1 } beds { 2 } jointmore { 1 } diff --git a/spec/models/form/sales/pages/buyer_company_spec.rb b/spec/models/form/sales/pages/buyer_company_spec.rb new file mode 100644 index 000000000..94b42c28b --- /dev/null +++ b/spec/models/form/sales/pages/buyer_company_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::BuyerCompany, 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[companybuy]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_company") + 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/buyer_company_spec.rb b/spec/models/form/sales/questions/buyer_company_spec.rb new file mode 100644 index 000000000..1d7d98940 --- /dev/null +++ b/spec/models/form/sales/questions/buyer_company_spec.rb @@ -0,0 +1,40 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::BuyerCompany, 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("companybuy") + end + + it "has the correct header" do + expect(question.header).to eq("Is the buyer a company?") + 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" => "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 ca63d092d..ec7ff4ada 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 builtype], + %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type buyer_company buyer_live joint_purchase number_joint_buyers builtype], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index b991a0278..e323fdaea 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(19) + expect(form.pages.count).to eq(20) 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(19) + expect(form.pages.count).to eq(20) 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 c4da6ecf4..571e7930e 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(12) + expect(form.pages.count).to eq(13) expect(form.pages.first.id).to eq("organisation") - expect(form.questions.count).to eq(13) + expect(form.questions.count).to eq(14) 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"))