From a27e04c01313109732cd7946cc516e802a9d6bf2 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Mon, 14 Oct 2024 18:56:15 -0400
Subject: [PATCH] Rearrange code to allow fallback to alternative_id

---
 lib/hyrax/valkyrie_can_can_adapter.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/hyrax/valkyrie_can_can_adapter.rb b/lib/hyrax/valkyrie_can_can_adapter.rb
index fbbf26d79c..e0d35f6569 100644
--- a/lib/hyrax/valkyrie_can_can_adapter.rb
+++ b/lib/hyrax/valkyrie_can_can_adapter.rb
@@ -19,10 +19,15 @@ def self.for_class?(member_class)
     #
     # @raise Hyrax::ObjectNotFoundError
     def self.find(_model_class, id)
-      Hyrax.query_service.find_by(id: id) ||
-        Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: id)
+      self.find_by(id: id) ||
+      Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: id)
     rescue Valkyrie::Persistence::ObjectNotFoundError => err
       raise Hyrax::ObjectNotFoundError, err.message
     end
+
+    def self.find_by(id:)
+      Hyrax.query_service.find_by(id: id)
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+    end
   end
 end