From 1c5fe93399aced736c7a5705b380af5e38af193a Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Wed, 21 Dec 2022 09:54:19 +0000 Subject: [PATCH] Cldc 1531 staircasing (#1109) * Add staircase field to sales_logs table * Add staircase question and page * add staircase page to the shared ownership scheme subsection fix file name --- app/models/form/sales/pages/staircase.rb | 15 ++++++ app/models/form/sales/questions/staircase.rb | 18 +++++++ .../subsections/shared_ownership_scheme.rb | 4 +- .../20221220174515_add_staircase_to_sales.rb | 7 +++ db/schema.rb | 5 +- .../models/form/sales/pages/staircase_spec.rb | 29 +++++++++++ .../form/sales/questions/staircase_spec.rb | 49 +++++++++++++++++++ .../shared_ownership_scheme_spec.rb | 4 +- spec/models/form_handler_spec.rb | 4 +- 9 files changed, 129 insertions(+), 6 deletions(-) create mode 100644 app/models/form/sales/pages/staircase.rb create mode 100644 app/models/form/sales/questions/staircase.rb create mode 100644 db/migrate/20221220174515_add_staircase_to_sales.rb create mode 100644 spec/models/form/sales/pages/staircase_spec.rb create mode 100644 spec/models/form/sales/questions/staircase_spec.rb diff --git a/app/models/form/sales/pages/staircase.rb b/app/models/form/sales/pages/staircase.rb new file mode 100644 index 000000000..139bd7e40 --- /dev/null +++ b/app/models/form/sales/pages/staircase.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::Staircase < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "staircasing" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::Staircase.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/staircase.rb b/app/models/form/sales/questions/staircase.rb new file mode 100644 index 000000000..e204414b9 --- /dev/null +++ b/app/models/form/sales/questions/staircase.rb @@ -0,0 +1,18 @@ +class Form::Sales::Questions::Staircase < ::Form::Question + def initialize(id, hsh, page) + super + @id = "staircase" + @check_answer_label = "Staircasing transaction" + @header = "Is this a staircasing transaction?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property" + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + "3" => { "value" => "Don’t know" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/shared_ownership_scheme.rb b/app/models/form/sales/subsections/shared_ownership_scheme.rb index f3e094430..bc6cd237b 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -8,7 +8,9 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection end def pages - @pages ||= [] + @pages ||= [ + Form::Sales::Pages::Staircase.new(nil, nil, self), + ] end def displayed_in_tasklist?(log) diff --git a/db/migrate/20221220174515_add_staircase_to_sales.rb b/db/migrate/20221220174515_add_staircase_to_sales.rb new file mode 100644 index 000000000..de0b28996 --- /dev/null +++ b/db/migrate/20221220174515_add_staircase_to_sales.rb @@ -0,0 +1,7 @@ +class AddStaircaseToSales < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :staircase, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 393022fd0..2246c8690 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_14_110208) do +ActiveRecord::Schema[7.0].define(version: 2022_12_20_174515) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -405,16 +405,17 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_14_110208) do t.integer "savings" t.integer "prevown" t.string "sex3" + t.bigint "updated_by_id" t.integer "details_known_1" t.integer "income1_value_check" t.integer "mortgage" t.integer "inc2mort" t.integer "mortgage_value_check" - t.bigint "updated_by_id" t.integer "ecstat3" t.integer "ecstat4" t.integer "ecstat5" t.integer "ecstat6" + t.integer "staircase" 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/staircase_spec.rb b/spec/models/form/sales/pages/staircase_spec.rb new file mode 100644 index 000000000..d2155f972 --- /dev/null +++ b/spec/models/form/sales/pages/staircase_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Staircase, 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[staircase]) + end + + it "has the correct id" do + expect(page.id).to eq("staircasing") + 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/staircase_spec.rb b/spec/models/form/sales/questions/staircase_spec.rb new file mode 100644 index 000000000..845e5242e --- /dev/null +++ b/spec/models/form/sales/questions/staircase_spec.rb @@ -0,0 +1,49 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Staircase, 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("staircase") + end + + it "has the correct header" do + expect(question.header).to eq("Is this a staircasing transaction?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Staircasing transaction") + 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" => "Yes" }, + "2" => { "value" => "No" }, + "3" => { "value" => "Don’t know" }, + }) + end + + it "has correct conditional for" do + expect(question.conditional_for).to eq(nil) + end + + it "has the correct hint" do + expect(question.hint_text).to eq("A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property") + 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 0a0ec6e15..e1118c0d9 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -13,7 +13,9 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do it "has correct pages" do expect(shared_ownership_scheme.pages.map(&:id)).to eq( - %w[], + %w[ + staircasing + ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 380fcd31f..e1878f2c1 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(68) + expect(form.pages.count).to eq(69) 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(68) + expect(form.pages.count).to eq(69) expect(form.name).to eq("2021_2022_sales") end end