From 51e34926c28382c22aa139b5f82c612f85a68add Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 4 Nov 2021 10:58:06 +0000 Subject: [PATCH] change field type for housing needs --- app/constants/db_enums.rb | 7 +++++++ app/controllers/case_logs_controller.rb | 2 +- app/models/case_log.rb | 6 ++++++ db/migrate/20211103090530_change_field_types.rb | 13 +++++++++++++ db/schema.rb | 12 ++++++------ 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/app/constants/db_enums.rb b/app/constants/db_enums.rb index 513243082..e4e6a9a98 100644 --- a/app/constants/db_enums.rb +++ b/app/constants/db_enums.rb @@ -140,4 +140,11 @@ module DbEnums "Prefer not to say" => 3, } end + + def self.housingneeds + { + "No" => 0, + "Yes" => 1, + } + end end diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb index f8bef385a..460dfe71d 100644 --- a/app/controllers/case_logs_controller.rb +++ b/app/controllers/case_logs_controller.rb @@ -107,7 +107,7 @@ private if question_info["type"] == "checkbox" question_info["answer_options"].keys.reject { |x| x.match(/divider/) }.each do |option| - result[option] = question_params.include?(option) + result[option] = question_params.include?(option) ? "Yes" : "No" end else result[question_key] = question_params diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 3347f17c7..e4ec3f8a0 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -65,6 +65,12 @@ class CaseLog < ApplicationRecord enum leftreg: DbEnums.leftreg, _suffix: true enum illness: DbEnums.illness, _suffix: true enum preg_occ: DbEnums.pregnancy, _suffix: true + enum housingneeds_a: DbEnums.housingneeds, _suffix: true + enum housingneeds_b: DbEnums.housingneeds, _suffix: true + enum housingneeds_c: DbEnums.housingneeds, _suffix: true + enum housingneeds_f: DbEnums.housingneeds, _suffix: true + enum housingneeds_g: DbEnums.housingneeds, _suffix: true + enum housingneeds_h: DbEnums.housingneeds, _suffix: true AUTOGENERATED_FIELDS = %w[id status created_at updated_at discarded_at].freeze diff --git a/db/migrate/20211103090530_change_field_types.rb b/db/migrate/20211103090530_change_field_types.rb index 1fa5416ac..8fce4b780 100644 --- a/db/migrate/20211103090530_change_field_types.rb +++ b/db/migrate/20211103090530_change_field_types.rb @@ -18,6 +18,12 @@ class ChangeFieldTypes < ActiveRecord::Migration[6.1] t.change :leftreg, "integer USING leftreg::integer" t.change :illness, "integer USING illness::integer" t.change :preg_occ, "integer USING preg_occ::integer" + t.change :housingneeds_a, "integer USING housingneeds_a::integer" + t.change :housingneeds_b, "integer USING housingneeds_b::integer" + t.change :housingneeds_c, "integer USING housingneeds_c::integer" + t.change :housingneeds_f, "integer USING housingneeds_f::integer" + t.change :housingneeds_g, "integer USING housingneeds_g::integer" + t.change :housingneeds_h, "integer USING housingneeds_h::integer" end end @@ -40,6 +46,13 @@ class ChangeFieldTypes < ActiveRecord::Migration[6.1] t.change :leftreg, :string t.change :illness, :string t.change :preg_occ, :string + t.change :housingneeds_a, :boolean + t.change :housingneeds_b, :boolean + t.change :housingneeds_c, :boolean + t.change :housingneeds_f, :boolean + t.change :housingneeds_g, :boolean + t.change :housingneeds_h, :boolean + end end end diff --git a/db/schema.rb b/db/schema.rb index 9b46ab965..a1469d57c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -108,12 +108,12 @@ ActiveRecord::Schema.define(version: 2021_11_03_090530) do t.string "cap" t.string "outstanding_rent_or_charges" t.string "other_reason_for_leaving_last_settled_home" - t.boolean "housingneeds_a" - t.boolean "housingneeds_b" - t.boolean "housingneeds_c" - t.boolean "housingneeds_f" - t.boolean "housingneeds_g" - t.boolean "housingneeds_h" + t.integer "housingneeds_a" + t.integer "housingneeds_b" + t.integer "housingneeds_c" + t.integer "housingneeds_f" + t.integer "housingneeds_g" + t.integer "housingneeds_h" t.boolean "accessibility_requirements_prefer_not_to_say" t.boolean "illness_type_1" t.boolean "illness_type_2"