From 01373d9bc0be3e77559ae94c7068378d0c70ce11 Mon Sep 17 00:00:00 2001
From: Rachael Booth <rachael.booth@softwire.com>
Date: Mon, 5 Feb 2024 11:00:01 +0000
Subject: [PATCH] Avoid default soctenant value

---
 app/models/derived_variables/sales_log_variables.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb
index b6110cd60..e9952f2ae 100644
--- a/app/models/derived_variables/sales_log_variables.rb
+++ b/app/models/derived_variables/sales_log_variables.rb
@@ -24,8 +24,8 @@ module DerivedVariables::SalesLogVariables
     self.hhmemb = number_of_household_members
     self.hhtype = household_type
 
-    if form.start_year_after_2024?
-      self.soctenant = prevten_was_social_housing? ? 1 : 2
+    if saledate && form.start_year_after_2024?
+      self.soctenant = soctenant_from_prevten_values
     end
 
     self.uprn_known = 0 if address_answered_without_uprn?
@@ -79,7 +79,7 @@ private
       derived_values: {
         mortgage: 0,
       },
-    },
+    }
   ].freeze
 
   def number_of_household_members
@@ -159,6 +159,12 @@ private
     [address_line1, town_or_city].all?(&:present?) && uprn.nil? && form.start_date.year >= 2023
   end
 
+  def soctenant_from_prevten_values
+    return unless prevten && shared_ownership_scheme?
+
+    prevten_was_social_housing? ? 1 : 2
+  end
+
   def prevten_was_social_housing?
     [1, 2].include?(prevten) || [1, 2].include?(prevtenbuy2)
   end