From 3621f936b8aab278156a8f0300ba3dde96058de4 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Fri, 8 Mar 2024 09:26:33 +0000
Subject: [PATCH] feat: update matching details and fix row parser validation

---
 app/models/log.rb                                        | 4 ++--
 app/services/bulk_upload/lettings/year2024/row_parser.rb | 2 +-
 app/services/bulk_upload/sales/year2024/row_parser.rb    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/log.rb b/app/models/log.rb
index 48343a761..a0a5e587b 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -87,7 +87,7 @@ class Log < ApplicationRecord
 
       if select_best_address_match
         presenter = AddressDataPresenter.new(service.result.first)
-        os_good_match_threshold = 0.8
+        os_good_match_threshold = 0.7
         if presenter.match >= os_good_match_threshold
           self.address_selection = 0
         else
@@ -120,7 +120,7 @@ class Log < ApplicationRecord
   end
 
   def address_string
-    "#{address_line1_input}, , , #{postcode_full_input}"
+    "#{address_line1_input}, #{postcode_full_input}"
   end
 
   def address_options
diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb
index 366d45bc9..3742ee234 100644
--- a/app/services/bulk_upload/lettings/year2024/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb
@@ -542,7 +542,7 @@ private
   end
 
   def validate_address_option_found
-    if log.address_selection.nil? && field_16.blank? && (field_17.present? || field_19.present?)
+    if !log.address_options_present? && field_16.blank? && (field_17.present? || field_19.present?)
       %i[field_17 field_18 field_19 field_20 field_21 field_22].each do |field|
         errors.add(field, I18n.t("validations.no_address_found"))
       end
diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb
index bba1174ac..a6aab8903 100644
--- a/app/services/bulk_upload/sales/year2024/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2024/row_parser.rb
@@ -599,7 +599,7 @@ private
   end
 
   def validate_address_option_found
-    if log.address_selection.nil? && field_22.blank? && (field_23.present? || field_25.present?)
+    if !log.address_options_present? && field_22.blank? && (field_23.present? || field_25.present?)
       %i[field_23 field_24 field_25 field_26 field_27 field_28].each do |field|
         errors.add(field, I18n.t("validations.no_address_found"))
       end