feat: update validation

app/models/form/sales/pages/extra_borrowing_value_check.rb

@@ -3,7 +3,7 @@ class Form::Sales::Pages::ExtraBorrowingValueCheck < Form::Page
     super
     @depends_on = [
       {
-        "extra_borrowing_expected?" => true,
+        "extra_borrowing_expected_but_not_reported?" => true,
       },
     ]
     @title_text = {

app/models/form/sales/subsections/outright_sale.rb

@@ -15,7 +15,6 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection
       Form::Sales::Pages::MortgageLenderOther.new("mortgage_lender_other_outright_sale", nil, self),
       Form::Sales::Pages::MortgageLength.new("mortgage_length_outright_sale", nil, self),
       Form::Sales::Pages::ExtraBorrowing.new("extra_borrowing_outright_sale", nil, self),
-      Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_value_check_outright_sale", nil, self),
       Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_outright_sale", nil, self),
       Form::Sales::Pages::DepositValueCheck.new("outright_sale_deposit_value_check", nil, self),
       Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_outright_sale", nil, self),

app/models/form/sales/subsections/shared_ownership_scheme.rb

@@ -26,7 +26,6 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::MortgageLenderOther.new("mortgage_lender_other_shared_ownership", nil, self),
       Form::Sales::Pages::MortgageLength.new("mortgage_length_shared_ownership", nil, self),
       Form::Sales::Pages::ExtraBorrowing.new("extra_borrowing_shared_ownership", nil, self),
-      Form::Sales::Pages::ExtraBorrowingValueCheck.new("extra_borrowing_value_check_shared_ownership", nil, self),
       Form::Sales::Pages::AboutDepositWithDiscount.new(nil, nil, self),
       Form::Sales::Pages::AboutDepositWithoutDiscount.new("about_deposit_shared_ownership", nil, self),
       Form::Sales::Pages::DepositValueCheck.new("shared_ownership_deposit_value_check", nil, self),

app/models/validations/sales/soft_validations.rb

@@ -37,9 +37,9 @@ module Validations::Sales::SoftValidations
     deposit > savings * 4 / 3
   end
 
-  def extra_borrowing_expected?
+  def extra_borrowing_expected_but_not_reported?
     return unless extrabor && mortgage && deposit && value && discount
 
-    mortgage + deposit > value - value * discount / 100
+    extrabor != 1 && mortgage + deposit > value - value * discount / 100
   end
 end

db/schema.rb

@@ -485,9 +485,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_18_170602) do
     t.integer "hoyear"
     t.integer "fromprop"
     t.integer "socprevten"
+    t.integer "mortlen"
     t.integer "mortgagelender"
     t.string "mortgagelenderother"
-    t.integer "mortlen"
     t.integer "extrabor"
     t.integer "hhmemb"
     t.integer "totadult"