diff --git a/app/services/exports/user_export_service.rb b/app/services/exports/user_export_service.rb index fe228158c..58464a680 100644 --- a/app/services/exports/user_export_service.rb +++ b/app/services/exports/user_export_service.rb @@ -24,7 +24,7 @@ module Exports base_number_str = "f#{base_number.to_s.rjust(4, '0')}" increment_str = "inc#{increment.to_s.rjust(4, '0')}" - "core_#{collection}_#{base_number_str}_#{increment_str}".downcase + "#{collection}_2024_2025_apr_mar_#{base_number_str}_#{increment_str}".downcase end def retrieve_resources(recent_export, full_update, _collection) diff --git a/spec/services/exports/user_export_service_spec.rb b/spec/services/exports/user_export_service_spec.rb index c488623da..e7bcea08b 100644 --- a/spec/services/exports/user_export_service_spec.rb +++ b/spec/services/exports/user_export_service_spec.rb @@ -8,8 +8,8 @@ RSpec.describe Exports::UserExportService do let(:xml_export_file) { File.open("spec/fixtures/exports/user.xml", "r:UTF-8") } let(:local_manifest_file) { File.open("spec/fixtures/exports/manifest.xml", "r:UTF-8") } - let(:expected_zip_filename) { "core_users_f0001_inc0001.zip" } - let(:expected_data_filename) { "core_users_f0001_inc0001_pt001.xml" } + let(:expected_zip_filename) { "users_2024_2025_apr_mar_f0001_inc0001.zip" } + let(:expected_data_filename) { "users_2024_2025_apr_mar_f0001_inc0001_pt001.xml" } let(:expected_manifest_filename) { "manifest.xml" } let(:start_time) { Time.zone.local(2022, 5, 1) } let(:organisation) { create(:organisation, with_dsa: false) } @@ -177,11 +177,11 @@ RSpec.describe Exports::UserExportService do end it "returns a correct archives list for manifest file" do - expect(export_service.export_xml_users(full_update: true)).to eq({ "core_users_f0002_inc0001" => start_time }) + expect(export_service.export_xml_users(full_update: true)).to eq({ "users_2024_2025_apr_mar_f0002_inc0001" => start_time }) end it "generates a ZIP export file with the expected filename" do - expect(storage_service).to receive(:write_file).with("core_users_f0002_inc0001.zip", any_args) + expect(storage_service).to receive(:write_file).with("users_2024_2025_apr_mar_f0002_inc0001.zip", any_args) export_service.export_xml_users(full_update: true) end end