From 7239b3d0d8e0a9aa4347d78defe49ee739d293b8 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 4 Mar 2024 11:03:09 +0000 Subject: [PATCH] feat: store address input separately --- app/models/form/lettings/pages/address_selection.rb | 2 +- .../questions/address_line1_for_address_matcher.rb | 2 +- .../questions/postcode_for_address_matcher.rb | 2 +- app/models/log.rb | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/models/form/lettings/pages/address_selection.rb b/app/models/form/lettings/pages/address_selection.rb index 962246df0..40a48c27b 100644 --- a/app/models/form/lettings/pages/address_selection.rb +++ b/app/models/form/lettings/pages/address_selection.rb @@ -12,7 +12,7 @@ class Form::Lettings::Pages::AddressSelection < ::Form::Page end def routed_to?(log, _current_user = nil) - log.uprn_known.present? && log.uprn_known.zero? && log.address_line1.present? && log.postcode_full.present? + log.uprn_known.present? && log.uprn_known.zero? && log.address_line1_input.present? && log.postcode_full_input.present? end def skip_text diff --git a/app/models/form/lettings/questions/address_line1_for_address_matcher.rb b/app/models/form/lettings/questions/address_line1_for_address_matcher.rb index 2c807f85b..fa9dbf98b 100644 --- a/app/models/form/lettings/questions/address_line1_for_address_matcher.rb +++ b/app/models/form/lettings/questions/address_line1_for_address_matcher.rb @@ -1,7 +1,7 @@ class Form::Lettings::Questions::AddressLine1ForAddressMatcher < ::Form::Question def initialize(id, hsh, page) super - @id = "address_line1" + @id = "address_line1_input" @header = "Address line 1" @error_label = "Address line 1" @type = "text" diff --git a/app/models/form/lettings/questions/postcode_for_address_matcher.rb b/app/models/form/lettings/questions/postcode_for_address_matcher.rb index 989b976c7..81387c233 100644 --- a/app/models/form/lettings/questions/postcode_for_address_matcher.rb +++ b/app/models/form/lettings/questions/postcode_for_address_matcher.rb @@ -1,7 +1,7 @@ class Form::Lettings::Questions::PostcodeForAddressMatcher < ::Form::Question def initialize(id, hsh, page) super - @id = "postcode_full" + @id = "postcode_full_input" @header = "Postcode" @type = "text" @width = 5 diff --git a/app/models/log.rb b/app/models/log.rb index 483ebfaed..1012f60ee 100644 --- a/app/models/log.rb +++ b/app/models/log.rb @@ -77,12 +77,12 @@ class Log < ApplicationRecord end def process_address_change! - if [address_selection, address_line1, postcode_full].all?(&:present?) - address_string = "#{address_line1}, , , #{postcode_full}" + if [address_selection, address_line1_input, postcode_full_input].all?(&:present?) + address_string = "#{address_line1_input}, , , #{postcode_full_input}" service = AddressClient.new(address_string) service.call - return errors.add(:address_line1, :address_error, message: service.error) if service.error.present? + return errors.add(:address_line1_input, :address_error, message: service.error) if service.error.present? if address_selection.between?(0, 9) presenter = AddressDataPresenter.new(service.result[address_selection]) @@ -109,12 +109,12 @@ class Log < ApplicationRecord end def address_options - if [address_line1, postcode_full].all?(&:present?) - address_string = "#{address_line1}, , , #{postcode_full}" + if [address_line1_input, postcode_full_input].all?(&:present?) + address_string = "#{address_line1_input}, , , #{postcode_full_input}" service = AddressClient.new(address_string) service.call - return errors.add(:address_line1, :address_error, message: service.error) if service.error.present? + return errors.add(:address_line1_input, :address_error, message: service.error) if service.error.present? address_options = [] service.result.first(10).each do |result|