From e4fbb4ca05fb67e8a893abf3a1a621c6b1f1366b Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Mon, 31 Jan 2022 12:58:08 +0000 Subject: [PATCH] Rename renewal to match what's been sent to softwire --- config/forms/2021_2022.json | 22 +++++++++---------- .../20220131123638_rename_case_log_fields.rb | 5 +++++ db/schema.rb | 6 ++--- spec/factories/case_log.rb | 4 ++-- spec/fixtures/complete_case_log.json | 2 +- spec/fixtures/forms/2022_2023.json | 4 ++-- 6 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 db/migrate/20220131123638_rename_case_log_fields.rb diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index d66d94974..d3936b2ad 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -60,11 +60,11 @@ }, "depends_on": [{ "gdpr_acceptance": "Yes" }] }, - "tenant_same_property_renewal": { + "renewal": { "header": "", "description": "", "questions": { - "tenant_same_property_renewal": { + "renewal": { "check_answer_label": "Property renewal", "header": "Is this letting a renewal?", "hint_text": "A renewal is a letting to the same tenant in the same property.", @@ -2076,7 +2076,7 @@ } } }, - "depends_on": [{ "tenant_same_property_renewal": "No" }] + "depends_on": [{ "renewal": "No" }] }, "unitletas": { "header": "", @@ -2098,7 +2098,7 @@ }, "depends_on": [{ "first_time_property_let_as_social_housing": "No", - "tenant_same_property_renewal": "No" + "renewal": "No" }] }, "property_vacancy_reason_not_first_let": { @@ -2127,7 +2127,7 @@ }, "depends_on": [{ "first_time_property_let_as_social_housing": "No", - "tenant_same_property_renewal": "No" + "renewal": "No" }] }, "property_vacancy_reason_first_let": { @@ -2148,7 +2148,7 @@ }, "depends_on": [{ "first_time_property_let_as_social_housing": "Yes", - "tenant_same_property_renewal": "No" + "renewal": "No" }] }, "property_number_of_times_relet_not_social_let": { @@ -2168,7 +2168,7 @@ }, "depends_on": [{ "first_time_property_let_as_social_housing": "No", - "tenant_same_property_renewal": "No" + "renewal": "No" }] }, "property_number_of_times_relet_social_let": { @@ -2188,7 +2188,7 @@ }, "depends_on": [{ "first_time_property_let_as_social_housing": "Yes", - "tenant_same_property_renewal": "No" + "renewal": "No" }] }, "property_unit_type": { @@ -2275,7 +2275,7 @@ }, "depends_on": [{ "rsnvac": "First let of new-build property", - "tenant_same_property_renewal": "No" + "renewal": "No" }] }, "new_build_handover_date": { @@ -2290,7 +2290,7 @@ } }, "depends_on": [{ - "tenant_same_property_renewal": "No", + "renewal": "No", "rsnvac": [ "First let of conversion, rehabilitation or acquired property?", "First let of leased property" @@ -2323,7 +2323,7 @@ }, "depends_on": [{ "rsnvac": "First let of new-build property", - "tenant_same_property_renewal": "No" + "renewal": "No" }] } } diff --git a/db/migrate/20220131123638_rename_case_log_fields.rb b/db/migrate/20220131123638_rename_case_log_fields.rb new file mode 100644 index 000000000..6ffccf942 --- /dev/null +++ b/db/migrate/20220131123638_rename_case_log_fields.rb @@ -0,0 +1,5 @@ +class RenameCaseLogFields < ActiveRecord::Migration[7.0] + def change + rename_column :case_logs, :tenant_same_property_renewal, :renewal + end +end diff --git a/db/schema.rb b/db/schema.rb index 673208b27..a56d45399 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: 2022_01_26_101743) do +ActiveRecord::Schema.define(version: 2022_01_31_123638) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -84,6 +84,7 @@ ActiveRecord::Schema.define(version: 2022_01_26_101743) do t.integer "beds" t.integer "offered" t.integer "wchair" + t.integer "earnings" t.integer "incfreq" t.integer "benefits" t.integer "period" @@ -126,7 +127,7 @@ ActiveRecord::Schema.define(version: 2022_01_26_101743) do t.string "property_owner_organisation" t.string "property_manager_organisation" t.string "sale_or_letting" - t.string "tenant_same_property_renewal" + t.string "renewal" t.string "rent_type" t.string "intermediate_rent_product_name" t.string "purchaser_code" @@ -176,7 +177,6 @@ ActiveRecord::Schema.define(version: 2022_01_26_101743) do t.integer "is_carehome" t.integer "letting_in_sheltered_accomodation" t.integer "household_charge" - t.integer "earnings" t.integer "referral" t.decimal "brent", precision: 10, scale: 2 t.decimal "scharge", precision: 10, scale: 2 diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb index 229760a38..494febdfb 100644 --- a/spec/factories/case_log.rb +++ b/spec/factories/case_log.rb @@ -4,7 +4,7 @@ FactoryBot.define do managing_organisation { FactoryBot.create(:organisation) } trait :about_completed do gdpr_acceptance { "Yes" } - tenant_same_property_renewal { "No" } + renewal { "No" } needstype { 1 } rent_type { 1 } startdate { Time.zone.local(2022, 5, 1) } @@ -116,7 +116,7 @@ FactoryBot.define do gdpr_declined { "No" } property_owner_organisation { "Test" } property_manager_organisation { "Test" } - tenant_same_property_renewal { 1 } + renewal { 1 } rent_type { 1 } intermediate_rent_product_name { 2 } needstype { 1 } diff --git a/spec/fixtures/complete_case_log.json b/spec/fixtures/complete_case_log.json index 4b8d2105c..eb5d70eb9 100644 --- a/spec/fixtures/complete_case_log.json +++ b/spec/fixtures/complete_case_log.json @@ -142,7 +142,7 @@ "builtype": "Purpose built", "property_wheelchair_accessible": "Yes", "void_or_renewal_date": "05/05/2020", - "tenant_same_property_renewal": "Yes", + "renewal": "Yes", "new_build_handover_date": "01/01/2019", "has_benefits": "Yes", "household_charge": "Yes", diff --git a/spec/fixtures/forms/2022_2023.json b/spec/fixtures/forms/2022_2023.json index b375f0982..68d1c1247 100644 --- a/spec/fixtures/forms/2022_2023.json +++ b/spec/fixtures/forms/2022_2023.json @@ -31,11 +31,11 @@ }, "depends_on": [{ "gdpr_acceptance": "No" }] }, - "tenant_same_property_renewal": { + "renewal": { "header": "", "description": "", "questions": { - "tenant_same_property_renewal": { + "renewal": { "check_answer_label": "Property renewal", "header": "Is this a renewal to the same tenant in the same property?", "hint_text": "",