Browse Source

Change back log address search method to only work for uprn selection

pull/2977/head
Manny Dinssa 2 months ago
parent
commit
827c7da173
  1. 54
      app/models/log.rb

54
app/models/log.rb

@ -128,38 +128,40 @@ class Log < ApplicationRecord
"#{address_line1_input}, #{postcode_full_input}" "#{address_line1_input}, #{postcode_full_input}"
end end
def address_options def address_search_options
if uprn.present? return if uprn.blank?
service = UprnClient.new(uprn)
service.call service = UprnClient.new(uprn)
if service.result.blank? || service.error.present? service.call
@address_options = [] if service.result.blank? || service.error.present?
return @address_options @address_options = []
end return @address_options
end
presenter = UprnDataPresenter.new(service.result) presenter = UprnDataPresenter.new(service.result)
@address_options = [{ address: presenter.address, uprn: presenter.uprn }] @address_options = [{ address: presenter.address, uprn: presenter.uprn }]
else end
return @address_options if @address_options && @last_searched_address_string == address_string
return if address_string.blank?
@last_searched_address_string = address_string def address_options
return @address_options if @address_options && @last_searched_address_string == address_string
return if address_string.blank?
service = AddressClient.new(address_string) @last_searched_address_string = address_string
service.call
if service.result.blank? || service.error.present?
@address_options = []
return @address_options
end
address_opts = [] service = AddressClient.new(address_string)
service.result.first(10).each do |result| service.call
presenter = AddressDataPresenter.new(result) if service.result.blank? || service.error.present?
address_opts.append({ address: presenter.address, uprn: presenter.uprn }) @address_options = []
end return @address_options
end
@address_options = address_opts address_opts = []
service.result.first(10).each do |result|
presenter = AddressDataPresenter.new(result)
address_opts.append({ address: presenter.address, uprn: presenter.uprn })
end end
@address_options = address_opts
end end
def collection_start_year def collection_start_year

Loading…
Cancel
Save