Browse Source

feat: update matching details and fix row parser validation

pull/2278/head
natdeanlewissoftwire 2 years ago
parent
commit
3621f936b8
  1. 4
      app/models/log.rb
  2. 2
      app/services/bulk_upload/lettings/year2024/row_parser.rb
  3. 2
      app/services/bulk_upload/sales/year2024/row_parser.rb

4
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

2
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

2
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

Loading…
Cancel
Save