CLDC-853 Added soft validation for sales income2

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

@@ -0,0 +1,20 @@
+class Form::Sales::Pages::Buyer2IncomeValueCheck < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [
+      {
+        "income2_under_soft_min?" => true,
+      },
+    ]
+    @informative_text = {}
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::Buyer2IncomeValueCheck.new(nil, nil, self)
+    ]
+  end
+end

app/models/form/sales/questions/buyer2_income_value_check.rb

@@ -0,0 +1,25 @@
+class Form::Sales::Questions::Buyer2IncomeValueCheck < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "income2_value_check"
+    @check_answer_label = "Income confirmation"
+    @header = "Are you sure this income is correct?"
+    @type = "interruption_screen"
+    @answer_options = {
+      "0" => { "value" => "Yes" },
+      "1" => { "value"=> "No" },
+    }
+    @hidden_in_check_answers = {
+      "depends_on" => [
+        {
+          "income2_value_check" => 0,
+        },
+        {
+          "income2_value_check" => 1,
+        },
+      ],
+    }
+    @check_answers_card_number = 1
+    @page = page
+  end
+end

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

@@ -33,7 +33,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::GenderIdentity2.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("gender_2_buyer_retirement_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),
-      Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_buyer_retirement_value_check", nil, self, person_index: 2),
+      Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check_joint_purchase", nil, self, person_index: 2),
+      Form::Sales::Pages::Buyer2IncomeValueCheck.new("working_situation_buyer_2_income_value_check", nil, self),
       Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self),
       Form::Sales::Pages::PersonKnown.new("person_2_known", nil, self, person_index: 2),

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

@@ -15,6 +15,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndSavings < ::Form::Subsection
       Form::Sales::Pages::MortgageValueCheck.new("buyer_1_mortgage_value_check", nil, self, 1),
       Form::Sales::Pages::Buyer2Income.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_2_income_mortgage_value_check", nil, self, 2),
+      Form::Sales::Pages::Buyer2IncomeValueCheck.new("buyer_2_income_value_check", nil, self),
       Form::Sales::Pages::Buyer2Mortgage.new(nil, nil, self),
       Form::Sales::Pages::MortgageValueCheck.new("buyer_2_mortgage_value_check", nil, self, 2),
       Form::Sales::Pages::HousingBenefits.new(nil, nil, self),

app/models/validations/sales/soft_validations.rb

@@ -17,6 +17,12 @@ module Validations::Sales::SoftValidations
     stairbought && stairbought > 50
   end
 
+  def income2_under_soft_min?
+    return false unless ecstat2 && income2 && ALLOWED_INCOME_RANGES[ecstat2]
+
+    income2 < ALLOWED_INCOME_RANGES[ecstat2][:soft_min]
+  end
+
   def mortgage_over_soft_max?
     return false unless mortgage && inc1mort && (inc2mort || not_joint_purchase?)
     return false if income1_used_for_mortgage? && income1.blank? || income2_used_for_mortgage? && income2.blank?

db/migrate/20221214110209_add_income2_value_check.rb

@@ -0,0 +1,5 @@
+class AddIncome2ValueCheck < ActiveRecord::Migration[7.0]
+  def change
+    add_column :sales_logs, :income2_value_check, :integer
+  end
+end

db/schema.rb

@@ -525,6 +525,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_03_174815) do
     t.integer "details_known_5"
     t.integer "details_known_6"
     t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
+    t.integer "income2_value_check"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"
     t.index ["updated_by_id"], name: "index_sales_logs_on_updated_by_id"