diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb index 6d44294ef..650615523 100644 --- a/app/models/derived_variables/lettings_log_variables.rb +++ b/app/models/derived_variables/lettings_log_variables.rb @@ -124,13 +124,11 @@ module DerivedVariables::LettingsLogVariables self.nationality_all = nationality_all_group if nationality_uk_or_prefers_not_to_say? - if self.startdate_changed? - unless LocalAuthority.active(self.startdate).where(code: la).exists? + if startdate_changed? && !LocalAuthority.active(startdate).where(code: la).exists? self.la = nil self.is_la_inferred = false - end end - + reset_address_fields! if is_supported_housing? end diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb index 1ba063988..61aa9a6f8 100644 --- a/app/models/derived_variables/sales_log_variables.rb +++ b/app/models/derived_variables/sales_log_variables.rb @@ -75,11 +75,9 @@ module DerivedVariables::SalesLogVariables self.nationality_all = nationality_all_group if nationality_uk_or_prefers_not_to_say? self.nationality_all_buyer2 = nationality_all_buyer2_group if nationality2_uk_or_prefers_not_to_say? - if self.saledate_changed? - unless LocalAuthority.active(self.saledate).where(code: la).exists? + if saledate_changed? && !LocalAuthority.active(saledate).where(code: la).exists? self.la = nil self.is_la_inferred = false - end end set_encoded_derived_values!(DEPENDENCIES)