Browse Source

Outright sale type (#884)

* Add outright sale question and page

* Add other type column

* Add a conditional OtherOwnershipType question

* Fix hash
pull/891/head
kosiakkatrina 2 years ago committed by GitHub
parent
commit
67286125fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 19
      app/models/form/sales/pages/outright_ownership_type.rb
  2. 11
      app/models/form/sales/questions/other_ownership_type.rb
  3. 19
      app/models/form/sales/questions/outright_ownership_type.rb
  4. 1
      app/models/form/sales/subsections/setup.rb
  5. 5
      db/migrate/20220920090554_add_other_outright_sale_field.rb
  6. 1
      db/schema.rb
  7. 35
      spec/models/form/sales/pages/outright_ownership_type_spec.rb
  8. 33
      spec/models/form/sales/questions/other_ownership_type_spec.rb
  9. 46
      spec/models/form/sales/questions/outright_ownership_type_spec.rb
  10. 2
      spec/models/form/sales/subsections/setup_spec.rb
  11. 4
      spec/models/form_handler_spec.rb
  12. 4
      spec/models/form_spec.rb

19
app/models/form/sales/pages/outright_ownership_type.rb

@ -0,0 +1,19 @@
class Form::Sales::Pages::OutrightOwnershipType < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "outright_ownership_type"
@header = ""
@description = ""
@subsection = subsection
@depends_on = [{
"ownershipsch" => 3,
}]
end
def questions
@questions ||= [
Form::Sales::Questions::OutrightOwnershipType.new(nil, nil, self),
Form::Sales::Questions::OtherOwnershipType.new(nil, nil, self),
]
end
end

11
app/models/form/sales/questions/other_ownership_type.rb

@ -0,0 +1,11 @@
class Form::Sales::Questions::OtherOwnershipType < ::Form::Question
def initialize(id, hsh, page)
super
@id = "othtype"
@check_answer_label = "Type of other sale"
@header = "What type of sale is it?"
@type = "text"
@width = 10
@page = page
end
end

19
app/models/form/sales/questions/outright_ownership_type.rb

@ -0,0 +1,19 @@
class Form::Sales::Questions::OutrightOwnershipType < ::Form::Question
def initialize(id, hsh, page)
super
@id = "type"
@check_answer_label = "Type of outright sale"
@header = "What is the type of outright sale?"
@type = "radio"
@answer_options = ANSWER_OPTIONS
@page = page
@conditional_for = {
"othtype" => [12],
}
end
ANSWER_OPTIONS = {
"10" => { "value" => "Outright" },
"12" => { "value" => "Other sale" },
}.freeze
end

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

@ -15,6 +15,7 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
Form::Sales::Pages::OwnershipScheme.new(nil, nil, self),
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::JointPurchase.new(nil, nil, self),
]
end

5
db/migrate/20220920090554_add_other_outright_sale_field.rb

@ -0,0 +1,5 @@
class AddOtherOutrightSaleField < ActiveRecord::Migration[7.0]
def change
add_column :sales_logs, :othtype, :string
end
end

1
db/schema.rb

@ -325,6 +325,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_20_132907) do
t.integer "type"
t.integer "ownershipsch"
t.integer "jointpur"
t.string "othtype"
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"

35
spec/models/form/sales/pages/outright_ownership_type_spec.rb

@ -0,0 +1,35 @@
require "rails_helper"
RSpec.describe Form::Sales::Pages::OutrightOwnershipType, 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[type othtype])
end
it "has the correct id" do
expect(page.id).to eq("outright_ownership_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
it "has correct depends_on" do
expect(page.depends_on).to eq([{
"ownershipsch" => 3,
}])
end
end

33
spec/models/form/sales/questions/other_ownership_type_spec.rb

@ -0,0 +1,33 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::OtherOwnershipType, 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("othtype")
end
it "has the correct header" do
expect(question.header).to eq("What type of sale is it?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Type of other sale")
end
it "has the correct type" do
expect(question.type).to eq("text")
end
it "is not marked as derived" do
expect(question.derived?).to be false
end
end

46
spec/models/form/sales/questions/outright_ownership_type_spec.rb

@ -0,0 +1,46 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::OutrightOwnershipType, 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("type")
end
it "has the correct header" do
expect(question.header).to eq("What is the type of outright sale?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Type of outright sale")
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({
"10" => { "value" => "Outright" },
"12" => { "value" => "Other sale" },
})
end
it "has correct conditional for" do
expect(question.conditional_for).to eq({
"othtype" => [12],
})
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
expect(setup.pages.map(&:id)).to eq(
%w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type joint_purchase],
%w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase],
)
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
form = form_handler.get_form("current_sales")
expect(form).to be_a(Form)
expect(form.pages.count).to eq(8)
expect(form.pages.count).to eq(9)
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(8)
expect(form.pages.count).to eq(9)
expect(form.name).to eq("2021_2022_sales")
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.subsections.count).to eq(1)
expect(form.subsections.first.id).to eq("setup")
expect(form.pages.count).to eq(8)
expect(form.pages.count).to eq(9)
expect(form.pages.first.id).to eq("organisation")
expect(form.questions.count).to eq(8)
expect(form.questions.count).to eq(10)
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"))

Loading…
Cancel
Save