From b06fd7c09b5fd70120ddb6d21e3d29e410594530 Mon Sep 17 00:00:00 2001
From: David May-Miller <david.maymiller@outlook.com>
Date: Wed, 31 Aug 2022 10:06:17 +0100
Subject: [PATCH] CLDC-1550 Prevent homeless value being inferred when a
 letting is a renewal (#850)

---
 app/models/case_log.rb                             | 1 -
 app/models/derived_variables/case_log_variables.rb | 1 -
 config/forms/2021_2022.json                        | 9 ++-------
 config/forms/2022_2023.json                        | 9 ++-------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/models/case_log.rb b/app/models/case_log.rb
index a98296bb2..ab1de6f8d 100644
--- a/app/models/case_log.rb
+++ b/app/models/case_log.rb
@@ -567,7 +567,6 @@ private
 
   def reset_derived_questions
     dependent_questions = { waityear: [{ key: :renewal, value: 0 }],
-                            homeless: [{ key: :renewal, value: 0 }],
                             referral: [{ key: :renewal, value: 0 }],
                             underoccupation_benefitcap: [{ key: :renewal, value: 0 }],
                             wchair: [{ key: :needstype, value: 1 }],
diff --git a/app/models/derived_variables/case_log_variables.rb b/app/models/derived_variables/case_log_variables.rb
index 3bf227b6f..a415b95f8 100644
--- a/app/models/derived_variables/case_log_variables.rb
+++ b/app/models/derived_variables/case_log_variables.rb
@@ -46,7 +46,6 @@ module DerivedVariables::CaseLogVariables
     self.housingneeds = get_housingneeds
     if is_renewal?
       self.underoccupation_benefitcap = 2 if collection_start_year == 2021
-      self.homeless = 1
       self.referral = 0
       self.waityear = 2
       if is_general_needs?
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 433bcca61..c070371e2 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1242,7 +1242,7 @@
               "description": "",
               "questions": {
                 "age1_known": {
-                  "check_answers_card_number": 1, 
+                  "check_answers_card_number": 1,
                   "header": "Do you know the lead tenant’s age?",
                   "hint_text": "The ’lead’ or ’main’ tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
                   "type": "radio",
@@ -6209,12 +6209,7 @@
                     }
                   }
                 }
-              },
-              "depends_on": [
-                {
-                  "renewal": 0
-                }
-              ]
+              }
             },
             "previous_postcode": {
               "header": "",
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 3a2c03c11..a4a469c60 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -1277,7 +1277,7 @@
               "description": "",
               "questions": {
                 "age1_known": {
-                  "check_answers_card_number": 1, 
+                  "check_answers_card_number": 1,
                   "header": "Do you know the lead tenant’s age?",
                   "hint_text": "The ’lead’ or ’main’ tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
                   "type": "radio",
@@ -6168,12 +6168,7 @@
                     }
                   }
                 }
-              },
-              "depends_on": [
-                {
-                  "renewal": 0
-                }
-              ]
+              }
             },
             "previous_postcode": {
               "header": "",