From d1411b460ba3aa0bc3ae6b573a036bd226436cd5 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Wed, 21 Dec 2022 15:41:19 +0000 Subject: [PATCH] Cldc 1546 monthly rent (#1111) * Add monthly rent column to sales logs table * Add monthly rent question and page * Add monthly rent page to the shared ownership scheme subsection --- app/models/form/sales/pages/monthly_rent.rb | 15 ++++++ .../form/sales/questions/monthly_rent.rb | 14 ++++++ .../subsections/shared_ownership_scheme.rb | 1 + .../20221221105502_add_rent_to_sales.rb | 7 +++ db/schema.rb | 3 +- .../form/sales/pages/monthly_rent_spec.rb | 33 +++++++++++++ .../form/sales/questions/monthly_rent_spec.rb | 49 +++++++++++++++++++ .../shared_ownership_scheme_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 9 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 app/models/form/sales/pages/monthly_rent.rb create mode 100644 app/models/form/sales/questions/monthly_rent.rb create mode 100644 db/migrate/20221221105502_add_rent_to_sales.rb create mode 100644 spec/models/form/sales/pages/monthly_rent_spec.rb create mode 100644 spec/models/form/sales/questions/monthly_rent_spec.rb diff --git a/app/models/form/sales/pages/monthly_rent.rb b/app/models/form/sales/pages/monthly_rent.rb new file mode 100644 index 000000000..826314edf --- /dev/null +++ b/app/models/form/sales/pages/monthly_rent.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::MonthlyRent < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "monthly_rent" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::MonthlyRent.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/monthly_rent.rb b/app/models/form/sales/questions/monthly_rent.rb new file mode 100644 index 000000000..4195b1238 --- /dev/null +++ b/app/models/form/sales/questions/monthly_rent.rb @@ -0,0 +1,14 @@ +class Form::Sales::Questions::MonthlyRent < ::Form::Question + def initialize(id, hsh, page) + super + @id = "mrent" + @check_answer_label = "Monthly rent" + @header = "What is the basic monthly rent?" + @type = "numeric" + @page = page + @min = 0 + @width = 5 + @prefix = "£" + @hint_text = "Amount paid before any charges" + 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 a80b482aa..fda791298 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -12,6 +12,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection Form::Sales::Pages::Staircase.new(nil, nil, self), Form::Sales::Pages::AboutStaircase.new(nil, nil, self), Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self), + Form::Sales::Pages::MonthlyRent.new(nil, nil, self), ] end diff --git a/db/migrate/20221221105502_add_rent_to_sales.rb b/db/migrate/20221221105502_add_rent_to_sales.rb new file mode 100644 index 000000000..2e5371055 --- /dev/null +++ b/db/migrate/20221221105502_add_rent_to_sales.rb @@ -0,0 +1,7 @@ +class AddRentToSales < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :mrent, :decimal, precision: 10, scale: 2 + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 4f81ac646..455c8927d 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_081709) do +ActiveRecord::Schema[7.0].define(version: 2022_12_21_105502) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -419,6 +419,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_21_081709) do t.integer "staircase" t.integer "stairbought" t.integer "stairowned" + t.decimal "mrent", precision: 10, scale: 2 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/monthly_rent_spec.rb b/spec/models/form/sales/pages/monthly_rent_spec.rb new file mode 100644 index 000000000..8d953e248 --- /dev/null +++ b/spec/models/form/sales/pages/monthly_rent_spec.rb @@ -0,0 +1,33 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::MonthlyRent, 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[mrent]) + end + + it "has the correct id" do + expect(page.id).to eq("monthly_rent") + 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 be_nil + end +end diff --git a/spec/models/form/sales/questions/monthly_rent_spec.rb b/spec/models/form/sales/questions/monthly_rent_spec.rb new file mode 100644 index 000000000..e33603099 --- /dev/null +++ b/spec/models/form/sales/questions/monthly_rent_spec.rb @@ -0,0 +1,49 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::MonthlyRent, 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("mrent") + end + + it "has the correct header" do + expect(question.header).to eq("What is the basic monthly rent?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Monthly rent") + 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 eq("Amount paid before any charges") + end + + it "has correct width" do + expect(question.width).to eq(5) + end + + it "has correct prefix" do + expect(question.prefix).to eq("£") + end + + it "has correct min" do + expect(question.min).to eq(0) + 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 21e9b6938..3a4e654b4 100644 --- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb @@ -17,6 +17,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do staircasing about_staircasing previous_bedrooms + monthly_rent ], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 1f6f4676c..e69ffc524 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(71) + expect(form.pages.count).to eq(72) 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(71) + expect(form.pages.count).to eq(72) expect(form.name).to eq("2021_2022_sales") end end