Merge pull request #6341 from samvera/valk-embargos-leases-specs

Fix lease/embargo controller and specs in koppie
samvera · Oct 6, 2023 · bf3c903 · bf3c903
2 parents 94e3b4e + 43bb146
commit bf3c903
Show file tree

Hide file tree

Showing 6 changed files with 474 additions and 214 deletions.
diff --git a/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb b/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb
@@ -31,7 +31,13 @@ def update
       filter_docs_with_edit_access!
       copy_visibility = []
       copy_visibility = params[:embargoes].values.map { |h| h[:copy_visibility] } if params[:embargoes]
-      resources = Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: Hyrax.config.use_valkyrie?)
+
+      resources = if Hyrax.config.use_valkyrie?
+                    Hyrax.query_service.find_many_by_ids(ids: batch)
+                  else
+                    Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: false)
+                  end
+
       resources.each do |resource|
         if Hyrax.config.use_valkyrie?
           EmbargoManager.new(resource: resource).release!

diff --git a/app/controllers/concerns/hyrax/leases_controller_behavior.rb b/app/controllers/concerns/hyrax/leases_controller_behavior.rb
@@ -29,7 +29,13 @@ def update
       filter_docs_with_edit_access!
       copy_visibility = []
       copy_visibility = params[:leases].values.map { |h| h[:copy_visibility] } if params[:leases]
-      resources = Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: Hyrax.config.use_valkyrie?)
+
+      resources = if Hyrax.config.use_valkyrie?
+                    Hyrax.query_service.find_many_by_ids(ids: batch)
+                  else
+                    Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: false)
+                  end
+
       resources.each do |resource|
         if Hyrax.config.use_valkyrie?
           LeaseManager.new(resource: resource).release!