Filter exports by the collection

2 years ago · 66c1b874b1
2 changed files with 4 additions and 4 deletions
--- a/app/services/exports/organisation_export_service.rb
+++ b/app/services/exports/organisation_export_service.rb
@ -4,9 +4,9 @@ module Exports
    include CollectionTimeHelper

    def export_xml_organisations(full_update: false)
-      recent_export = Export.order("started_at").last
-
      collection = "organisations"
+      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_for_manifest = write_export_archive(export, collection, recent_export, full_update)
--- a/app/services/exports/user_export_service.rb
+++ b/app/services/exports/user_export_service.rb
@ -4,9 +4,9 @@ module Exports
    include CollectionTimeHelper

    def export_xml_users(full_update: false)
-      recent_export = Export.order("started_at").last
-
      collection = "users"
+      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_for_manifest = write_export_archive(export, collection, recent_export, full_update)