From 254da08c3a80e6f5bae0c1f304ce8f093aac9b2c Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Mon, 16 May 2022 17:50:00 +0100
Subject: [PATCH] Update mandatory

---
 app/models/case_log.rb      | 16 +++++++++++++---
 config/forms/2022_2023.json |  5 ++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/models/case_log.rb b/app/models/case_log.rb
index eef61bed9..420721129 100644
--- a/app/models/case_log.rb
+++ b/app/models/case_log.rb
@@ -468,9 +468,19 @@ private
   end
 
   def dynamically_not_required
-    previous_la_known_field = postcode_known? ? %w[previous_la_known] : []
-    tshortfall_field = tshortfall_unknown? ? %w[tshortfall] : []
-    previous_la_known_field + tshortfall_field
+    not_required = []
+    not_required << "previous_la_known" if postcode_known?
+    not_required << "tshortfall" if tshortfall_unknown?
+    not_required << "tenancylength" if tenancylength_optional?
+
+    not_required
+  end
+
+  def tenancylength_optional?
+    return false unless collection_start_year
+    return true if collection_start_year < 2022
+
+    collection_start_year >= 2022 && ![4, 6].include?(tenancy)
   end
 
   def set_derived_fields!
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 6f32d968b..c6ed9dcad 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -1095,10 +1095,13 @@
               },
               "depends_on": [
                 {
-                  "tenancy": 1
+                  "tenancy": 4
                 },
                 {
                   "tenancy": 6
+                },
+                {
+                  "tenancy": 3
                 }
               ]
             },