use find_by_source_identifier instead of find_by_bulkrax_identifier (#…

…907)

* i903 - move bulkrax identifier custom queries into bulkrax

move bulkrax identifier custom queries into bulkrax

Issue:
- scientist-softserv/hykuup_knapsack#136

* make find_by_source_identifier dynamic

Import a csv with child works. The forming of relationships is not working. Part of the problem is the find_by_bulkrax_identifier call.

From GBH, this used to be find_by_bulkrax_identifier which not all clients will configure as their source identifier. Instead we need to ask for the source identifier and use that for the sql query. This commit goes along with a PR from Hyku which currently has the find_by_source_identifier.rb files defined.

Issue:
- scientist-softserv/hykuup_knapsack#128

Co-Authored-By: Kirk Wang <k3wang@gmail.com>

* remove files: they live in Hyku for now

Co-Authored-By: Kirk Wang <k3wang@gmail.com>

* 🧹 Place custom queries back in Bulkrax

* 🧹 remove misleading comment

Co-Authored-By: Kirk Wang <k3wang@gmail.com>

* 🧹 Entry is a required argument when initializing ObjectFactory

Fix for broken specs

Co-Authored-By: Kirk Wang <k3wang@gmail.com>

* revert changes to pass Entry arg

The object factory already has work_identifier: parser.work_identifier. we don't need the entry argument after all.

ref:
- https://github.com/samvera/bulkrax/blob/main/app/models/concerns/bulkrax/import_behavior.rb#L181

Co-Authored-By: Kirk Wang <k3wang@gmail.com>

---------

Co-authored-by: Kirk Wang <k3wang@gmail.com>
Co-authored-by: Kirk Wang <kirk.wang@scientist.com>

app/factories/bulkrax/valkyrie_object_factory.rb

@@ -30,7 +30,10 @@ def search_by_identifier
       # Query can return partial matches (something6 matches both something6 and something68)
       # so we need to weed out any that are not the correct full match. But other items might be
       # in the multivalued field, so we have to go through them one at a time.
-      match = Hyrax.query_service.custom_queries.find_by_bulkrax_identifier(identifier: source_identifier_value)
+      match = Hyrax.query_service.custom_queries.find_by_source_identifier(
+        work_identifier: work_identifier,
+        source_identifier_value: source_identifier_value
+      )
 
       return match if match
     rescue => err

app/parsers/bulkrax/application_parser.rb

@@ -68,15 +68,15 @@ def records(_opts = {})
     # @return [Symbol] the name of the identifying property in the source system from which we're
     # importing (e.g. is *not* this application that mounts *this* Bulkrax engine).
     #
-    # @see #work_identifier
+    # @see #source_identifier
     # @see https://github.com/samvera-labs/bulkrax/wiki/CSV-Importer#source-identifier Bulkrax Wiki regarding source identifier
     def source_identifier
       @source_identifier ||= get_field_mapping_hash_for('source_identifier')&.values&.first&.[]('from')&.first&.to_sym || :source_identifier
     end
 
     # @return [Symbol] the name of the identifying property for the system which we're importing
     #         into (e.g. the application that mounts *this* Bulkrax engine)
-    # @see #source_identifier
+    # @see #work_identifier
     def work_identifier
       @work_identifier ||= get_field_mapping_hash_for('source_identifier')&.keys&.first&.to_sym || :source
     end

app/services/hyrax/custom_queries/find_by_source_identifier.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module CustomQueries
+    ##
+    # @see https://github.com/samvera/valkyrie/wiki/Queries#custom-queries
+    class FindBySourceIdentifier
+      def self.queries
+        [:find_by_source_identifier]
+      end
+
+      def initialize(query_service:)
+        @query_service = query_service
+      end
+
+      attr_reader :query_service
+      delegate :resource_factory, to: :query_service
+      delegate :orm_class, to: :resource_factory
+
+      ##
+      # @param identifier String
+      def find_by_source_identifier(work_identifier:, source_identifier_value:)
+        sql_query = sql_by_source_identifier
+        query_service.run_query(sql_query, work_identifier, source_identifier_value).first
+      end
+
+      def sql_by_source_identifier
+        <<-SQL
+          SELECT * FROM orm_resources
+          WHERE metadata -> ? ->> 0 = ?;
+        SQL
+      end
+    end
+  end
+end

app/services/wings/custom_queries/find_by_source_identifier.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Wings
+  module CustomQueries
+    class FindBySourceIdentifier
+      # Custom query override specific to Wings
+
+      def self.queries
+        [:find_by_source_identifier]
+      end
+
+      attr_reader :query_service
+      delegate :resource_factory, to: :query_service
+
+      def initialize(query_service:)
+        @query_service = query_service
+      end
+
+      def find_by_source_identifier(identifier:, use_valkyrie: true)
+        af_object = ActiveFedora::Base.where("bulkrax_identifier_sim:#{identifier}").first
+
+        return af_object unless use_valkyrie
+
+        resource_factory.to_resource(object: af_object)
+      end
+    end
+  end
+end