diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index 33958997b..fd92d21f7 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -241,7 +241,7 @@ private
wchair: [1],
majorrepairs: [1],
startertenancy: [0],
- letting_in_sheltered_accommodation: [0, 1],
+ shelteredaccom: [0, 1],
armedforces: [1, 4, 5],
leftreg: [0],
reservist: [0],
@@ -265,7 +265,7 @@ private
wchair: [0],
majorrepairs: [0],
startertenancy: [1],
- letting_in_sheltered_accommodation: [2],
+ shelteredaccom: [2],
armedforces: [2],
leftreg: [1],
reservist: [1],
@@ -281,7 +281,7 @@ private
}.freeze
RADIO_DONT_KNOW_VALUE = {
- letting_in_sheltered_accommodation: [3],
+ shelteredaccom: [3],
underoccupation_benefitcap: [3],
reasonpref: [3],
hbrentshortfall: [3],
@@ -317,7 +317,7 @@ private
ecstat6: [10],
ecstat7: [10],
ecstat8: [10],
- letting_in_sheltered_accommodation: [3],
+ shelteredaccom: [3],
armedforces: [3],
leftreg: [3],
reservist: [2],
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 90c17de24..e1379cd2f 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1076,7 +1076,7 @@
}
]
},
- "letting_in_sheltered_accommodation": {
+ "shelteredaccom": {
"header": "",
"description": "",
"questions": {
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 4c86c4182..7ead1f956 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -1102,7 +1102,7 @@
}
]
},
- "letting_in_sheltered_accommodation": {
+ "shelteredaccom": {
"header": "",
"description": "",
"questions": {
diff --git a/db/migrate/20220513123456_remove_duplicate_sheltered_accomodation_column.rb b/db/migrate/20220513123456_remove_duplicate_sheltered_accomodation_column.rb
new file mode 100644
index 000000000..27b9c65b8
--- /dev/null
+++ b/db/migrate/20220513123456_remove_duplicate_sheltered_accomodation_column.rb
@@ -0,0 +1,5 @@
+class RemoveDuplicateShelteredAccomodationColumn < ActiveRecord::Migration[7.0]
+ def change
+ remove_column :case_logs, :letting_in_sheltered_accommodation, :integer
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2407bfbdb..240e514df 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[7.0].define(version: 2022_05_11_114334) do
+ActiveRecord::Schema[7.0].define(version: 2022_05_13_123456) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -162,7 +162,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_05_11_114334) do
t.integer "net_income_known"
t.integer "nocharge"
t.integer "is_carehome"
- t.integer "letting_in_sheltered_accommodation"
t.integer "household_charge"
t.integer "referral"
t.decimal "brent", precision: 10, scale: 2
diff --git a/docs/api/DLUHC-CORE-Data.v1.json b/docs/api/DLUHC-CORE-Data.v1.json
index d00ed85a2..07a911425 100644
--- a/docs/api/DLUHC-CORE-Data.v1.json
+++ b/docs/api/DLUHC-CORE-Data.v1.json
@@ -410,7 +410,7 @@
"household_charge": 1,
"is_carehome": 1,
"chcharge": 6,
- "letting_in_sheltered_accommodation": 0,
+ "shelteredaccom": 0,
"declaration": 1
}
}
diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb
index 994e01647..612ef9d8a 100644
--- a/spec/factories/case_log.rb
+++ b/spec/factories/case_log.rb
@@ -129,7 +129,7 @@ FactoryBot.define do
unitletas { 2 }
has_benefits { 1 }
is_carehome { 0 }
- letting_in_sheltered_accommodation { 0 }
+ shelteredaccom { 0 }
declaration { 1 }
end
created_at { Time.utc(2022, 2, 8, 16, 52, 15) }
diff --git a/spec/fixtures/complete_case_log.json b/spec/fixtures/complete_case_log.json
index 8acc0814c..620b697ed 100644
--- a/spec/fixtures/complete_case_log.json
+++ b/spec/fixtures/complete_case_log.json
@@ -132,7 +132,7 @@
"has_benefits": 1,
"household_charge": 0,
"is_carehome": 1,
- "letting_in_sheltered_accommodation": 0,
+ "shelteredaccom": 0,
"declaration": 1,
"referral": 1
}
diff --git a/spec/fixtures/exports/case_logs.xml b/spec/fixtures/exports/case_logs.xml
index f9b1d3d71..e46027264 100644
--- a/spec/fixtures/exports/case_logs.xml
+++ b/spec/fixtures/exports/case_logs.xml
@@ -120,7 +120,6 @@
1
0
0
- 0
200.0
@@ -165,7 +164,7 @@
{created_by_id}
0
-
+ 0
1