From 3b13dcc62f0a8e9dc27e3633f69e6b631d56c8f5 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:02:27 +0200 Subject: [PATCH] CLDC-2702 Prioritise addresses over UPRN on import (#1866) * Prioritise addresses over UPRN * Prioritise addresses over UPRN - sales * Add test case --- .../imports/lettings_logs_import_service.rb | 10 +++++++--- .../imports/sales_logs_import_service.rb | 10 +++++++--- .../lettings_logs_import_service_spec.rb | 20 ++++++++++++++++++- .../imports/sales_logs_import_service_spec.rb | 19 +++++++++++++++++- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/app/services/imports/lettings_logs_import_service.rb b/app/services/imports/lettings_logs_import_service.rb index 2ec9ee252..339dc5ca9 100644 --- a/app/services/imports/lettings_logs_import_service.rb +++ b/app/services/imports/lettings_logs_import_service.rb @@ -200,13 +200,13 @@ module Imports attributes["first_time_property_let_as_social_housing"] = first_time_let(attributes["rsnvac"]) attributes["declaration"] = declaration(xml_doc) - attributes["uprn"] = string_or_nil(xml_doc, "UPRN") - attributes["uprn_known"] = attributes["uprn"].present? ? 1 : 0 - attributes["uprn_confirmed"] = attributes["uprn"].present? ? 1 : 0 attributes["address_line1"] = string_or_nil(xml_doc, "AddressLine1") attributes["address_line2"] = string_or_nil(xml_doc, "AddressLine2") attributes["town_or_city"] = string_or_nil(xml_doc, "TownCity") attributes["county"] = string_or_nil(xml_doc, "County") + attributes["uprn"] = address_given?(attributes) ? nil : string_or_nil(xml_doc, "UPRN") + attributes["uprn_known"] = attributes["uprn"].present? ? 1 : 0 + attributes["uprn_confirmed"] = attributes["uprn"].present? ? 1 : 0 set_partial_charges_to_zero(attributes) @@ -651,5 +651,9 @@ module Imports OrganisationRelationship.find_or_create_by!(parent_organisation_id:, child_organisation_id:) end + + def address_given?(attributes) + attributes["address_line1"].present? && attributes["town_or_city"].present? + end end end diff --git a/app/services/imports/sales_logs_import_service.rb b/app/services/imports/sales_logs_import_service.rb index a82dc325c..2c0bd4972 100644 --- a/app/services/imports/sales_logs_import_service.rb +++ b/app/services/imports/sales_logs_import_service.rb @@ -153,13 +153,13 @@ module Imports attributes["percentage_discount_value_check"] = 0 # 2023/34 attributes - attributes["uprn"] = string_or_nil(xml_doc, "UPRN") - attributes["uprn_known"] = attributes["uprn"].present? ? 1 : 0 - attributes["uprn_confirmed"] = attributes["uprn"].present? ? 1 : 0 attributes["address_line1"] = string_or_nil(xml_doc, "AddressLine1") attributes["address_line2"] = string_or_nil(xml_doc, "AddressLine2") attributes["town_or_city"] = string_or_nil(xml_doc, "TownCity") attributes["county"] = string_or_nil(xml_doc, "County") + attributes["uprn"] = address_given?(attributes) ? nil : string_or_nil(xml_doc, "UPRN") + attributes["uprn_known"] = attributes["uprn"].present? ? 1 : 0 + attributes["uprn_confirmed"] = attributes["uprn"].present? ? 1 : 0 attributes["proplen_asked"] = 0 if attributes["proplen"]&.positive? attributes["proplen_asked"] = 1 if attributes["proplen"]&.zero? @@ -606,5 +606,9 @@ module Imports applicable_questions = sales_log.form.subsections.map { |s| s.applicable_questions(sales_log).select { |q| q.enabled?(sales_log) } }.flatten applicable_questions.filter { |q| q.unanswered?(sales_log) }.map(&:id) - sales_log.optional_fields end + + def address_given?(attributes) + attributes["address_line1"].present? && attributes["town_or_city"].present? + end end end diff --git a/spec/services/imports/lettings_logs_import_service_spec.rb b/spec/services/imports/lettings_logs_import_service_spec.rb index 1210e84ba..07fd6996e 100644 --- a/spec/services/imports/lettings_logs_import_service_spec.rb +++ b/spec/services/imports/lettings_logs_import_service_spec.rb @@ -1557,7 +1557,25 @@ RSpec.describe Imports::LettingsLogsImportService do expect(lettings_log&.postcode_full).to eq("A1 1AA") end - it "correctly sets address and uprn if uprn is given" do + it "prioritises address and doesn't set UPRN if both address and UPRN is given" do + lettings_log_service.send(:create_log, lettings_log_xml) + + lettings_log = LettingsLog.find_by(old_id: lettings_log_id) + expect(lettings_log&.uprn_known).to eq(0) # no + expect(lettings_log&.uprn).to be_nil + expect(lettings_log&.uprn_confirmed).to eq(0) + expect(lettings_log&.address_line1).to eq("address 1") + expect(lettings_log&.address_line2).to eq("address 2") + expect(lettings_log&.town_or_city).to eq("towncity") + expect(lettings_log&.county).to eq("county") + expect(lettings_log&.postcode_full).to eq("A1 1AA") + end + + it "correctly sets address and uprn if uprn is given and address isn't given" do + lettings_log_xml.at_xpath("//xmlns:AddressLine1").content = "" + lettings_log_xml.at_xpath("//xmlns:AddressLine2").content = "" + lettings_log_xml.at_xpath("//xmlns:TownCity").content = "" + lettings_log_xml.at_xpath("//xmlns:County").content = "" lettings_log_service.send(:create_log, lettings_log_xml) lettings_log = LettingsLog.find_by(old_id: lettings_log_id) diff --git a/spec/services/imports/sales_logs_import_service_spec.rb b/spec/services/imports/sales_logs_import_service_spec.rb index c3de7c993..3a7502925 100644 --- a/spec/services/imports/sales_logs_import_service_spec.rb +++ b/spec/services/imports/sales_logs_import_service_spec.rb @@ -1684,7 +1684,24 @@ RSpec.describe Imports::SalesLogsImportService do expect(sales_log&.postcode_full).to eq("A1 1AA") end - it "correctly sets address and uprn if uprn is given" do + it "prioritises address and doesn't set UPRN if both address and UPRN is given" do + sales_log_service.send(:create_log, sales_log_xml) + + sales_log = SalesLog.find_by(old_id: sales_log_id) + expect(sales_log&.uprn_known).to eq(0) # no + expect(sales_log&.uprn).to be_nil + expect(sales_log&.address_line1).to eq("address 1") + expect(sales_log&.address_line2).to eq("address 2") + expect(sales_log&.town_or_city).to eq("towncity") + expect(sales_log&.county).to eq("county") + expect(sales_log&.postcode_full).to eq("A1 1AA") + end + + it "correctly sets address and uprn if uprn is given and address is not given" do + sales_log_xml.at_xpath("//xmlns:AddressLine1").content = "" + sales_log_xml.at_xpath("//xmlns:AddressLine2").content = "" + sales_log_xml.at_xpath("//xmlns:TownCity").content = "" + sales_log_xml.at_xpath("//xmlns:County").content = "" sales_log_service.send(:create_log, sales_log_xml) sales_log = SalesLog.find_by(old_id: sales_log_id)