replace all instances of override_net_income_validatiom

app/admin/case_logs.rb

@@ -114,7 +114,7 @@ ActiveAdmin.register CaseLog do
                    reasonable_preference_reason_avoid_hardship
                    reasonable_preference_reason_do_not_know
                    other_tenancy_type
-                   override_net_income_validation
+                   net_income_value_check
                    net_income_known
                    owning_organisation_id
                    managing_organisation_id]

app/models/form/question.rb

@@ -229,6 +229,7 @@ private
     household_charge: [0],
     is_carehome: [1],
     rent_shortfall: [0],
+    net_income_value_check: [0],
   }.freeze
 
   RADIO_NO_VALUE = {
@@ -253,6 +254,7 @@ private
     household_charge: [1],
     is_carehome: [0],
     rent_shortfall: [1],
+    net_income_value_check: [1],
   }.freeze
 
   RADIO_DONT_KNOW_VALUE = {

app/models/validations/soft_validations.rb

@@ -30,17 +30,17 @@ private
   def net_income_validations
     net_income_errors = {}
     if net_income_in_soft_min_range?
-      net_income_errors["override_net_income_validation"] = OpenStruct.new(
+      net_income_errors["net_income_value_check"] = OpenStruct.new(
         message: I18n.t("soft_validations.net_income.in_soft_min_range.message"),
         hint_text: I18n.t("soft_validations.net_income.hint_text", ecstat1:),
       )
     elsif net_income_in_soft_max_range?
-      net_income_errors["override_net_income_validation"] = OpenStruct.new(
+      net_income_errors["net_income_value_check"] = OpenStruct.new(
         message: I18n.t("soft_validations.net_income.in_soft_max_range.message"),
         hint_text: I18n.t("soft_validations.net_income.hint_text", ecstat1:),
       )
     else
-      update_column(:override_net_income_validation, nil)
+      update_column(:net_income_value_check, nil)
     end
     net_income_errors
   end

config/forms/2021_2022.json

@@ -1573,15 +1573,6 @@
                     }
                   }
                 }
-              },
-              "soft_validations": {
-                "override_net_income_validation": {
-                  "check_answer_label": "Net income confirmed?",
-                  "type": "validation_override",
-                  "answer_options": {
-                    "override_net_income_validation": "Yes"
-                  }
-                }
               }
             },
             "person_2_known": {
@@ -4582,15 +4573,6 @@
                   },
                   "hidden_in_check_answers": true
                 }
-              },
-              "soft_validations": {
-                "override_net_income_validation": {
-                  "check_answer_label": "Net income confirmed?",
-                  "type": "validation_override",
-                  "answer_options": {
-                    "override_net_income_validation": "Yes"
-                  }
-                }
               }
             },
             "housing_benefit": {

docs/api/DLUHC-CORE-Data.v1.json

@@ -386,7 +386,7 @@
               "rp_hardship": 0,
               "rp_dontknow": 0,
               "discarded_at": "05/05/2020",
-              "override_net_income_validation": "",
+              "net_income_value_check": "",
               "property_owner_organisation": "",
               "property_manager_organisation": "",
               "rent_type": 0,

spec/factories/case_log.rb

@@ -105,7 +105,7 @@ FactoryBot.define do
       rp_hardship { 0 }
       rp_dontknow { 0 }
       tenancyother { nil }
-      override_net_income_validation { nil }
+      net_income_value_check { nil }
       net_income_known { 1 }
       property_owner_organisation { "Test" }
       property_manager_organisation { "Test" }

spec/fixtures/complete_case_log.json

@@ -118,7 +118,7 @@
     "rp_hardship": 0,
     "rp_dontknow": 0,
     "discarded_at": "05/05/2020",
-    "override_net_income_validation": "",
+    "net_income_value_check": "",
     "property_owner_organisation": "",
     "property_manager_organisation": "",
     "rent_type": 0,

spec/fixtures/exports/case_logs.xml

@@ -86,7 +86,7 @@
     <rp_hardship>0</rp_hardship>
     <rp_dontknow>0</rp_dontknow>
     <tenancyother/>
-    <override_net_income_validation/>
+    <net_income_value_check/>
     <property_owner_organisation>Test</property_owner_organisation>
     <property_manager_organisation>Test</property_manager_organisation>
     <sale_or_letting/>

spec/models/case_log_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe CaseLog do
 
         it "updates soft errors" do
           expect(case_log.has_no_unresolved_soft_errors?).to be false
-          expect(case_log.soft_errors["override_net_income_validation"].message)
+          expect(case_log.soft_errors["net_income_value_check"].message)
             .to match(I18n.t("soft_validations.net_income.in_soft_max_range.message"))
         end
       end
@@ -69,7 +69,7 @@ RSpec.describe CaseLog do
 
         it "updates soft errors" do
           expect(case_log.has_no_unresolved_soft_errors?).to be false
-          expect(case_log.soft_errors["override_net_income_validation"].message)
+          expect(case_log.soft_errors["net_income_value_check"].message)
             .to match(I18n.t("soft_validations.net_income.in_soft_min_range.message"))
         end
       end

spec/models/form/page_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Form::Page, type: :model do
   end
 
   it "has soft validations" do
-    expected_soft_validations = %w[override_net_income_validation]
+    expected_soft_validations = %w[net_income_value_check]
     expect(page.soft_validations.map(&:id)).to eq(expected_soft_validations)
   end
 
@@ -41,7 +41,7 @@ RSpec.describe Form::Page, type: :model do
   end
 
   it "has expected form responses" do
-    expected_responses = %w[earnings incfreq override_net_income_validation]
+    expected_responses = %w[earnings incfreq net_income_value_check]
     expect(page.expected_responses.map(&:id)).to eq(expected_responses)
   end
 

spec/models/form_handler_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe FormHandler do
       form_handler = described_class.instance
       form = form_handler.get_form(test_form_name)
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(29)
+      expect(form.pages.count).to eq(30)
     end
   end