diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index 91d063656..6d15699cc 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -628,16 +628,22 @@ private def process_postcode_changes! self.postcode_full = upcase_and_remove_whitespace(postcode_full) - process_postcode(postcode_full, "postcode_known", "is_la_inferred", "la") + return if postcode_full.blank? + + self.postcode_known = 1 + inferred_la = get_inferred_la(postcode_full) + self.is_la_inferred = inferred_la.present? + self.la = inferred_la if inferred_la.present? end - def process_postcode(postcode, postcode_known_key, la_inferred_key, la_key) - return if postcode.blank? + def process_previous_postcode_changes! + self.ppostcode_full = upcase_and_remove_whitespace(ppostcode_full) + return if ppostcode_full.blank? - self[postcode_known_key] = 1 - inferred_la = get_inferred_la(postcode) - self[la_inferred_key] = inferred_la.present? - self[la_key] = inferred_la if inferred_la.present? + self.ppcodenk = 0 + inferred_la = get_inferred_la(ppostcode_full) + self.is_previous_la_inferred = inferred_la.present? + self.prevloc = inferred_la if inferred_la.present? end def get_has_benefits diff --git a/app/models/log.rb b/app/models/log.rb index 024470b21..849927cf1 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -232,11 +232,6 @@ private PIO = PostcodeService.new - def process_previous_postcode_changes! - self.ppostcode_full = upcase_and_remove_whitespace(ppostcode_full) - process_postcode(ppostcode_full, "ppcodenk", "is_previous_la_inferred", "prevloc") - end - LA_CHANGES = { "E07000027" => "E06000064", # Barrow-in-Furness => Westmorland and Furness "E07000030" => "E06000064", # Eden => Westmorland and Furness diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 283485d11..f144336bf 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -278,15 +278,6 @@ class SalesLog < Log mortgage + deposit end - def process_postcode(postcode, postcode_known_key, la_inferred_key, la_key) - return if postcode.blank? - - self[postcode_known_key] = 0 - inferred_la = get_inferred_la(postcode) - self[la_inferred_key] = inferred_la.present? - self[la_key] = inferred_la if inferred_la.present? - end - def outright_sale? ownershipsch == 3 end @@ -305,7 +296,22 @@ class SalesLog < Log def process_postcode_changes! self.postcode_full = upcase_and_remove_whitespace(postcode_full) - process_postcode(postcode_full, "pcodenk", "is_la_inferred", "la") + return if postcode_full.blank? + + self.pcodenk = 0 + inferred_la = get_inferred_la(postcode_full) + self.is_la_inferred = inferred_la.present? + self.la = inferred_la if inferred_la.present? + end + + def process_previous_postcode_changes! + self.ppostcode_full = upcase_and_remove_whitespace(ppostcode_full) + return if ppostcode_full.blank? + + self.ppcodenk = 0 + inferred_la = get_inferred_la(ppostcode_full) + self.is_previous_la_inferred = inferred_la.present? + self.prevloc = inferred_la if inferred_la.present? end def reset_created_by!