diff --git a/app/services/exports/lettings_log_export_constants.rb b/app/services/exports/lettings_log_export_constants.rb
index 3dc47736a..6c8cd061d 100644
--- a/app/services/exports/lettings_log_export_constants.rb
+++ b/app/services/exports/lettings_log_export_constants.rb
@@ -29,7 +29,6 @@ module Exports::LettingsLogExportConstants
"has_benefits",
"hb",
"hbrentshortfall",
- "hcnum",
"hhmemb",
"hhtype",
"homeless",
@@ -47,9 +46,7 @@ module Exports::LettingsLogExportConstants
"layear",
"leftreg",
"lettype",
- "manhcnum",
"maningorgid",
- "maningorgname",
"mantype",
"mobstand",
"mrcdate",
@@ -60,7 +57,6 @@ module Exports::LettingsLogExportConstants
"nocharge",
"offered",
"owningorgid",
- "owningorgname",
"period",
"uprn",
"uprn_known",
@@ -76,7 +72,6 @@ module Exports::LettingsLogExportConstants
"prevloc",
"prevten",
"propcode",
- "providertype",
"pscharge",
"reason",
"reasonother",
diff --git a/app/services/exports/lettings_log_export_service.rb b/app/services/exports/lettings_log_export_service.rb
index e25ad5645..263192485 100644
--- a/app/services/exports/lettings_log_export_service.rb
+++ b/app/services/exports/lettings_log_export_service.rb
@@ -57,13 +57,9 @@ 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
@@ -85,9 +81,9 @@ module Exports
end
attribute_hash["log_id"] = lettings_log.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["assigned_to"] = lettings_log.assigned_to_id
+ attribute_hash["created_by"] = lettings_log.created_by_id
+ attribute_hash["amended_by"] = lettings_log.updated_by_id
attribute_hash["la"] = lettings_log.la
attribute_hash["postcode_full"] = lettings_log.postcode_full
@@ -164,7 +160,6 @@ 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 bacc7e9f0..8a53e0379 100644
--- a/spec/fixtures/exports/general_needs_log.xml
+++ b/spec/fixtures/exports/general_needs_log.xml
@@ -147,18 +147,13 @@
{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
+ {assigned_to}
+ {created_by}
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 9635cd0e4..3ca4059dd 100644
--- a/spec/fixtures/exports/general_needs_log_23_24.xml
+++ b/spec/fixtures/exports/general_needs_log_23_24.xml
@@ -148,18 +148,13 @@
{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
+ {assigned_to}
+ {created_by}
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 a665a284e..489b096ca 100644
--- a/spec/fixtures/exports/general_needs_log_24_25.xml
+++ b/spec/fixtures/exports/general_needs_log_24_25.xml
@@ -161,18 +161,13 @@
la as entered
{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
+ {assigned_to}
+ {created_by}
2
- 1
diff --git a/spec/fixtures/exports/supported_housing_logs.xml b/spec/fixtures/exports/supported_housing_logs.xml
index 50649241b..e897b1542 100644
--- a/spec/fixtures/exports/supported_housing_logs.xml
+++ b/spec/fixtures/exports/supported_housing_logs.xml
@@ -146,17 +146,13 @@
{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}
- fake@email.com
- fake@email.com
- other@email.com
+ {assigned_to}
+ {created_by}
+ {amended_by}
7
1
G
@@ -175,6 +171,5 @@
{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 fd4df5538..e5572c3c0 100644
--- a/spec/services/exports/lettings_log_export_service_spec.rb
+++ b/spec/services/exports/lettings_log_export_service_spec.rb
@@ -23,6 +23,9 @@ 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