From 077ae1dc154e3ba4eb17a654bb1008fca47285dc Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 4 Nov 2021 13:48:05 +0000 Subject: [PATCH] Change landlord and rsnvac field types --- app/constants/db_enums.rb | 26 +++++++++++++++++++ app/models/case_log.rb | 2 ++ .../20211103090530_change_field_types.rb | 4 +++ db/schema.rb | 4 +-- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/app/constants/db_enums.rb b/app/constants/db_enums.rb index fb2e51bf6..d930fc8d4 100644 --- a/app/constants/db_enums.rb +++ b/app/constants/db_enums.rb @@ -165,4 +165,30 @@ module DbEnums "Other" => 3, } end + + def self.landlord + { + "This landlord" => 1, + "Another registered provider - includes housing association or local authority" => 2, + } + end + + def self.rsnvac + { + "First let of newbuild property" => 15, + "First let of conversion/rehabilitation/acquired property" => 16, + "First let of leased property" => 17, + "Relet - tenant evicted due to arrears" => 10, + "Relet - tenant evicted due to ASB or other reason" => 11, + "Relet - tenant died (no succession)" => 5, + "Relet - tenant moved to other social housing provider" => 12, + "Relet - tenant abandoned property" => 6, + "Relet - tenant moved to private sector or other accommodation" => 8, + "Relet - to tenant who occupied same property as temporary accommodation" => 9, + "Relet – internal transfer (excluding renewals of a fixed-term tenancy)" => 13, + "Relet – renewal of fixed-term tenancy" => 14, + "Relet – tenant moved to care home" => 18, + "Relet – tenant involved in a succession downsize" => 19, + } + end end diff --git a/app/models/case_log.rb b/app/models/case_log.rb index f995a7e8b..ba5c7bbfb 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -83,6 +83,8 @@ class CaseLog < ApplicationRecord enum illness_type_10: DbEnums.polar, _suffix: true enum startertenancy: DbEnums.polar2, _suffix: true enum tenancy: DbEnums.tenancy, _suffix: true + enum landlord: DbEnums.landlord, _suffix: true + enum rsnvac: DbEnums.rsnvac, _suffix: true enum rp_homeless: DbEnums.polar, _suffix: true enum rp_insan_unsat: DbEnums.polar, _suffix: true diff --git a/db/migrate/20211103090530_change_field_types.rb b/db/migrate/20211103090530_change_field_types.rb index e26dd4940..fbfb20201 100644 --- a/db/migrate/20211103090530_change_field_types.rb +++ b/db/migrate/20211103090530_change_field_types.rb @@ -45,6 +45,8 @@ class ChangeFieldTypes < ActiveRecord::Migration[6.1] t.change :startertenancy, "integer USING startertenancy::integer" t.change :tenancylength, "integer USING tenancylength::integer" t.change :tenancy, "integer USING tenancy::integer" + t.change :landlord, "integer USING landlord::integer" + t.change :rsnvac, "integer USING rsnvac::integer" end end @@ -94,6 +96,8 @@ class ChangeFieldTypes < ActiveRecord::Migration[6.1] t.change :startertenancy, :string t.change :tenancylength, :string t.change :tenancy, :string + t.change :landlord, :string + t.change :rsnvac, :string end end end diff --git a/db/schema.rb b/db/schema.rb index eee19a22b..5066c9ae0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -72,11 +72,11 @@ ActiveRecord::Schema.define(version: 2021_11_03_090530) do t.integer "tenancylength" t.integer "tenancy" t.string "lettype" - t.string "landlord" + t.integer "landlord" t.string "property_location" t.string "previous_postcode" t.string "property_relet" - t.string "rsnvac" + t.integer "rsnvac" t.string "property_reference" t.string "unittype_gn" t.string "property_building_type"