From be4f02be36296dfcc81e52b14c945df25507a35a Mon Sep 17 00:00:00 2001
From: Nat Dean-Lewis <94526761+natdeanlewissoftwire@users.noreply.github.com>
Date: Fri, 11 Sep 2026 14:49:04 +0100
Subject: [PATCH] CLDC-4462: Remove unnecessary routing change (#3382)

* feat: wip clear confidential address data

* CLDC-3362: full rake task for clearing confidential address data

* CLDC-3362: add rake spec

* feat: route la question when not inferred for supported housing

* CLDC-4462: respond to PR comments

* CLDC-4462: test all fields

* feat: remove routing change as not needed

* feat: remove routing change as not needed
---
 app/models/derived_variables/lettings_log_variables.rb | 10 +++-------
 .../form/lettings/pages/property_local_authority.rb    |  1 -
 app/models/lettings_log.rb                             |  6 +-----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb
index 1803638dd..230b2a1dc 100644
--- a/app/models/derived_variables/lettings_log_variables.rb
+++ b/app/models/derived_variables/lettings_log_variables.rb
@@ -176,13 +176,9 @@ module DerivedVariables::LettingsLogVariables
 
     if !form.start_year_2026_or_later? && is_supported_housing?
       reset_address_fields!
-    elsif form.start_year_2026_or_later?
-      if location_changed?
-        reset_address_fields!
-        self.la = nil
-      end
-
-      self.is_la_inferred = la.present? if is_supported_housing? && location && self[:la].blank?
+    elsif form.start_year_2026_or_later? && location_changed?
+      reset_address_fields!
+      self.la = nil
     end
 
     if scheme_has_confidential_information?
diff --git a/app/models/form/lettings/pages/property_local_authority.rb b/app/models/form/lettings/pages/property_local_authority.rb
index f552776a0..5656ec2d9 100644
--- a/app/models/form/lettings/pages/property_local_authority.rb
+++ b/app/models/form/lettings/pages/property_local_authority.rb
@@ -5,7 +5,6 @@ class Form::Lettings::Pages::PropertyLocalAuthority < ::Form::Page
     @depends_on = [
       { "is_la_inferred" => false, "is_general_needs?" => true, "form.start_year_2025_or_later?" => false, "address_search_given?" => true },
       { "is_la_inferred" => false, "is_general_needs?" => true, "form.start_year_2025_or_later?" => true },
-      { "is_la_inferred" => false, "is_supported_housing?" => true, "form.start_year_2026_or_later?" => true },
     ]
   end
 
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index f5c153f66..1eb9078ff 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -31,7 +31,7 @@ class LettingsLog < Log
   before_validation :process_postcode_changes!, if: :postcode_full_changed?
   before_validation :process_previous_postcode_changes!, if: :ppostcode_full_changed?
   before_validation :reset_invalidated_dependent_fields!
-  before_validation :reset_location_fields!, unless: :postcode_known_or_la_derived_from_scheme_location?
+  before_validation :reset_location_fields!, unless: :postcode_known?
   before_validation :reset_previous_location_fields!, unless: :previous_postcode_known?
   before_validation :set_derived_fields!
   before_validation :process_uprn_change!, if: :should_process_uprn_change?
@@ -375,10 +375,6 @@ class LettingsLog < Log
     postcode_known == 1
   end
 
-  def postcode_known_or_la_derived_from_scheme_location?
-    postcode_known? || (form&.start_year_2026_or_later? && is_supported_housing? && location.present?)
-  end
-
   def previous_postcode_known?
     # 0: Yes
     ppcodenk&.zero?