From 8f5ef04a7b403a9c8cbef234fc49e839a500da30 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Fri, 8 Mar 2024 11:57:48 +0000
Subject: [PATCH] refactor: improve readability

---
 app/models/lettings_log.rb | 12 ++++++++++--
 app/models/log.rb          |  5 ++---
 app/models/sales_log.rb    | 12 ++++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index d9ac22d42..539975c47 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -846,10 +846,18 @@ private
   end
 
   def should_process_uprn_change?
-    uprn && startdate && (uprn_changed? || startdate_changed?) && collection_start_year_for_date(startdate) >= 2023
+    return unless uprn
+    return unless startdate
+    return unless collection_start_year_for_date(startdate) >= 2023
+
+    uprn_changed? || startdate_changed?
   end
 
   def should_process_address_change?
-    (address_selection || select_best_address_match) && startdate && ((address_selection_changed? || select_best_address_match) || startdate_changed?) && form.start_year_after_2024?
+    return unless address_selection || select_best_address_match
+    return unless startdate
+    return unless form.start_year_after_2024?
+
+    address_selection_changed? || select_best_address_match || startdate_changed?
   end
 end
diff --git a/app/models/log.rb b/app/models/log.rb
index a0a5e587b..b638e3210 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -87,8 +87,8 @@ class Log < ApplicationRecord
 
       if select_best_address_match
         presenter = AddressDataPresenter.new(service.result.first)
-        os_good_match_threshold = 0.7
-        if presenter.match >= os_good_match_threshold
+        os_match_threshold_for_bulk_upload = 0.7
+        if presenter.match >= os_match_threshold_for_bulk_upload
           self.address_selection = 0
         else
           return nil
@@ -127,7 +127,6 @@ class Log < ApplicationRecord
     return @address_options if @address_options
 
     if [address_line1_input, postcode_full_input].all?(&:present?)
-      address_string = "#{address_line1_input}, , , #{postcode_full_input}"
       service = AddressClient.new(address_string)
       service.call
 
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index d68d5bd82..266ee59c2 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -430,11 +430,19 @@ class SalesLog < Log
   end
 
   def should_process_uprn_change?
-    uprn && saledate && (uprn_changed? || saledate_changed?) && collection_start_year_for_date(saledate) >= 2023
+    return unless uprn
+    return unless saledate
+    return unless collection_start_year_for_date(saledate) >= 2023
+
+    uprn_changed? || saledate_changed?
   end
 
   def should_process_address_change?
-    (address_selection || select_best_address_match) && saledate && ((address_selection_changed? || select_best_address_match) || saledate_changed?) && form.start_year_after_2024?
+    return unless address_selection || select_best_address_match
+    return unless saledate
+    return unless form.start_year_after_2024?
+
+    address_selection_changed? || select_best_address_match || saledate_changed?
   end
 
   def value_with_discount