From 0103ae4b34f3ac5b304e71d362775352c110a3e2 Mon Sep 17 00:00:00 2001 From: Dushan Despotovic Date: Tue, 20 Sep 2022 14:22:49 +0100 Subject: [PATCH] add ownership scheme --- .../form/sales/pages/ownership_scheme.rb | 15 +++++++ .../form/sales/questions/ownership_scheme.rb | 17 ++++++++ app/models/form/sales/subsections/setup.rb | 1 + spec/factories/sales_log.rb | 1 + .../form/sales/pages/ownership_scheme_spec.rb | 29 +++++++++++++ .../sales/questions/ownership_scheme_spec.rb | 41 +++++++++++++++++++ .../form/sales/subsections/setup_spec.rb | 2 +- spec/models/form_handler_spec.rb | 4 +- spec/models/form_spec.rb | 4 +- 9 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 app/models/form/sales/pages/ownership_scheme.rb create mode 100644 app/models/form/sales/questions/ownership_scheme.rb create mode 100644 spec/models/form/sales/pages/ownership_scheme_spec.rb create mode 100644 spec/models/form/sales/questions/ownership_scheme_spec.rb diff --git a/app/models/form/sales/pages/ownership_scheme.rb b/app/models/form/sales/pages/ownership_scheme.rb new file mode 100644 index 000000000..224bc52a2 --- /dev/null +++ b/app/models/form/sales/pages/ownership_scheme.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::OwnershipScheme < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "ownership_scheme" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::OwnershipScheme.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/ownership_scheme.rb b/app/models/form/sales/questions/ownership_scheme.rb new file mode 100644 index 000000000..26c10d8f9 --- /dev/null +++ b/app/models/form/sales/questions/ownership_scheme.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::OwnershipScheme < ::Form::Question + def initialize(id, hsh, page) + super + @id = "ownershipsch" + @check_answer_label = "Purchase made under ownership scheme" + @header = "Was this purchase made through an ownership scheme?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Shared ownership" }, + "2" => { "value" => "Discounted ownership" }, + "3" => { "value" => "Outright or other" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb index d72e44aa0..d0796ce12 100644 --- a/app/models/form/sales/subsections/setup.rb +++ b/app/models/form/sales/subsections/setup.rb @@ -12,6 +12,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection Form::Common::Pages::CreatedBy.new(nil, nil, self), Form::Sales::Pages::SaleDate.new(nil, nil, self), Form::Sales::Pages::PurchaserCode.new(nil, nil, self), + Form::Sales::Pages::OwnershipScheme.new(nil, nil, self), Form::Sales::Pages::SharedOwnershipType.new(nil, nil, self), ] end diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 7efdd4039..369ca40ae 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -7,6 +7,7 @@ FactoryBot.define do updated_at { Time.utc(2022, 2, 8, 16, 52, 15) } trait :completed do purchid { "PC123" } + ownershipsch { 2 } saledate { Time.utc(2022, 2, 2, 10, 36, 49) } end end diff --git a/spec/models/form/sales/pages/ownership_scheme_spec.rb b/spec/models/form/sales/pages/ownership_scheme_spec.rb new file mode 100644 index 000000000..7199c618b --- /dev/null +++ b/spec/models/form/sales/pages/ownership_scheme_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::OwnershipScheme, 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[ownershipsch]) + end + + it "has the correct id" do + expect(page.id).to eq("ownership_scheme") + 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/ownership_scheme_spec.rb b/spec/models/form/sales/questions/ownership_scheme_spec.rb new file mode 100644 index 000000000..97f3dcaa6 --- /dev/null +++ b/spec/models/form/sales/questions/ownership_scheme_spec.rb @@ -0,0 +1,41 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::OwnershipScheme, 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("ownershipsch") + end + + it "has the correct header" do + expect(question.header).to eq("Was this purchase made through an ownership scheme?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Purchase made under ownership scheme") + 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" => "Shared ownership" }, + "2" => { "value" => "Discounted ownership" }, + "3" => { "value" => "Outright or other" }, + }) + end +end diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb index 80b27e261..5e292feb9 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 shared_ownership_type], + %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 499101f2b..ced1643dd 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(5) + expect(form.pages.count).to eq(6) 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(5) + expect(form.pages.count).to eq(6) 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 38caa5ec6..fdea4d9a8 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(5) + expect(form.pages.count).to eq(6) expect(form.pages.first.id).to eq("organisation") - expect(form.questions.count).to eq(5) + expect(form.questions.count).to eq(6) 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"))