From 19062488a712b5b0cafa8c16c7bc23a7b27f7385 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Tue, 19 Mar 2024 15:09:30 +0000 Subject: [PATCH] feat: add as entered fields to xml export for 2024 only --- .../exports/lettings_log_export_constants.rb | 16 ++++++++++++++-- .../exports/lettings_log_export_service.rb | 4 ---- .../fixtures/exports/general_needs_log_24_25.xml | 6 ++++++ .../exports/lettings_log_export_service_spec.rb | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app/services/exports/lettings_log_export_constants.rb b/app/services/exports/lettings_log_export_constants.rb index efae33dcb..c60f1339d 100644 --- a/app/services/exports/lettings_log_export_constants.rb +++ b/app/services/exports/lettings_log_export_constants.rb @@ -140,7 +140,13 @@ module Exports::LettingsLogExportConstants "amended_by", "duplicate_set_id", "accessible_register", - "nationality_all" + "nationality_all", + "address_line1_as_entered", + "address_line2_as_entered", + "town_or_city_as_entered", + "county_as_entered", + "postcode_full_as_entered", + "la_as_entered", ] (1..8).each do |index| @@ -160,7 +166,13 @@ module Exports::LettingsLogExportConstants POST_2024_EXPORT_FIELDS = Set[ "accessible_register", - "nationality_all" + "nationality_all", + "address_line1_as_entered", + "address_line2_as_entered", + "town_or_city_as_entered", + "county_as_entered", + "postcode_full_as_entered", + "la_as_entered", ] PRE_2024_EXPORT_FIELDS = Set[ diff --git a/app/services/exports/lettings_log_export_service.rb b/app/services/exports/lettings_log_export_service.rb index 7da3906e5..c12e188a2 100644 --- a/app/services/exports/lettings_log_export_service.rb +++ b/app/services/exports/lettings_log_export_service.rb @@ -255,10 +255,6 @@ module Exports attribute_hash["location_status"] = location.status_at(attribute_hash["startdate"]) end - def filter_keys!(attributes) - attributes.reject! { |attribute| is_omitted_field?(attribute) } - end - def is_omitted_field?(field_name, lettings_log) pattern_age = /age\d_known/ details_known_prefix = "details_known_" diff --git a/spec/fixtures/exports/general_needs_log_24_25.xml b/spec/fixtures/exports/general_needs_log_24_25.xml index 3a9893748..f21e20f47 100644 --- a/spec/fixtures/exports/general_needs_log_24_25.xml +++ b/spec/fixtures/exports/general_needs_log_24_25.xml @@ -146,6 +146,12 @@ 2 + address line 1 as entered + address line 2 as entered + town or city as entered + county as entered + AB1 2CD + la as entered {id} {owning_org_id} DLUHC diff --git a/spec/services/exports/lettings_log_export_service_spec.rb b/spec/services/exports/lettings_log_export_service_spec.rb index 6141207d1..2e534f748 100644 --- a/spec/services/exports/lettings_log_export_service_spec.rb +++ b/spec/services/exports/lettings_log_export_service_spec.rb @@ -472,7 +472,7 @@ RSpec.describe Exports::LettingsLogExportService do end context "and one lettings log is available for export" do - let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, created_by: user, ppostcode_full: "A1 1AA", nationality_all_group: 13, propcode: "123", postcode_full: "SE2 6RT", tenancycode: "BZ737", startdate: Time.zone.local(2024, 4, 2, 10, 36, 49), voiddate: Time.zone.local(2021, 11, 3), mrcdate: Time.zone.local(2022, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4) } + let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, created_by: user, ppostcode_full: "A1 1AA", nationality_all_group: 13, propcode: "123", postcode_full: "SE2 6RT", tenancycode: "BZ737", startdate: Time.zone.local(2024, 4, 2, 10, 36, 49), voiddate: Time.zone.local(2021, 11, 3), mrcdate: Time.zone.local(2022, 5, 5, 10, 36, 49), tenancylength: 5, underoccupation_benefitcap: 4, address_line1_as_entered: "address line 1 as entered", address_line2_as_entered: "address line 2 as entered", town_or_city_as_entered: "town or city as entered", county_as_entered: "county as entered", postcode_full_as_entered: "AB1 2CD", la_as_entered: "la as entered") } let(:expected_zip_filename) { "core_2024_2025_apr_mar_f0001_inc0001.zip" } let(:expected_data_filename) { "core_2024_2025_apr_mar_f0001_inc0001_pt001.xml" } let(:xml_export_file) { File.open("spec/fixtures/exports/general_needs_log_24_25.xml", "r:UTF-8") }