From a8513f420119ac5e91d2382f056f91a9d43c8792 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Tue, 11 Feb 2025 17:23:52 +0000 Subject: [PATCH] Reuse UprnDataPresenter where appropriate --- app/controllers/address_search_controller.rb | 2 +- app/models/log.rb | 2 +- app/services/uprn_data_presenter.rb | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/controllers/address_search_controller.rb b/app/controllers/address_search_controller.rb index e0bca3d48..09fbddd1f 100644 --- a/app/controllers/address_search_controller.rb +++ b/app/controllers/address_search_controller.rb @@ -12,7 +12,7 @@ class AddressSearchController < ApplicationController if service.error.present? render json: { error: service.error }, status: :unprocessable_entity else - presenter = AddressDataPresenter.new(service.result) + presenter = UprnDataPresenter.new(service.result) render json: [{ address: presenter.address, uprn: presenter.uprn }] end elsif query.match?(/[a-zA-Z]/) diff --git a/app/models/log.rb b/app/models/log.rb index 47f3e599c..e0c085971 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -134,7 +134,7 @@ class Log < ApplicationRecord return @address_options end - presenter = AddressDataPresenter.new(service.result) + presenter = UprnDataPresenter.new(service.result) @address_options = [{ address: presenter.address, uprn: presenter.uprn }] else return @address_options if @address_options && @last_searched_address_string == address_string diff --git a/app/services/uprn_data_presenter.rb b/app/services/uprn_data_presenter.rb index 7c70a81e3..049afb1b4 100644 --- a/app/services/uprn_data_presenter.rb +++ b/app/services/uprn_data_presenter.rb @@ -55,4 +55,12 @@ class UprnDataPresenter def result_from_lpi? data["LPI_KEY"].present? end + + def uprn + data["UPRN"] + end + + def address + data["ADDRESS"] + end end