From 8fad97b10474b465d674cb55b75e34c6e7ac4d74 Mon Sep 17 00:00:00 2001
From: Samuel Sciolla <ssciolla@umich.edu>
Date: Tue, 6 Aug 2024 13:43:49 -0400
Subject: [PATCH] Fix DispatcherBase; modify argument order and defaults for
 APTrustDispatcher, BagCourier, and uses

---
 lib/bag_courier.rb |  4 ++--
 lib/dispatcher.rb  | 12 +++++-------
 run_dark_blue.rb   |  6 +++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/bag_courier.rb b/lib/bag_courier.rb
index 4506a16..a7af62a 100644
--- a/lib/bag_courier.rb
+++ b/lib/bag_courier.rb
@@ -34,13 +34,13 @@ def initialize(
       tags:,
       data_transfer:,
       validator:,
+      detect_hidden:,
       target_client:,
       status_event_repo:,
       working_dir:,
       export_dir:,
       dry_run:,
-      remove_export:,
-      detect_hidden:
+      remove_export:
     )
       @bag_id = bag_id
       @bag_info = bag_info
diff --git a/lib/dispatcher.rb b/lib/dispatcher.rb
index 4057206..9698bd8 100644
--- a/lib/dispatcher.rb
+++ b/lib/dispatcher.rb
@@ -9,9 +9,7 @@ class DispatcherBase
     def dispatch(
       object_metadata:,
       data_transfer:,
-      context: nil,
-      validator: nil,
-      extra_bag_info_data: nil
+      validator: nil
     )
       raise NotImplementedError
     end
@@ -26,9 +24,9 @@ def initialize(
       target_client:,
       context: nil,
       extra_bag_info_data: nil,
+      detect_hidden: true,
       status_event_repo: StatusEventRepository::StatusEventInMemoryRepository.new,
-      bag_repo: BagRepository::BagInMemoryRepository.new,
-      detect_hidden:
+      bag_repo: BagRepository::BagInMemoryRepository.new
     )
       @settings = settings
       @repository = repository
@@ -76,13 +74,13 @@ def dispatch(
         tags: tags,
         data_transfer: data_transfer,
         validator: validator,
+        detect_hidden: @detect_hidden,
         target_client: @target_client,
         status_event_repo: @status_event_repo,
         working_dir: @settings.working_dir,
         export_dir: @settings.export_dir,
         dry_run: @settings.dry_run,
-        remove_export: @settings.remove_export,
-        detect_hidden: @detect_hidden
+        remove_export: @settings.remove_export
       )
     end
   end
diff --git a/run_dark_blue.rb b/run_dark_blue.rb
index 207be27..339c0ba 100644
--- a/run_dark_blue.rb
+++ b/run_dark_blue.rb
@@ -48,11 +48,11 @@ def create_dispatcher(context:, extra_bag_info_data:)
         type: @aptrust_config.remote.type,
         settings: @aptrust_config.remote.settings
       ),
-      status_event_repo: @status_event_repo,
-      bag_repo: @bag_repo,
       context: context,
       extra_bag_info_data: extra_bag_info_data,
-      detect_hidden: @detect_hidden
+      detect_hidden: @detect_hidden,
+      status_event_repo: @status_event_repo,
+      bag_repo: @bag_repo
     )
   end