Merge 673e28c6f3 into 9637209d68

app/services/exports/lettings_log_export_constants.rb

@@ -77,7 +77,6 @@ module Exports::LettingsLogExportConstants
     "reason",
     "reasonother",
     "reasonpref",
-    "referral",
     "refused",
     "reghome",
     "renttype",
@@ -158,6 +157,7 @@ module Exports::LettingsLogExportConstants
     "chcharge",
     "national",
     "offered",
+    "referral",
   ]
 
   YEAR_2022_EXPORT_FIELDS = Set[
@@ -165,6 +165,7 @@ module Exports::LettingsLogExportConstants
     "chcharge",
     "national",
     "offered",
+    "referral",
   ]
 
   YEAR_2023_EXPORT_FIELDS = Set[
@@ -172,6 +173,7 @@ module Exports::LettingsLogExportConstants
     "chcharge",
     "national",
     "offered",
+    "referral",
   ]
 
   YEAR_2024_EXPORT_FIELDS = Set[
@@ -192,6 +194,7 @@ module Exports::LettingsLogExportConstants
     "pscharge_value_check",
     "supcharg_value_check",
     "carehome_charges_value_check",
+    "referral",
   ]
 
   YEAR_2025_EXPORT_FIELDS = Set[
@@ -210,6 +213,7 @@ module Exports::LettingsLogExportConstants
     "scharge_value_check",
     "pscharge_value_check",
     "supcharg_value_check",
+    "referral",
   ]
 
   YEAR_2026_EXPORT_FIELDS = Set[
@@ -227,6 +231,9 @@ module Exports::LettingsLogExportConstants
     "scharge_value_check",
     "pscharge_value_check",
     "supcharg_value_check",
+    "referral_register",
+    "referral_noms",
+    "referral_org",
   ]
 
   (1..8).each do |index|

spec/fixtures/exports/general_needs_log_26_27.xml

@@ -123,7 +123,9 @@
     <totelder>0</totelder>
     <totadult>2</totadult>
     <nocharge/>
-    <referral>2</referral>
+    <referral_register>1</referral_register>
+    <referral_noms/>
+    <referral_org/>
     <brent>200.0</brent>
     <scharge>50.0</scharge>
     <pscharge>40.0</pscharge>

spec/services/csv/lettings_log_csv_service_spec.rb

@@ -336,8 +336,7 @@ RSpec.describe Csv::LettingsLogCsvService do
           context "when the current user is a support user" do
             let(:user) { create(:user, :support, organisation:, email: "s.port@jeemayle.com") }
 
-            # TODO: CLDC-4191 Reinstate this test when we update log export
+            it "exports the CSV with all values correct" do
-            xit "exports the CSV with all values correct" do
               expected_content = CSV.read("spec/fixtures/files/lettings_log_csv_export_labels_26.csv")
               values_to_delete = %w[id]
               values_to_delete.each do |attribute|
@@ -351,8 +350,7 @@ RSpec.describe Csv::LettingsLogCsvService do
           context "when the current user is not a support user" do
             let(:user) { create(:user, :data_provider, organisation:, email: "choreographer@owtluk.com") }
 
-            # TODO: CLDC-4191 Reinstate this test when we update log export
+            it "exports the CSV with all values correct" do
-            xit "exports the CSV with all values correct" do
               expected_content = CSV.read("spec/fixtures/files/lettings_log_csv_export_non_support_labels_26.csv")
               values_to_delete = %w[id]
               values_to_delete.each do |attribute|
@@ -370,8 +368,7 @@ RSpec.describe Csv::LettingsLogCsvService do
           context "when the current user is a support user" do
             let(:user) { create(:user, :support, organisation:, email: "s.port@jeemayle.com") }
 
-            # TODO: CLDC-4191 Reinstate this test when we update log export
+            it "exports the CSV with all values correct" do
-            xit "exports the CSV with all values correct" do
               expected_content = CSV.read("spec/fixtures/files/lettings_log_csv_export_codes_26.csv")
               values_to_delete = %w[id]
               values_to_delete.each do |attribute|
@@ -385,8 +382,7 @@ RSpec.describe Csv::LettingsLogCsvService do
           context "when the current user is not a support user" do
             let(:user) { create(:user, :data_provider, organisation:, email: "choreographer@owtluk.com") }
 
-            # TODO: CLDC-4191 Reinstate this test when we update log export
+            it "exports the CSV with all values correct" do
-            xit "exports the CSV with all values correct" do
               expected_content = CSV.read("spec/fixtures/files/lettings_log_csv_export_non_support_codes_26.csv")
               values_to_delete = %w[id]
               values_to_delete.each do |attribute|

spec/services/exports/lettings_log_export_service_spec.rb

@@ -536,8 +536,7 @@ RSpec.describe Exports::LettingsLogExportService do
         let(:expected_data_filename) { "core_2026_2027_apr_mar_f0001_inc0001_pt001.xml" }
         let(:xml_export_file) { File.open("spec/fixtures/exports/general_needs_log_26_27.xml", "r:UTF-8") }
 
-        # TODO: CLDC-4191 Reinstate this test when we update log export
+        it "generates an XML export file with the expected content within the ZIP file" do
-        xit "generates an XML export file with the expected content within the ZIP file" do
           expected_content = replace_entity_ids(lettings_log, xml_export_file.read)
           expect(storage_service).to receive(:write_file).with(expected_zip_filename, any_args) do |_, content|
             entry = Zip::File.open_buffer(content).find_entry(expected_data_filename)