diff --git a/app/models/form/sales/pages/about_staircase.rb b/app/models/form/sales/pages/about_staircase.rb new file mode 100644 index 000000000..03ea570f7 --- /dev/null +++ b/app/models/form/sales/pages/about_staircase.rb @@ -0,0 +1,19 @@ +class Form::Sales::Pages::AboutStaircase < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "about_staircasing" + @header = "About the staircasing transaction" + @description = "" + @subsection = subsection + @depends_on = [{ + "staircase" => 1, + }] + end + + def questions + @questions ||= [ + Form::Sales::Questions::StaircaseBought.new(nil, nil, self), + Form::Sales::Questions::StaircaseOwned.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/staircase_bought.rb b/app/models/form/sales/questions/staircase_bought.rb new file mode 100644 index 000000000..5afca794d --- /dev/null +++ b/app/models/form/sales/questions/staircase_bought.rb @@ -0,0 +1,14 @@ +class Form::Sales::Questions::StaircaseBought < ::Form::Question + def initialize(id, hsh, page) + super + @id = "stairbought" + @check_answer_label = "Percentage bought in this staircasing transaction" + @header = "What percentage of the property has been bought in this staircasing transaction?" + @type = "numeric" + @page = page + @width = 5 + @min = 0 + @max = 100 + @suffix = " percent" + end +end diff --git a/app/models/form/sales/questions/staircase_owned.rb b/app/models/form/sales/questions/staircase_owned.rb new file mode 100644 index 000000000..0fa37ec7a --- /dev/null +++ b/app/models/form/sales/questions/staircase_owned.rb @@ -0,0 +1,14 @@ +class Form::Sales::Questions::StaircaseOwned < ::Form::Question + def initialize(id, hsh, page) + super + @id = "stairowned" + @check_answer_label = "Percentage the buyer now owns in total" + @header = "What percentage of the property does the buyer now own in total?" + @type = "numeric" + @page = page + @width = 5 + @min = 0 + @max = 100 + @suffix = " percent" + end +end diff --git a/app/models/form/sales/subsections/shared_ownership_scheme.rb b/app/models/form/sales/subsections/shared_ownership_scheme.rb index 0856b3717..a80b482aa 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -10,6 +10,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection def pages @pages ||= [ Form::Sales::Pages::Staircase.new(nil, nil, self), + Form::Sales::Pages::AboutStaircase.new(nil, nil, self), Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self), ] end diff --git a/db/migrate/20221221081709_add_staircase_fields_to_sales.rb b/db/migrate/20221221081709_add_staircase_fields_to_sales.rb new file mode 100644 index 000000000..0d6dd143e --- /dev/null +++ b/db/migrate/20221221081709_add_staircase_fields_to_sales.rb @@ -0,0 +1,8 @@ +class AddStaircaseFieldsToSales < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :stairbought, :integer + t.column :stairowned, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 774735d7a..4f81ac646 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_12_20_174515) do +ActiveRecord::Schema[7.0].define(version: 2022_12_21_081709) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -417,6 +417,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_20_174515) do t.integer "ecstat6" t.integer "frombeds" t.integer "staircase" + t.integer "stairbought" + t.integer "stairowned" 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/about_staircase_spec.rb b/spec/models/form/sales/pages/about_staircase_spec.rb new file mode 100644 index 000000000..9fe34ba86 --- /dev/null +++ b/spec/models/form/sales/pages/about_staircase_spec.rb @@ -0,0 +1,35 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::AboutStaircase, 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[stairbought stairowned]) + end + + it "has the correct id" do + expect(page.id).to eq("about_staircasing") + end + + it "has the correct header" do + expect(page.header).to eq("About the staircasing transaction") + 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([{ + "staircase" => 1, + }]) + end +end diff --git a/spec/models/form/sales/questions/staircase_bought_spec.rb b/spec/models/form/sales/questions/staircase_bought_spec.rb new file mode 100644 index 000000000..96716dbd3 --- /dev/null +++ b/spec/models/form/sales/questions/staircase_bought_spec.rb @@ -0,0 +1,57 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::StaircaseBought, 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("stairbought") + end + + it "has the correct header" do + expect(question.header).to eq("What percentage of the property has been bought in this staircasing transaction?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Percentage bought in this staircasing transaction") + end + + it "has the correct type" do + expect(question.type).to eq("numeric") + end + + it "is not marked as derived" do + expect(question.derived?).to be false + end + + it "has the correct hint" do + expect(question.hint_text).to be_nil + end + + it "has the correct width" do + expect(question.width).to eq(5) + end + + it "has the correct inferred check answers value" do + expect(question.inferred_check_answers_value).to eq(nil) + end + + it "has correct suffix" do + expect(question.suffix).to eq(" percent") + end + + it "has correct min" do + expect(question.min).to eq(0) + end + + it "has correct max" do + expect(question.max).to eq(100) + end +end diff --git a/spec/models/form/sales/questions/staircase_owned_spec.rb b/spec/models/form/sales/questions/staircase_owned_spec.rb new file mode 100644 index 000000000..56b563990 --- /dev/null +++ b/spec/models/form/sales/questions/staircase_owned_spec.rb @@ -0,0 +1,57 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::StaircaseOwned, 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("stairowned") + end + + it "has the correct header" do + expect(question.header).to eq("What percentage of the property does the buyer now own in total?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Percentage the buyer now owns in total") + end + + it "has the correct type" do + expect(question.type).to eq("numeric") + end + + it "is not marked as derived" do + expect(question.derived?).to be false + end + + it "has the correct hint" do + expect(question.hint_text).to be_nil + end + + it "has the correct width" do + expect(question.width).to eq(5) + end + + it "has the correct inferred check answers value" do + expect(question.inferred_check_answers_value).to eq(nil) + end + + it "has correct suffix" do + expect(question.suffix).to eq(" percent") + end + + it "has correct min" do + expect(question.min).to eq(0) + end + + it "has correct max" do + expect(question.max).to eq(100) + end +end diff --git a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb index c05c73dee..21e9b6938 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -15,6 +15,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do expect(shared_ownership_scheme.pages.map(&:id)).to eq( %w[ staircasing + about_staircasing previous_bedrooms ], ) diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 6c5f51a8e..1f6f4676c 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,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(70) + expect(form.pages.count).to eq(71) 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(70) + expect(form.pages.count).to eq(71) expect(form.name).to eq("2021_2022_sales") end end