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