Merge pull request #2158 from samvera/i903-move-find-by-bulkrax-ident…

…ifier-to-bulkrax I903 remove bulkrax_identifier dependency
samvera · Jan 30, 2024 · 9be2b81 · 9be2b81
2 parents 89d0c59 + 887fbf2
commit 9be2b81
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 95 deletions.
diff --git a/app/indexers/collection_indexer.rb b/app/indexers/collection_indexer.rb
@@ -8,7 +8,6 @@ class CollectionIndexer < Hyrax::CollectionIndexer
   # Uncomment this block if you want to add custom indexing behavior:
   def generate_solr_document
     super.tap do |solr_doc|
-      solr_doc['bulkrax_identifier_tesim'] = object.bulkrax_identifier if object.respond_to?(:bulkrax_identifier)
       solr_doc["account_cname_tesim"] = Site.instance&.account&.cname
       solr_doc['account_institution_name_ssim'] = Site.instance.institution_label
     end

diff --git a/app/indexers/concerns/hyku_indexing.rb b/app/indexers/concerns/hyku_indexing.rb
@@ -13,7 +13,6 @@ module HykuIndexing
         object = resource if object.kind_of?(Valkyrie::Resource)
 
         solr_doc['account_cname_tesim'] = Site.instance&.account&.cname
-        solr_doc['bulkrax_identifier_tesim'] = object.bulkrax_identifier if object.respond_to?(:bulkrax_identifier)
         solr_doc['account_institution_name_ssim'] = Site.instance.institution_label
         # TODO: Reinstate once valkyrie fileset work is complete - https://github.com/scientist-softserv/hykuup_knapsack/issues/34
         solr_doc['all_text_tsimv'] = full_text(object.file_sets.first&.id) if object.kind_of?(ActiveFedora::Base)

diff --git a/app/services/hyrax/custom_queries/find_by_bulkrax_identifier.rb b/app/services/hyrax/custom_queries/find_by_bulkrax_identifier.rb
diff --git a/app/services/wings/custom_queries/find_by_bulkrax_identifier.rb b/app/services/wings/custom_queries/find_by_bulkrax_identifier.rb
diff --git a/config/initializers/wings.rb b/config/initializers/wings.rb
@@ -45,18 +45,11 @@
     Hyrax::CustomQueries::FindManyByAlternateIds,
     Hyrax::CustomQueries::FindModelsByAccess,
     Hyrax::CustomQueries::FindCountBy,
-    Hyrax::CustomQueries::FindByDateRange,
-    Hyrax::CustomQueries::FindByBulkraxIdentifier
+    Hyrax::CustomQueries::FindByDateRange
   ].each do |handler|
     Hyrax.query_service.services[0].custom_queries.register_query_handler(handler)
   end
 
-  [
-    Wings::CustomQueries::FindByBulkraxIdentifier
-  ].each do |handler|
-    Hyrax.query_service.services[1].custom_queries.register_query_handler(handler)
-  end
-
   Wings::ModelRegistry.register(GenericWorkResource, GenericWork)
   Wings::ModelRegistry.register(ImageResource, Image)
 end

diff --git a/spec/services/hyrax/custom_queries/find_by_bulkrax_identifier_spec.rb b/spec/services/hyrax/custom_queries/find_by_bulkrax_identifier_spec.rb