Browse Source

separate process postcode methods

pull/1854/head
Kat 3 years ago
parent
commit
89979964ad
  1. 20
      app/models/lettings_log.rb
  2. 5
      app/models/log.rb
  3. 26
      app/models/sales_log.rb

20
app/models/lettings_log.rb

@ -628,16 +628,22 @@ private
def process_postcode_changes! def process_postcode_changes!
self.postcode_full = upcase_and_remove_whitespace(postcode_full) 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 end
def process_postcode(postcode, postcode_known_key, la_inferred_key, la_key) def process_previous_postcode_changes!
return if postcode.blank? self.ppostcode_full = upcase_and_remove_whitespace(ppostcode_full)
return if ppostcode_full.blank?
self[postcode_known_key] = 1 self.ppcodenk = 0
inferred_la = get_inferred_la(postcode) inferred_la = get_inferred_la(ppostcode_full)
self[la_inferred_key] = inferred_la.present? self.is_previous_la_inferred = inferred_la.present?
self[la_key] = inferred_la if inferred_la.present? self.prevloc = inferred_la if inferred_la.present?
end end
def get_has_benefits def get_has_benefits

5
app/models/log.rb

@ -232,11 +232,6 @@ private
PIO = PostcodeService.new 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 = { LA_CHANGES = {
"E07000027" => "E06000064", # Barrow-in-Furness => Westmorland and Furness "E07000027" => "E06000064", # Barrow-in-Furness => Westmorland and Furness
"E07000030" => "E06000064", # Eden => Westmorland and Furness "E07000030" => "E06000064", # Eden => Westmorland and Furness

26
app/models/sales_log.rb

@ -278,15 +278,6 @@ class SalesLog < Log
mortgage + deposit mortgage + deposit
end 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? def outright_sale?
ownershipsch == 3 ownershipsch == 3
end end
@ -305,7 +296,22 @@ class SalesLog < Log
def process_postcode_changes! def process_postcode_changes!
self.postcode_full = upcase_and_remove_whitespace(postcode_full) 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 end
def reset_created_by! def reset_created_by!

Loading…
Cancel
Save