From 9786826d527f1efb2136db44d295b5a52144ae5e Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 7 Feb 2024 14:54:52 +0000 Subject: [PATCH] Move postcode inferance --- .../derived_variables/sales_log_variables.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb index 492e0a6bc..5b83be8a8 100644 --- a/app/models/derived_variables/sales_log_variables.rb +++ b/app/models/derived_variables/sales_log_variables.rb @@ -17,6 +17,15 @@ module DerivedVariables::SalesLogVariables self.hoyear = hodate.year end self.deposit = value if outright_sale? && mortgage_not_used? + + if saledate && form.start_year_after_2024? && discounted_ownership_sale? + self.ppostcode_full = postcode_full + self.ppcodenk = 0 if postcode_full.present? + self.prevloc = la + self.is_previous_la_inferred = is_la_inferred + self.previous_la_known = la_known + end + self.pcode1, self.pcode2 = postcode_full.split if postcode_full.present? self.ppostc1, self.ppostc2 = ppostcode_full.split if ppostcode_full.present? self.totchild = total_child @@ -38,14 +47,6 @@ 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 saledate && form.start_year_after_2024? && discounted_ownership_sale? - self.ppostcode_full = postcode_full - self.ppcodenk = 0 if postcode_full.present? - self.prevloc = la - self.is_previous_la_inferred = is_la_inferred - self.previous_la_known = la_known - end - set_encoded_derived_values!(DEPENDENCIES) end