From e4dc36fb6672edf5c03a8bd93bebb3a6caa09b48 Mon Sep 17 00:00:00 2001
From: Samuel Young <samuel.young@softwire.com>
Date: Mon, 2 Feb 2026 14:26:02 +0000
Subject: [PATCH] fixup! CLDC-4188: Infer referral_register for renewals

extract dependencies to common list
---
 .../lettings_log_variables.rb                 | 51 ++++++-------------
 1 file changed, 16 insertions(+), 35 deletions(-)

diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb
index 360dbf03b..14861226f 100644
--- a/app/models/derived_variables/lettings_log_variables.rb
+++ b/app/models/derived_variables/lettings_log_variables.rb
@@ -181,23 +181,11 @@ private
     if form.start_year_2026_or_later?
       DEPENDENCIES_2026
     else
-      DEPENDENCIES_PRE_2026
+      DEPENDENCIES_2025_2024
     end
   end
 
-  DEPENDENCIES_2026 = [
-    {
-      conditions: {
-        renewal: 1,
-      },
-      derived_values: {
-        referral_register: 1, # new in 2026
-        waityear: 2,
-        offered: 0,
-        rsnvac: 14,
-        first_time_property_let_as_social_housing: 0,
-      },
-    },
+  COMMON_DEPENDENCIES = [
     {
       conditions: {
         net_income_known: 2,
@@ -224,44 +212,37 @@ private
     },
   ].freeze
 
-  DEPENDENCIES_PRE_2026 = [
+  DEPENDENCIES_2026 = [
     {
       conditions: {
         renewal: 1,
       },
       derived_values: {
-        referral: 1,
-        referral_type: 3,
+        referral_register: 1,
         waityear: 2,
         offered: 0,
         rsnvac: 14,
         first_time_property_let_as_social_housing: 0,
       },
     },
+    *COMMON_DEPENDENCIES,
+  ].freeze
+
+  DEPENDENCIES_2025_2024 = [
     {
       conditions: {
-        net_income_known: 2,
-      },
-      derived_values: {
-        incref: 1,
-      },
-    },
-    {
-      conditions: {
-        net_income_known: 0,
-      },
-      derived_values: {
-        incref: 0,
-      },
-    },
-    {
-      conditions: {
-        net_income_known: 1,
+        renewal: 1,
       },
       derived_values: {
-        incref: 2,
+        referral: 1,
+        referral_type: 3,
+        waityear: 2,
+        offered: 0,
+        rsnvac: 14,
+        first_time_property_let_as_social_housing: 0,
       },
     },
+    *COMMON_DEPENDENCIES,
   ].freeze
 
   def clear_inapplicable_derived_values!