From df3eef2dee1b24ba376cb48c8f74688f6893708b Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 2 Oct 2024 08:29:33 +0100 Subject: [PATCH] Undo lettings export field changes --- app/services/exports/lettings_log_export_constants.rb | 11 ++++++++--- app/services/exports/lettings_log_export_service.rb | 9 ++++++++- spec/fixtures/exports/general_needs_log.xml | 11 ++++++++--- spec/fixtures/exports/general_needs_log_23_24.xml | 11 ++++++++--- spec/fixtures/exports/general_needs_log_24_25.xml | 11 ++++++++--- spec/fixtures/exports/supported_housing_logs.xml | 11 ++++++++--- .../exports/lettings_log_export_service_spec.rb | 3 --- 7 files changed, 48 insertions(+), 19 deletions(-) diff --git a/app/services/exports/lettings_log_export_constants.rb b/app/services/exports/lettings_log_export_constants.rb index 7de619331..3dc47736a 100644 --- a/app/services/exports/lettings_log_export_constants.rb +++ b/app/services/exports/lettings_log_export_constants.rb @@ -29,6 +29,7 @@ module Exports::LettingsLogExportConstants "has_benefits", "hb", "hbrentshortfall", + "hcnum", "hhmemb", "hhtype", "homeless", @@ -46,7 +47,9 @@ module Exports::LettingsLogExportConstants "layear", "leftreg", "lettype", + "manhcnum", "maningorgid", + "maningorgname", "mantype", "mobstand", "mrcdate", @@ -57,6 +60,7 @@ module Exports::LettingsLogExportConstants "nocharge", "offered", "owningorgid", + "owningorgname", "period", "uprn", "uprn_known", @@ -72,6 +76,7 @@ module Exports::LettingsLogExportConstants "prevloc", "prevten", "propcode", + "providertype", "pscharge", "reason", "reasonother", @@ -131,7 +136,7 @@ module Exports::LettingsLogExportConstants "log_id", "scheme_status", "location_status", - "amended_by_id", + "amended_by", "duplicate_set_id", "accessible_register", "nationality_all", @@ -148,8 +153,8 @@ module Exports::LettingsLogExportConstants "pscharge_value_check", "supcharg_value_check", "carehome_charges_value_check", - "assigned_to_id", - "created_by_id", + "assigned_to", + "created_by", ] (1..8).each do |index| diff --git a/app/services/exports/lettings_log_export_service.rb b/app/services/exports/lettings_log_export_service.rb index 761278bb1..b21099a06 100644 --- a/app/services/exports/lettings_log_export_service.rb +++ b/app/services/exports/lettings_log_export_service.rb @@ -57,9 +57,13 @@ module Exports # Organisation fields if lettings_log.owning_organisation attribute_hash["owningorgid"] = lettings_log.owning_organisation.old_visible_id || (lettings_log.owning_organisation.id + LOG_ID_OFFSET) + attribute_hash["owningorgname"] = lettings_log.owning_organisation.name + attribute_hash["hcnum"] = lettings_log.owning_organisation.housing_registration_no end if lettings_log.managing_organisation attribute_hash["maningorgid"] = lettings_log.managing_organisation.old_visible_id || (lettings_log.managing_organisation.id + LOG_ID_OFFSET) + attribute_hash["maningorgname"] = lettings_log.managing_organisation.name + attribute_hash["manhcnum"] = lettings_log.managing_organisation.housing_registration_no end # Covert date times to ISO 8601 @@ -81,7 +85,9 @@ module Exports end attribute_hash["log_id"] = lettings_log.id - attribute_hash["amended_by_id"] = lettings_log.updated_by_id + attribute_hash["assigned_to"] = lettings_log.assigned_to&.email + attribute_hash["created_by"] = lettings_log.created_by&.email + attribute_hash["amended_by"] = lettings_log.updated_by&.email attribute_hash["la"] = lettings_log.la attribute_hash["postcode_full"] = lettings_log.postcode_full @@ -158,6 +164,7 @@ module Exports form << doc.create_element(key, value) end end + form << doc.create_element("providertype", lettings_log.owning_organisation&.read_attribute_before_type_cast(:provider_type)) end xml_doc_to_temp_file(doc) diff --git a/spec/fixtures/exports/general_needs_log.xml b/spec/fixtures/exports/general_needs_log.xml index 36e20208d..bacc7e9f0 100644 --- a/spec/fixtures/exports/general_needs_log.xml +++ b/spec/fixtures/exports/general_needs_log.xml @@ -131,7 +131,6 @@ 2 - {assigned_to} 4 2 @@ -146,14 +145,20 @@ 1 - {created_by} {id} {owning_org_id} + MHCLG + 1234 {managing_org_id} + MHCLG + 1234 2022-05-01T00:00:00+01:00 2022-05-01T00:00:00+01:00 {log_id} - + test1@example.com + test1@example.com + 2 + 1 diff --git a/spec/fixtures/exports/general_needs_log_23_24.xml b/spec/fixtures/exports/general_needs_log_23_24.xml index 7bb22021e..9635cd0e4 100644 --- a/spec/fixtures/exports/general_needs_log_23_24.xml +++ b/spec/fixtures/exports/general_needs_log_23_24.xml @@ -132,7 +132,6 @@ 2 3 - {assigned_to} 4 2 @@ -147,14 +146,20 @@ 1 - {created_by} {id} {owning_org_id} + MHCLG + 1234 {managing_org_id} + MHCLG + 1234 2023-04-03T00:00:00+01:00 2023-04-03T00:00:00+01:00 {log_id} - + test1@example.com + test1@example.com + 2 + 1 diff --git a/spec/fixtures/exports/general_needs_log_24_25.xml b/spec/fixtures/exports/general_needs_log_24_25.xml index 8bd755496..a665a284e 100644 --- a/spec/fixtures/exports/general_needs_log_24_25.xml +++ b/spec/fixtures/exports/general_needs_log_24_25.xml @@ -132,7 +132,6 @@ 2 3 - {assigned_to} 4 2 @@ -160,14 +159,20 @@ county as entered AB1 2CD la as entered - {created_by} {id} {owning_org_id} + MHCLG + 1234 {managing_org_id} + MHCLG + 1234 2024-04-03T00:00:00+01:00 2024-04-03T00:00:00+01:00 {log_id} - + test1@example.com + test1@example.com + 2 + 1 diff --git a/spec/fixtures/exports/supported_housing_logs.xml b/spec/fixtures/exports/supported_housing_logs.xml index 1b4863245..50649241b 100644 --- a/spec/fixtures/exports/supported_housing_logs.xml +++ b/spec/fixtures/exports/supported_housing_logs.xml @@ -130,7 +130,6 @@ 2 - {assigned_to} 1 4 2 @@ -145,14 +144,19 @@ 1 - {created_by} {id} {owning_org_id} + MHCLG + 1234 {managing_org_id} + MHCLG + 1234 2022-05-01T00:00:00+01:00 2022-05-01T00:00:00+01:00 {log_id} - {amended_by} + fake@email.com + fake@email.com + other@email.com 7 1 G @@ -171,5 +175,6 @@ {location_id} active 2 + 1 diff --git a/spec/services/exports/lettings_log_export_service_spec.rb b/spec/services/exports/lettings_log_export_service_spec.rb index bf2d100ed..6f7d88c91 100644 --- a/spec/services/exports/lettings_log_export_service_spec.rb +++ b/spec/services/exports/lettings_log_export_service_spec.rb @@ -23,9 +23,6 @@ RSpec.describe Exports::LettingsLogExportService do export_template.sub!(/\{managing_org_id\}/, (lettings_log["managing_organisation_id"] + Exports::LettingsLogExportService::LOG_ID_OFFSET).to_s) export_template.sub!(/\{location_id\}/, (lettings_log["location_id"]).to_s) if lettings_log.needstype == 2 export_template.sub!(/\{scheme_id\}/, (lettings_log["scheme_id"]).to_s) if lettings_log.needstype == 2 - export_template.sub!(/\{assigned_to\}/, lettings_log["assigned_to_id"].to_s) - export_template.sub!(/\{created_by\}/, lettings_log["created_by_id"].to_s) - export_template.sub!(/\{amended_by\}/, lettings_log["updated_by_id"].to_s) export_template.sub!(/\{log_id\}/, lettings_log["id"].to_s) end