From d7336a6639fdf6bd2147d6480fa0a27d6878d4af Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:52:05 +0000 Subject: [PATCH] Cldc 1519 previous ownership (#1054) * Add previous ownership to the db * Add previous ownership question * Add previous ownership page and update subsection * Reset schema and tests * migrate --- .../form/sales/pages/previous_ownership.rb | 15 ++++++ app/models/form/sales/questions/prevown.rb | 18 +++++++ .../income_benefits_and_savings.rb | 1 + ...2100512_add_previous_ownership_to_sales.rb | 7 +++ db/schema.rb | 3 +- spec/factories/sales_log.rb | 1 + .../sales/pages/previous_ownership_spec.rb | 29 +++++++++++ .../form/sales/questions/prevown_spec.rb | 49 +++++++++++++++++++ .../income_benefits_and_savings_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 10 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 app/models/form/sales/pages/previous_ownership.rb create mode 100644 app/models/form/sales/questions/prevown.rb create mode 100644 db/migrate/20221202100512_add_previous_ownership_to_sales.rb create mode 100644 spec/models/form/sales/pages/previous_ownership_spec.rb create mode 100644 spec/models/form/sales/questions/prevown_spec.rb diff --git a/app/models/form/sales/pages/previous_ownership.rb b/app/models/form/sales/pages/previous_ownership.rb new file mode 100644 index 000000000..17fb00a6b --- /dev/null +++ b/app/models/form/sales/pages/previous_ownership.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::PreviousOwnership < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "previous_ownership" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::Prevown.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/prevown.rb b/app/models/form/sales/questions/prevown.rb new file mode 100644 index 000000000..9127a84c1 --- /dev/null +++ b/app/models/form/sales/questions/prevown.rb @@ -0,0 +1,18 @@ +class Form::Sales::Questions::Prevown < ::Form::Question + def initialize(id, hsh, page) + super + @id = "prevown" + @check_answer_label = "Buyers previously owned a property" + @header = "Has the buyer previously owned a property?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "" + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + "3" => { "value" => "Don’t know" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/income_benefits_and_savings.rb b/app/models/form/sales/subsections/income_benefits_and_savings.rb index aed3304ba..74a07231b 100644 --- a/app/models/form/sales/subsections/income_benefits_and_savings.rb +++ b/app/models/form/sales/subsections/income_benefits_and_savings.rb @@ -13,6 +13,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection Form::Sales::Pages::Buyer1Mortgage.new(nil, nil, self), Form::Sales::Pages::Buyer2Income.new(nil, nil, self), Form::Sales::Pages::Savings.new(nil, nil, self), + Form::Sales::Pages::PreviousOwnership.new(nil, nil, self), ] end end diff --git a/db/migrate/20221202100512_add_previous_ownership_to_sales.rb b/db/migrate/20221202100512_add_previous_ownership_to_sales.rb new file mode 100644 index 000000000..2953b5333 --- /dev/null +++ b/db/migrate/20221202100512_add_previous_ownership_to_sales.rb @@ -0,0 +1,7 @@ +class AddPreviousOwnershipToSales < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :prevown, :int + end + end +end diff --git a/db/schema.rb b/db/schema.rb index a49ca6568..912eba818 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_02_083418) do +ActiveRecord::Schema[7.0].define(version: 2022_12_02_100512) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -389,6 +389,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_02_083418) do t.integer "income2nk" t.integer "savingsnk" t.integer "savings" + t.integer "prevown" 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/factories/sales_log.rb b/spec/factories/sales_log.rb index de136bc6a..2bcc7d1b2 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -58,6 +58,7 @@ FactoryBot.define do la_known { "1" } la { "E09000003" } savingsnk { 1 } + prevown { 1 } end end end diff --git a/spec/models/form/sales/pages/previous_ownership_spec.rb b/spec/models/form/sales/pages/previous_ownership_spec.rb new file mode 100644 index 000000000..59d8611da --- /dev/null +++ b/spec/models/form/sales/pages/previous_ownership_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::PreviousOwnership, 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[prevown]) + end + + it "has the correct id" do + expect(page.id).to eq("previous_ownership") + 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/prevown_spec.rb b/spec/models/form/sales/questions/prevown_spec.rb new file mode 100644 index 000000000..b98ba77ef --- /dev/null +++ b/spec/models/form/sales/questions/prevown_spec.rb @@ -0,0 +1,49 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Prevown, 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("prevown") + end + + it "has the correct header" do + expect(question.header).to eq("Has the buyer previously owned a property?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyers previously owned a property") + 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("") + end +end diff --git a/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb b/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb index 95735c020..a30e49163 100644 --- a/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb +++ b/spec/models/form/sales/subsections/income_benefits_and_savings_spec.rb @@ -18,6 +18,7 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndSavings, type: :model buyer_1_mortgage buyer_2_income savings + previous_ownership ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 5fa29a664..b6efb7bbd 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(47) + expect(form.pages.count).to eq(48) 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(47) + expect(form.pages.count).to eq(48) expect(form.name).to eq("2021_2022_sales") end end