From 21825f4f115771103095ff265e690474fb5086cc Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 1 Feb 2023 10:24:07 +0000 Subject: [PATCH] feat: add soft validation to beds and la pages --- .../sales/pages/about_price_shared_ownership_value_check.rb | 1 - app/models/form/sales/subsections/property_information.rb | 2 ++ .../form/sales/subsections/shared_ownership_scheme.rb | 2 +- db/schema.rb | 6 +++++- .../form/sales/subsections/property_information_spec.rb | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/models/form/sales/pages/about_price_shared_ownership_value_check.rb b/app/models/form/sales/pages/about_price_shared_ownership_value_check.rb index ec7e8da15..f4f0955cd 100644 --- a/app/models/form/sales/pages/about_price_shared_ownership_value_check.rb +++ b/app/models/form/sales/pages/about_price_shared_ownership_value_check.rb @@ -1,7 +1,6 @@ class Form::Sales::Pages::AboutPriceSharedOwnershipValueCheck < ::Form::Page def initialize(id, hsh, subsection) super - @id = "about_price_shared_ownership_value_check" @depends_on = [ { "purchase_price_out_of_soft_range?" => true, diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb index c1c150b9f..60d392874 100644 --- a/app/models/form/sales/subsections/property_information.rb +++ b/app/models/form/sales/subsections/property_information.rb @@ -9,10 +9,12 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection def pages @pages ||= [ Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self), + Form::Sales::Pages::AboutPriceSharedOwnershipValueCheck.new("about_price_shared_ownership_bedrooms_value_check", nil, self), Form::Sales::Pages::PropertyUnitType.new(nil, nil, self), Form::Sales::Pages::PropertyBuildingType.new(nil, nil, self), Form::Sales::Pages::Postcode.new(nil, nil, self), Form::Sales::Pages::PropertyLocalAuthority.new(nil, nil, self), + Form::Sales::Pages::AboutPriceSharedOwnershipValueCheck.new("about_price_shared_ownership_la_value_check", nil, self), Form::Sales::Pages::PropertyWheelchairAccessible.new(nil, nil, self), ] end diff --git a/app/models/form/sales/subsections/shared_ownership_scheme.rb b/app/models/form/sales/subsections/shared_ownership_scheme.rb index 6dcfd6bab..b4cc071ff 100644 --- a/app/models/form/sales/subsections/shared_ownership_scheme.rb +++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb @@ -21,7 +21,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection Form::Sales::Pages::PreviousPropertyType.new(nil, nil, self), Form::Sales::Pages::PreviousTenure.new(nil, nil, self), Form::Sales::Pages::AboutPriceSharedOwnership.new(nil, nil, self), - Form::Sales::Pages::AboutPriceSharedOwnershipValueCheck.new(nil, nil, self), + Form::Sales::Pages::AboutPriceSharedOwnershipValueCheck.new("about_price_shared_ownership_value_check", nil, self), Form::Sales::Pages::SharedOwnershipDepositValueCheck.new("shared_ownership_equity_value_check", nil, self), Form::Sales::Pages::Mortgageused.new("mortgage_used_shared_ownership", nil, self), Form::Sales::Pages::MortgageAmount.new("mortgage_amount_shared_ownership", nil, self), diff --git a/db/schema.rb b/db/schema.rb index ad89e0809..9dee823b9 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: 2023_01_26_145529) do +ActiveRecord::Schema[7.0].define(version: 2023_01_27_102334) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -515,8 +515,12 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_26_145529) do t.integer "retirement_value_check" t.integer "hodate_check" t.integer "extrabor_value_check" + t.integer "deposit_and_mortgage_value_check" t.integer "shared_ownership_deposit_value_check" t.integer "grant_value_check" + t.integer "old_persons_shared_ownership_value_check" + t.integer "staircase_bought_value_check" + t.integer "monthly_charges_value_check" t.integer "value_value_check" t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" diff --git a/spec/models/form/sales/subsections/property_information_spec.rb b/spec/models/form/sales/subsections/property_information_spec.rb index 00b901142..51b72c605 100644 --- a/spec/models/form/sales/subsections/property_information_spec.rb +++ b/spec/models/form/sales/subsections/property_information_spec.rb @@ -15,10 +15,12 @@ RSpec.describe Form::Sales::Subsections::PropertyInformation, type: :model do expect(property_information.pages.map(&:id)).to eq( %w[ property_number_of_bedrooms + about_price_shared_ownership_bedrooms_value_check property_unit_type property_building_type property_postcode property_local_authority + about_price_shared_ownership_la_value_check property_wheelchair_accessible ], )