From eab806ce4623b0011bbd20f937e1d348bd4b44d5 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 25 Sep 2024 08:48:40 +0100 Subject: [PATCH] Make recent logs export depend on the collection --- app/services/exports/lettings_log_export_service.rb | 2 +- spec/services/exports/lettings_log_export_service_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/exports/lettings_log_export_service.rb b/app/services/exports/lettings_log_export_service.rb index e25ad5645..b21099a06 100644 --- a/app/services/exports/lettings_log_export_service.rb +++ b/app/services/exports/lettings_log_export_service.rb @@ -5,8 +5,8 @@ module Exports def export_xml_lettings_logs(full_update: false, collection_year: nil) archives_for_manifest = {} - recent_export = Export.order("started_at").last collection_years_to_export(collection_year).each do |collection| + recent_export = Export.where(collection:).order("started_at").last base_number = Export.where(empty_export: false, collection:).maximum(:base_number) || 1 export = build_export_run(collection, base_number, full_update) archives = write_export_archive(export, collection, recent_export, full_update) diff --git a/spec/services/exports/lettings_log_export_service_spec.rb b/spec/services/exports/lettings_log_export_service_spec.rb index fd4df5538..6f7d88c91 100644 --- a/spec/services/exports/lettings_log_export_service_spec.rb +++ b/spec/services/exports/lettings_log_export_service_spec.rb @@ -328,7 +328,7 @@ RSpec.describe Exports::LettingsLogExportService do context "when this is a second export (partial)" do before do start_time = Time.zone.local(2022, 6, 1) - Export.new(started_at: start_time).save! + Export.new(started_at: start_time, collection: 2021).save! end it "does not add any entry for the master manifest (no lettings logs)" do