From 01d4dffdd2a3a1529a0abd2f21025ada03bf6617 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Fri, 5 Nov 2021 16:54:26 +0000
Subject: [PATCH] Int for booleans :(

---
 app/controllers/case_logs_controller.rb                | 2 +-
 app/validations/soft_validations.rb                    | 2 +-
 db/migrate/20211105164644_change_net_income_overide.rb | 9 +++++++++
 db/schema.rb                                           | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20211105164644_change_net_income_overide.rb

diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index 900afdeb8..cc2a4b484 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -107,7 +107,7 @@ private
 
       if %w[checkbox validation_override].include?(question_info["type"])
         question_info["answer_options"].keys.reject { |x| x.match(/divider/) }.each do |option|
-          result[option] = question_params.include?(option) ? "Yes" : "No"
+          result[option] = question_params.include?(option) ? 1 : 0
         end
       else
         result[question_key] = question_params
diff --git a/app/validations/soft_validations.rb b/app/validations/soft_validations.rb
index e9ce6d12b..ce03fafc6 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) if soft_errors.present?
+    !public_send(soft_errors.keys.first).zero? if soft_errors.present?
   end
 
 private
diff --git a/db/migrate/20211105164644_change_net_income_overide.rb b/db/migrate/20211105164644_change_net_income_overide.rb
new file mode 100644
index 000000000..3c423dccf
--- /dev/null
+++ b/db/migrate/20211105164644_change_net_income_overide.rb
@@ -0,0 +1,9 @@
+class ChangeNetIncomeOveride < ActiveRecord::Migration[6.1]
+  def up
+    change_column :case_logs, :override_net_income_validation, "integer USING CAST(override_net_income_validation AS integer)"
+  end
+
+  def down
+    change_column :case_logs, :override_net_income_validation, "boolean USING override_net_income_validation::boolean"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 22eb3c9b2..91f0eff45 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_11_03_090530) do
+ActiveRecord::Schema.define(version: 2021_11_05_164644) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -133,7 +133,7 @@ ActiveRecord::Schema.define(version: 2021_11_03_090530) do
     t.integer "rp_dontknow"
     t.datetime "discarded_at"
     t.string "tenancyother"
-    t.boolean "override_net_income_validation"
+    t.integer "override_net_income_validation"
     t.string "net_income_known"
     t.string "gdpr_acceptance"
     t.string "gdpr_declined"