diff --git a/app/indexers/collection_indexer.rb b/app/indexers/collection_indexer.rb index 11e14de1ae..54ed5c7a24 100644 --- 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 index ea97bc9bc4..2b7a6ab9ce 100644 --- 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 deleted file mode 100644 index 7027da7896..0000000000 --- a/app/services/hyrax/custom_queries/find_by_bulkrax_identifier.rb +++ /dev/null @@ -1,33 +0,0 @@ -# frozen_string_literal: true -module Hyrax - module CustomQueries - ## - # @see https://github.com/samvera/valkyrie/wiki/Queries#custom-queries - class FindByBulkraxIdentifier - def self.queries - [:find_by_bulkrax_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_bulkrax_identifier(identifier:) - query_service.run_query(sql_by_bulkrax_identifier, identifier).first - end - - def sql_by_bulkrax_identifier - <<-SQL - SELECT * FROM orm_resources - WHERE metadata -> 'bulkrax_identifier' ->> 0 = ?; - SQL - end - end - end -end diff --git a/app/services/wings/custom_queries/find_by_bulkrax_identifier.rb b/app/services/wings/custom_queries/find_by_bulkrax_identifier.rb deleted file mode 100644 index aa86a35a97..0000000000 --- a/app/services/wings/custom_queries/find_by_bulkrax_identifier.rb +++ /dev/null @@ -1,28 +0,0 @@ -# frozen_string_literal: true -module Wings - module CustomQueries - # Custom query override specific to Wings - # Use: - # Hyrax.custom_queries.find_by_bulkrax_identifier(identifier: identifier, models: [ModelClass]) - class FindByBulkraxIdentifier - def self.queries - [:find_by_bulkrax_identifier] - end - - attr_reader :query_service - delegate :resource_factory, to: :query_service - - def initialize(query_service:) - @query_service = query_service - end - - def find_by_bulkrax_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 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 deleted file mode 100644 index 8f6ef12956..0000000000 --- a/spec/services/hyrax/custom_queries/find_by_bulkrax_identifier_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe Hyrax::CustomQueries::FindByBulkraxIdentifier do - describe '.queries' do - subject { described_class.queries } - let(:query_name) { :find_by_bulkrax_identifier } - - it { is_expected.to include(query_name) } - - it 'is registered with the Hyrax.query_service' do - expect(Hyrax.query_service.custom_queries).to respond_to(query_name) - end - - context ':find_by_bulkrax_identifier query' do - it 'is valid SQL' do - expect do - Hyrax.query_service.custom_queries.find_by_bulkrax_identifier(identifier: "testing-bulkrax-1-2-3") - end.not_to raise_error - end - end - end -end