diff --git a/app/admin/case_logs.rb b/app/admin/case_logs.rb
index 4efa249b3..100cfb3cf 100644
--- a/app/admin/case_logs.rb
+++ b/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]
diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index 670ca9a3b..409200f49 100644
--- a/app/models/form/question.rb
+++ b/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 = {
diff --git a/app/models/validations/soft_validations.rb b/app/models/validations/soft_validations.rb
index 650620658..db6041acb 100644
--- a/app/models/validations/soft_validations.rb
+++ b/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
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index d7e6db378..1154a4130 100644
--- a/config/forms/2021_2022.json
+++ b/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": {
diff --git a/docs/api/DLUHC-CORE-Data.v1.json b/docs/api/DLUHC-CORE-Data.v1.json
index bb90d3fb4..6750069f6 100644
--- a/docs/api/DLUHC-CORE-Data.v1.json
+++ b/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,
diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb
index b5de2432e..a7d9eb49a 100644
--- a/spec/factories/case_log.rb
+++ b/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" }
diff --git a/spec/fixtures/complete_case_log.json b/spec/fixtures/complete_case_log.json
index ac13176e7..57a38125c 100644
--- a/spec/fixtures/complete_case_log.json
+++ b/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,
diff --git a/spec/fixtures/exports/case_logs.xml b/spec/fixtures/exports/case_logs.xml
index 80ed8a9db..1c8c3de6d 100644
--- a/spec/fixtures/exports/case_logs.xml
+++ b/spec/fixtures/exports/case_logs.xml
@@ -86,7 +86,7 @@
0
0
-
+
Test
Test
diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb
index fbd6975c7..9ffcc6062 100644
--- a/spec/models/case_log_spec.rb
+++ b/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
diff --git a/spec/models/form/page_spec.rb b/spec/models/form/page_spec.rb
index d5c1bc67d..19428ce6a 100644
--- a/spec/models/form/page_spec.rb
+++ b/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
diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb
index 94a6e9f9f..3b60b5fa1 100644
--- a/spec/models/form_handler_spec.rb
+++ b/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