Remove deprecated Hyrax::SolrQueryBuilderService

app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb

@@ -28,7 +28,7 @@ def with_pagination(solr_parameters)
       def show_only_other_collections_of_the_same_collection_type(solr_parameters)
         solr_parameters[:fq] ||= []
         solr_parameters[:fq] += [
-          Hyrax::SolrQueryBuilderService.construct_query(Hyrax.config.collection_type_index_field => @collection.collection_type_gid),
+          Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: { Hyrax.config.collection_type_index_field => @collection.collection_type_gid }).build,
           "-{!graph from=id to=member_of_collection_ids_ssim#{' maxDepth=1' if @nest_direction == :as_parent}}id:#{@collection.id}",
           "-{!graph to=id from=member_of_collection_ids_ssim#{' maxDepth=1' if @nest_direction == :as_child}}id:#{@collection.id}"
         ]

app/search_builders/hyrax/my/find_works_search_builder.rb

@@ -15,24 +15,25 @@ def initialize(context)
 
   def filter_on_title(solr_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += [Hyrax::SolrQueryBuilderService.construct_query(title_tesim: @q)]
+    solr_parameters[:fq] += [Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: { title_tesim: @q }).build]
   end
 
   def show_only_other_works(solr_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += ["-#{Hyrax::SolrQueryBuilderService.construct_query_for_ids([@id])}"]
+    solr_parameters[:fq] += ["-#{Hyrax::SolrQueryService.new.with_ids(ids: [@id]).build}"]
   end
 
   def show_only_works_not_child(solr_parameters)
     ids = Hyrax::SolrService.query("{!field f=id}#{@id}", fl: "member_ids_ssim", rows: 10_000).flat_map { |x| x.fetch("member_ids_ssim", []) }
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += ["-#{Hyrax::SolrQueryBuilderService.construct_query_for_ids([ids])}"]
+    return solr_parameters[:fq] += ['-id:NEVER_USE_THIS_ID'] if ids.empty?
+    solr_parameters[:fq] += ["-#{Hyrax::SolrQueryService.new.with_ids(ids: [ids]).build}"]
   end
 
   def show_only_works_not_parent(solr_parameters)
     solr_parameters[:fq] ||= []
     solr_parameters[:fq]  += [
-      "-" + Hyrax::SolrQueryBuilderService.construct_query(member_ids_ssim: @id)
+      "-" + Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: { member_ids_ssim: @id }).build
     ]
   end
 

app/search_builders/hyrax/my/highlights_search_builder.rb

@@ -8,6 +8,7 @@ class Hyrax::My::HighlightsSearchBuilder < Hyrax::SearchBuilder
   def show_only_highlighted_works(solr_parameters)
     ids = scope.current_user.trophies.pluck(:work_id)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += [Hyrax::SolrQueryBuilderService.construct_query_for_ids([ids])]
+    return solr_parameters[:fq] += ['-id:NEVER_USE_THIS_ID'] if ids.empty?
+    solr_parameters[:fq] += [Hyrax::SolrQueryService.new.with_ids(ids: [ids]).build]
   end
 end

app/search_builders/hyrax/parent_collection_search_builder.rb

@@ -7,7 +7,7 @@ class ParentCollectionSearchBuilder < Hyrax::CollectionSearchBuilder
     # include filters into the query to only include the collections containing this item
     def include_item_ids(solr_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] += [Hyrax::SolrQueryBuilderService.construct_query_for_ids([item.member_of_collection_ids])]
+      solr_parameters[:fq] += [Hyrax::SolrQueryService.new.with_ids(ids: [item.member_of_collection_ids]).build]
     end
   end
 end

spec/authorities/qa/authorities/find_works_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-RSpec.describe Qa::Authorities::FindWorks do
+RSpec.describe Qa::Authorities::FindWorks, clean_repo: true do
   let(:controller) { Qa::TermsController.new }
   let(:user1) { create(:user) }
   let(:user2) { create(:user) }

spec/search_builders/hyrax/my/find_works_search_builder_spec.rb

@@ -30,7 +30,7 @@
 
     it "is successful" do
       subject
-      expect(solr_params[:fq]).to eq ["-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([work.id])]
+      expect(solr_params[:fq]).to eq ["-" + Hyrax::SolrQueryService.new.with_ids(ids: [work.id]).build]
     end
   end
 
@@ -40,7 +40,7 @@
     it "is successful" do
       subject
       ids = Hyrax::SolrService.query("{!field f=id}#{work.id}", fl: "member_ids_ssim").flat_map { |x| x.fetch("member_ids_ssim", []) }
-      expect(solr_params[:fq]).to eq ["-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([ids])]
+      expect(solr_params[:fq]).to eq ["-" + Hyrax::SolrQueryService.new.with_ids(ids: [ids]).build]
     end
   end