From 0c707526798df56a8fa62196bf7f14480613adcf Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 9 Nov 2021 10:47:53 +0000
Subject: [PATCH] Use enums as well for consistency

---
 app/constants/db_enums.rb                             | 7 +++++++
 app/models/case_log.rb                                | 1 +
 app/validations/soft_validations.rb                   | 2 +-
 app/views/form/_validation_override_question.html.erb | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/constants/db_enums.rb b/app/constants/db_enums.rb
index 536620915..84f7d3837 100644
--- a/app/constants/db_enums.rb
+++ b/app/constants/db_enums.rb
@@ -213,6 +213,13 @@ module DbEnums
     }
   end
 
+  def self.override_soft_validation
+    {
+      "No" => 0,
+      "Yes" => 1,
+    }
+  end
+
   def self.benefits
     {
       "All" => 1,
diff --git a/app/models/case_log.rb b/app/models/case_log.rb
index ac37461da..b77534795 100644
--- a/app/models/case_log.rb
+++ b/app/models/case_log.rb
@@ -65,6 +65,7 @@ class CaseLog < ApplicationRecord
   enum leftreg: DbEnums.leftreg, _suffix: true
   enum illness: DbEnums.illness, _suffix: true
   enum preg_occ: DbEnums.pregnancy, _suffix: true
+  enum override_net_income_validation: DbEnums.override_soft_validation, _suffix: true
   enum housingneeds_a: DbEnums.polar, _suffix: true
   enum housingneeds_b: DbEnums.polar, _suffix: true
   enum housingneeds_c: DbEnums.polar, _suffix: true
diff --git a/app/validations/soft_validations.rb b/app/validations/soft_validations.rb
index ce03fafc6..451988b66 100644
--- a/app/validations/soft_validations.rb
+++ b/app/validations/soft_validations.rb
@@ -8,7 +8,7 @@ module SoftValidations
   end
 
   def soft_errors_overridden?
-    !public_send(soft_errors.keys.first).zero? if soft_errors.present?
+    public_send(soft_errors.keys.first) == "Yes" if soft_errors.present?
   end
 
 private
diff --git a/app/views/form/_validation_override_question.html.erb b/app/views/form/_validation_override_question.html.erb
index 66aa0f250..10a6a60e7 100644
--- a/app/views/form/_validation_override_question.html.erb
+++ b/app/views/form/_validation_override_question.html.erb
@@ -9,7 +9,7 @@
 
       <%= f.govuk_check_box page_info["soft_validations"]&.keys&.first, page_info["soft_validations"]&.keys&.first,
         label: { text: "Yes" },
-        checked: @case_log[page_info["soft_validations"]&.keys&.first] == 1
+        checked: @case_log[page_info["soft_validations"]&.keys&.first] == "Yes"
       %>
   <% end %>
 </div>