Browse Source

Controller method improvements

pull/2924/head
Manny Dinssa 2 months ago
parent
commit
6dcf293d4e
  1. 23
      app/controllers/address_search_controller.rb

23
app/controllers/address_search_controller.rb

@ -1,5 +1,6 @@
class AddressSearchController < ApplicationController class AddressSearchController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
before_action :set_log, only: %i[manual_input search_input]
def index def index
query = params[:query] query = params[:query]
@ -40,7 +41,7 @@ class AddressSearchController < ApplicationController
results = (address_service.result || []) + (uprn_service.result || []) results = (address_service.result || []) + (uprn_service.result || [])
if address_service.error.present? && uprn_service.error.present? if address_service.error.present? && uprn_service.error.present?
render json: { error: "Address and UPRN are not recognised. Check the input." }, status: :unprocessable_entity render json: { error: "Address and UPRN are not recognised." }, status: :unprocessable_entity
else else
formatted_results = results.map do |result| formatted_results = results.map do |result|
presenter = AddressDataPresenter.new(result) presenter = AddressDataPresenter.new(result)
@ -52,26 +53,18 @@ class AddressSearchController < ApplicationController
end end
def manual_input def manual_input
log = params[:log_type] == "lettings_log" ? current_user.lettings_logs.find(params[:log_id]) : current_user.sales_logs.find(params[:log_id]) @log.update!(manual_address_entry_selected: true)
log.update!(manual_address_entry_selected: true) redirect_to polymorphic_url([@log, :address])
redirect_to manual_address_link(log)
end end
def search_input def search_input
log = params[:log_type] == "lettings_log" ? current_user.lettings_logs.find(params[:log_id]) : current_user.sales_logs.find(params[:log_id]) @log.update!(manual_address_entry_selected: false)
log.update!(manual_address_entry_selected: false) redirect_to polymorphic_url([@log, :address_search])
redirect_to search_address_link(log)
end end
private private
def manual_address_link(log) def set_log
base_url = send("#{log.log_type}_url", log) @log = current_user.send("#{params[:log_type]}s").find(params[:log_id])
"#{base_url}/address"
end
def search_address_link(log)
base_url = send("#{log.log_type}_url", log)
"#{base_url}/address-search"
end end
end end

Loading…
Cancel
Save