From 7b2f27e04d2ee9cb523086707d39a4fcec44d3d3 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 4 Nov 2021 14:54:52 +0000 Subject: [PATCH] Change more types --- app/constants/db_enums.rb | 13 +++++++++++++ app/models/case_log.rb | 3 +++ db/migrate/20211103090530_change_field_types.rb | 10 ++++++++++ db/schema.rb | 10 +++++----- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/app/constants/db_enums.rb b/app/constants/db_enums.rb index 0b2f2b3fb..536620915 100644 --- a/app/constants/db_enums.rb +++ b/app/constants/db_enums.rb @@ -236,4 +236,17 @@ module DbEnums "Weekly for 53 weeks" => 10, } end + + def self.latime + { + "Just moved to local authority area" => 1, + "Less than 1 year" => 2, + "1 to 2 years" => 7, + "2 to 3 years" => 8, + "3 to 4 years" => 9, + "4 to 5 years" => 10, + "5 years or more" => 5, + "Do not know" => 6, + } + end end diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 6f8935108..bb51d9298 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -98,6 +98,9 @@ class CaseLog < ApplicationRecord enum incfreq: DbEnums.incfreq, _suffix: true enum benefits: DbEnums.benefits, _suffix: true enum period: DbEnums.period, _suffix: true + enum layear: DbEnums.latime, _suffix: true + enum lawaitlist: DbEnums.latime, _suffix: true + enum reasonpref: DbEnums.polar2, _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 3775f2203..63968535e 100644 --- a/db/migrate/20211103090530_change_field_types.rb +++ b/db/migrate/20211103090530_change_field_types.rb @@ -56,6 +56,11 @@ class ChangeFieldTypes < ActiveRecord::Migration[6.1] t.change :brent, "integer USING brent::integer" t.change :scharge, "integer USING scharge::integer" t.change :pscharge, "integer USING pscharge::integer" + t.change :supcharg, "integer USING supcharg::integer" + t.change :tcharge, "integer USING tcharge::integer" + t.change :layear, "integer USING layear::integer" + t.change :lawaitlist, "integer USING lawaitlist::integer" + t.change :reasonpref, "integer USING reasonpref::integer" end end @@ -116,6 +121,11 @@ class ChangeFieldTypes < ActiveRecord::Migration[6.1] t.change :brent, :string t.change :scharge, :string t.change :pscharge, :string + t.change :supcharg, :string + t.change :tcharge, :string + t.change :layear, :string + t.change :lawaitlist, :string + t.change :reasonpref, :string end end end diff --git a/db/schema.rb b/db/schema.rb index 9a4c49a1a..4c3e5a5c3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -94,14 +94,14 @@ ActiveRecord::Schema.define(version: 2021_11_03_090530) do t.integer "brent" t.integer "scharge" t.integer "pscharge" - t.string "supcharg" - t.string "tcharge" + t.integer "supcharg" + t.integer "tcharge" t.string "outstanding_amount" - t.string "layear" - t.string "lawaitlist" + t.integer "layear" + t.integer "lawaitlist" t.string "previous_la" t.string "property_postcode" - t.string "reasonpref" + t.integer "reasonpref" t.string "reasonable_preference_reason" t.integer "cbl" t.integer "chr"