From 649ea4c5d1ca5eb325561dffc0838c17c4913d8f Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Thu, 22 Dec 2022 11:02:53 +0000 Subject: [PATCH] Cldc 1538 la nominations (#1115) * Add la nominations column to sales logs table * Add La nominations page and questions * Add la nominations to the shared ownership subsection * Add accidentally removed files --- app/models/form/sales/pages/la_nominations.rb | 15 ++++++ .../form/sales/questions/la_nominations.rb | 18 +++++++ .../subsections/shared_ownership_scheme.rb | 1 + .../20221222081402_add_la_nominations.rb | 7 +++ db/schema.rb | 5 +- .../form/sales/pages/la_nominations_spec.rb | 29 +++++++++++ .../sales/questions/la_nominations_spec.rb | 49 +++++++++++++++++++ .../shared_ownership_scheme_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 9 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 app/models/form/sales/pages/la_nominations.rb create mode 100644 app/models/form/sales/questions/la_nominations.rb create mode 100644 db/migrate/20221222081402_add_la_nominations.rb create mode 100644 spec/models/form/sales/pages/la_nominations_spec.rb create mode 100644 spec/models/form/sales/questions/la_nominations_spec.rb diff --git a/app/models/form/sales/pages/la_nominations.rb b/app/models/form/sales/pages/la_nominations.rb new file mode 100644 index 000000000..c5c775e9f --- /dev/null +++ b/app/models/form/sales/pages/la_nominations.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::LaNominations < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "la_nominations" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::LaNominations.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/la_nominations.rb b/app/models/form/sales/questions/la_nominations.rb new file mode 100644 index 000000000..5db0178b6 --- /dev/null +++ b/app/models/form/sales/questions/la_nominations.rb @@ -0,0 +1,18 @@ +class Form::Sales::Questions::LaNominations < ::Form::Question + def initialize(id, hsh, page) + super + @id = "lanomagr" + @check_answer_label = "Household rehoused under a local authority nominations agreement?" + @header = "Was the household rehoused under a 'local authority nominations agreement'?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing" + 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 f4b02a9e5..28abf2d87 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -11,6 +11,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection @pages ||= [ Form::Sales::Pages::Staircase.new(nil, nil, self), Form::Sales::Pages::AboutStaircase.new(nil, nil, self), + Form::Sales::Pages::LaNominations.new(nil, nil, self), Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self), Form::Sales::Pages::MonthlyRent.new(nil, nil, self), Form::Sales::Pages::ExchangeDate.new(nil, nil, self), diff --git a/db/migrate/20221222081402_add_la_nominations.rb b/db/migrate/20221222081402_add_la_nominations.rb new file mode 100644 index 000000000..1bc981183 --- /dev/null +++ b/db/migrate/20221222081402_add_la_nominations.rb @@ -0,0 +1,7 @@ +class AddLaNominations < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :lanomagr, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index d616fd6d5..6fd6777a2 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_21_122233) do +ActiveRecord::Schema[7.0].define(version: 2022_12_22_081402) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -419,12 +419,13 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_21_122233) do t.integer "staircase" t.integer "stairbought" t.integer "stairowned" - t.decimal "mrent", precision: 10, scale: 2 t.datetime "exdate", precision: nil t.integer "exday" t.integer "exmonth" t.integer "exyear" t.integer "resale" + t.decimal "mrent", precision: 10, scale: 2 + t.integer "lanomagr" 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/la_nominations_spec.rb b/spec/models/form/sales/pages/la_nominations_spec.rb new file mode 100644 index 000000000..02b44ccb5 --- /dev/null +++ b/spec/models/form/sales/pages/la_nominations_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::LaNominations, 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[lanomagr]) + end + + it "has the correct id" do + expect(page.id).to eq("la_nominations") + 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/la_nominations_spec.rb b/spec/models/form/sales/questions/la_nominations_spec.rb new file mode 100644 index 000000000..bb06ef014 --- /dev/null +++ b/spec/models/form/sales/questions/la_nominations_spec.rb @@ -0,0 +1,49 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::LaNominations, 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("lanomagr") + end + + it "has the correct header" do + expect(question.header).to eq("Was the household rehoused under a 'local authority nominations agreement'?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Household rehoused under a local authority nominations agreement?") + 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 local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing") + 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 644485ca5..cc951a8bd 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -16,6 +16,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do %w[ staircasing about_staircasing + la_nominations previous_bedrooms monthly_rent exchange_contracts diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index d2bcd26f0..3ac4681ff 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(73) + expect(form.pages.count).to eq(74) 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(73) + expect(form.pages.count).to eq(74) expect(form.name).to eq("2021_2022_sales") end end