Browse Source

CLDC 1478 add joint purchase question (#883)

* add joint purchase question

* lint

* add test for joint purchase question

* fix and add tests

* Delete created_by.rb

* merge conflict

* lint
pull/889/head
Ted-U 2 years ago committed by GitHub
parent
commit
38aa770c9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      app/models/form/sales/pages/joint_purchase.rb
  2. 17
      app/models/form/sales/questions/joint_purchase.rb
  3. 1
      app/models/form/sales/subsections/setup.rb
  4. 5
      db/migrate/20220920132907_add_joint_purchase_to_sales_log.rb
  5. 3
      db/schema.rb
  6. 1
      spec/factories/sales_log.rb
  7. 29
      spec/models/form/sales/pages/joint_purchase_spec.rb
  8. 44
      spec/models/form/sales/questions/joint_purchase_spec.rb
  9. 2
      spec/models/form/sales/subsections/setup_spec.rb
  10. 4
      spec/models/form_handler_spec.rb
  11. 4
      spec/models/form_spec.rb

15
app/models/form/sales/pages/joint_purchase.rb

@ -0,0 +1,15 @@
class Form::Sales::Pages::JointPurchase < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "joint_purchase"
@header = ""
@description = ""
@subsection = subsection
end
def questions
@questions ||= [
Form::Sales::Questions::JointPurchase.new(nil, nil, self),
]
end
end

17
app/models/form/sales/questions/joint_purchase.rb

@ -0,0 +1,17 @@
class Form::Sales::Questions::JointPurchase < ::Form::Question
def initialize(id, hsh, page)
super
@id = "jointpur"
@check_answer_label = "Joint purchase"
@header = "Is this a joint purchase?"
@hint_text = ""
@type = "radio"
@answer_options = ANSWER_OPTIONS
@page = page
end
ANSWER_OPTIONS = {
"1" => { "value" => "Yes" },
"2" => { "value" => "No" },
}.freeze
end

1
app/models/form/sales/subsections/setup.rb

@ -14,6 +14,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
Form::Sales::Pages::PurchaserCode.new(nil, nil, self), Form::Sales::Pages::PurchaserCode.new(nil, nil, self),
Form::Sales::Pages::OwnershipScheme.new(nil, nil, self), Form::Sales::Pages::OwnershipScheme.new(nil, nil, self),
Form::Sales::Pages::SharedOwnershipType.new(nil, nil, self), Form::Sales::Pages::SharedOwnershipType.new(nil, nil, self),
Form::Sales::Pages::JointPurchase.new(nil, nil, self),
] ]
end end
end end

5
db/migrate/20220920132907_add_joint_purchase_to_sales_log.rb

@ -0,0 +1,5 @@
class AddJointPurchaseToSalesLog < ActiveRecord::Migration[7.0]
def change
add_column :sales_logs, :jointpur, :integer
end
end

3
db/schema.rb

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.0].define(version: 2022_09_16_125704) do ActiveRecord::Schema[7.0].define(version: 2022_09_20_132907) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -324,6 +324,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_16_125704) do
t.string "purchid" t.string "purchid"
t.integer "type" t.integer "type"
t.integer "ownershipsch" t.integer "ownershipsch"
t.integer "jointpur"
t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" 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 ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

1
spec/factories/sales_log.rb

@ -9,6 +9,7 @@ FactoryBot.define do
purchid { "PC123" } purchid { "PC123" }
ownershipsch { 2 } ownershipsch { 2 }
saledate { Time.utc(2022, 2, 2, 10, 36, 49) } saledate { Time.utc(2022, 2, 2, 10, 36, 49) }
jointpur { 1 }
end end
end end
end end

29
spec/models/form/sales/pages/joint_purchase_spec.rb

@ -0,0 +1,29 @@
require "rails_helper"
RSpec.describe Form::Sales::Pages::JointPurchase, 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[jointpur])
end
it "has the correct id" do
expect(page.id).to eq("joint_purchase")
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

44
spec/models/form/sales/questions/joint_purchase_spec.rb

@ -0,0 +1,44 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::JointPurchase, 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("jointpur")
end
it "has the correct header" do
expect(question.header).to eq("Is this a joint purchase?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Joint purchase")
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

2
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 it "has correct pages" do
expect(setup.pages.map(&:id)).to eq( expect(setup.pages.map(&:id)).to eq(
%w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type], %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type joint_purchase],
) )
end end

4
spec/models/form_handler_spec.rb

@ -61,14 +61,14 @@ RSpec.describe FormHandler do
it "is able to load a current sales form" do it "is able to load a current sales form" do
form = form_handler.get_form("current_sales") form = form_handler.get_form("current_sales")
expect(form).to be_a(Form) expect(form).to be_a(Form)
expect(form.pages.count).to eq(6) expect(form.pages.count).to eq(7)
expect(form.name).to eq("2022_2023_sales") expect(form.name).to eq("2022_2023_sales")
end end
it "is able to load a previous sales form" do it "is able to load a previous sales form" do
form = form_handler.get_form("previous_sales") form = form_handler.get_form("previous_sales")
expect(form).to be_a(Form) expect(form).to be_a(Form)
expect(form.pages.count).to eq(6) expect(form.pages.count).to eq(7)
expect(form.name).to eq("2021_2022_sales") expect(form.name).to eq("2021_2022_sales")
end end
end end

4
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.sections[0].class).to eq(Form::Sales::Sections::Setup)
expect(form.subsections.count).to eq(1) expect(form.subsections.count).to eq(1)
expect(form.subsections.first.id).to eq("setup") expect(form.subsections.first.id).to eq("setup")
expect(form.pages.count).to eq(6) expect(form.pages.count).to eq(7)
expect(form.pages.first.id).to eq("organisation") expect(form.pages.first.id).to eq("organisation")
expect(form.questions.count).to eq(6) expect(form.questions.count).to eq(7)
expect(form.questions.first.id).to eq("owning_organisation_id") expect(form.questions.first.id).to eq("owning_organisation_id")
expect(form.start_date).to eq(Time.zone.parse("2022-04-01")) expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
expect(form.end_date).to eq(Time.zone.parse("2023-07-01")) expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))

Loading…
Cancel
Save