From ba8f0974c6c2d5b83b6dcb1422ea5da4aa19f51b Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 26 Jan 2023 11:49:41 +0000 Subject: [PATCH] feat: add soft validation everywhere smoothly --- .../sales/pages/extra_borrowing_value_check.rb | 1 - .../subsections/discounted_ownership_scheme.rb | 5 ++++- db/schema.rb | 14 +++++++++++++- .../discounted_ownership_scheme_spec.rb | 5 ++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/models/form/sales/pages/extra_borrowing_value_check.rb b/app/models/form/sales/pages/extra_borrowing_value_check.rb index 92750783a..18f975b8d 100644 --- a/app/models/form/sales/pages/extra_borrowing_value_check.rb +++ b/app/models/form/sales/pages/extra_borrowing_value_check.rb @@ -1,7 +1,6 @@ class Form::Sales::Pages::ExtraBorrowingValueCheck < Form::Page def initialize(id, hsh, subsection) super - @id = "extra_borrowing_value_check" @depends_on = [ { "extra_borrowing_expected_but_not_reported?" => true, diff --git a/app/models/form/sales/subsections/discounted_ownership_scheme.rb b/app/models/form/sales/subsections/discounted_ownership_scheme.rb index b70f12d0c..3b994d931 100644 --- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb +++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb @@ -10,16 +10,19 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection @pages ||= [ Form::Sales::Pages::LivingBeforePurchase.new("living_before_purchase_discounted_ownership", nil, self), Form::Sales::Pages::AboutPriceRtb.new(nil, nil, self), + Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_price_value_check", nil, self), Form::Sales::Pages::AboutPriceNotRtb.new(nil, nil, self), Form::Sales::Pages::PurchasePrice.new("purchase_price_discounted_ownership", nil, self), Form::Sales::Pages::Mortgageused.new("mortgage_used_discounted_ownership", nil, self), Form::Sales::Pages::MortgageAmount.new("mortgage_amount_discounted_ownership", nil, self), + Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_mortgage_value_check", nil, self), Form::Sales::Pages::MortgageLender.new("mortgage_lender_discounted_ownership", nil, self), Form::Sales::Pages::MortgageLenderOther.new("mortgage_lender_other_discounted_ownership", nil, self), Form::Sales::Pages::MortgageLength.new("mortgage_length_discounted_ownership", nil, self), Form::Sales::Pages::ExtraBorrowing.new("extra_borrowing_discounted_ownership", nil, self), + Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_value_check", nil, self), Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_discounted_ownership", nil, self), - Form::Sales::Pages::ExtraBorrowingValueCheck.new(nil, nil, self), + Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_deposit_value_check", nil, self), Form::Sales::Pages::DepositValueCheck.new("discounted_ownership_deposit_value_check", nil, self), Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_discounted_ownership", nil, self), ] diff --git a/db/schema.rb b/db/schema.rb index 4ca693668..54a2cbdeb 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_18_170602) do +ActiveRecord::Schema[7.0].define(version: 2023_01_24_111328) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -54,6 +54,17 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_18_170602) do t.index ["organisation_id"], name: "index_data_protection_confirmations_on_organisation_id" end + create_table "la_purchase_price_ranges", force: :cascade do |t| + t.string "la" + t.integer "bedrooms" + t.decimal "soft_min", precision: 10, scale: 2 + t.decimal "soft_max", precision: 10, scale: 2 + t.integer "start_year" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["start_year", "bedrooms", "la"], name: "index_la_purchase_price_ranges_on_start_year_bedrooms_la", unique: true + end + create_table "la_rent_ranges", force: :cascade do |t| t.integer "ranges_rent_id" t.integer "lettype" @@ -503,6 +514,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_18_170602) do t.bigint "bulk_upload_id" t.integer "retirement_value_check" t.integer "hodate_check" + t.integer "value_value_check" t.integer "extrabor_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/discounted_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb index b1eacba2a..44896a0f9 100644 --- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb +++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb @@ -16,16 +16,19 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model %w[ living_before_purchase_discounted_ownership about_price_rtb + extra_borrowing_price_value_check about_price_not_rtb purchase_price_discounted_ownership mortgage_used_discounted_ownership mortgage_amount_discounted_ownership + extra_borrowing_mortgage_value_check mortgage_lender_discounted_ownership mortgage_lender_other_discounted_ownership mortgage_length_discounted_ownership extra_borrowing_discounted_ownership - about_deposit_discounted_ownership extra_borrowing_value_check + about_deposit_discounted_ownership + extra_borrowing_deposit_value_check discounted_ownership_deposit_value_check leasehold_charges_discounted_ownership ],