From 79045db71ddcf9173abfcaab3e49790c101cd5de Mon Sep 17 00:00:00 2001
From: Kat <54268893+kosiakkatrina@users.noreply.github.com>
Date: Fri, 7 Mar 2025 10:57:08 +0000
Subject: [PATCH] Update some more fields
---
app/services/exports/sales_log_export_constants.rb | 4 ++--
app/services/exports/sales_log_export_service.rb | 2 ++
spec/fixtures/exports/sales_log.xml | 4 ++--
spec/fixtures/exports/sales_log_2024.xml | 4 ++--
spec/services/exports/sales_log_export_service_spec.rb | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/services/exports/sales_log_export_constants.rb b/app/services/exports/sales_log_export_constants.rb
index c9bf3d60c..09a0d5d68 100644
--- a/app/services/exports/sales_log_export_constants.rb
+++ b/app/services/exports/sales_log_export_constants.rb
@@ -12,7 +12,7 @@ module Exports::SalesLogExportConstants
"DAY",
"MONTH",
"YEAR",
- "DUPLICATE_SET_ID",
+ "DUPLICATESET",
"CREATEDDATE",
"UPLOADDATE",
"OWNINGORGID",
@@ -94,7 +94,7 @@ module Exports::SalesLogExportConstants
"BULKUPLOADID",
"VALUE_VALUE_CHECK",
"PREVSHARED",
- "STAIRCASESALE",
+ "STAIRCASETOSALE",
"ETHNICGROUP2",
"ETHNIC2",
"BUY2LIVING",
diff --git a/app/services/exports/sales_log_export_service.rb b/app/services/exports/sales_log_export_service.rb
index c78212155..fa806f6ab 100644
--- a/app/services/exports/sales_log_export_service.rb
+++ b/app/services/exports/sales_log_export_service.rb
@@ -117,6 +117,8 @@ module Exports
attribute_hash["stairinitialmonth"] = sales_log.initialpurchase&.month
attribute_hash["stairinitialyear"] = sales_log.initialpurchase&.year
attribute_hash["mscharge_value_check"] = sales_log.monthly_charges_value_check
+ attribute_hash["duplicateset"] = sales_log.duplicate_set_id
+ attribute_hash["staircasetosale"] = sales_log.staircasesale
attribute_hash.transform_keys!(&:upcase)
attribute_hash
diff --git a/spec/fixtures/exports/sales_log.xml b/spec/fixtures/exports/sales_log.xml
index 281f53308..37dc6dda5 100644
--- a/spec/fixtures/exports/sales_log.xml
+++ b/spec/fixtures/exports/sales_log.xml
@@ -81,11 +81,9 @@
6
2
-
3
-
@@ -150,5 +148,7 @@
+
+
diff --git a/spec/fixtures/exports/sales_log_2024.xml b/spec/fixtures/exports/sales_log_2024.xml
index c39f2eee7..e894ac973 100644
--- a/spec/fixtures/exports/sales_log_2024.xml
+++ b/spec/fixtures/exports/sales_log_2024.xml
@@ -81,11 +81,9 @@
6
2
-
3
-
@@ -150,5 +148,7 @@
+
+
diff --git a/spec/services/exports/sales_log_export_service_spec.rb b/spec/services/exports/sales_log_export_service_spec.rb
index ab85c92e3..c11c13712 100644
--- a/spec/services/exports/sales_log_export_service_spec.rb
+++ b/spec/services/exports/sales_log_export_service_spec.rb
@@ -315,7 +315,7 @@ RSpec.describe Exports::SalesLogExportService do
let!(:sales_log) { FactoryBot.create(:sales_log, :export, duplicate_set_id: 123) }
def replace_duplicate_set_id(export_file)
- export_file.sub!("", "123")
+ export_file.sub!("", "123")
end
it "generates an XML export file with the expected content within the ZIP file" do