Skip to content

Commit 699e01b

Browse files
committed
Use the single value from SearchService#fetch
1 parent 4cb9a58 commit 699e01b

6 files changed

Lines changed: 5 additions & 6 deletions

File tree

app/controllers/bulk_jobs_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def self.local_prefixes
5959
private
6060

6161
def find(id)
62-
search_service.fetch(id).last
62+
search_service.fetch(id)
6363
end
6464

6565
# Given a DRUID, loads any metadata bulk upload information associated with that DRUID into a hash.

app/controllers/catalog_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def lazy_tag_facet
215215

216216
def show
217217
params[:id] = 'druid:' + params[:id] unless params[:id].include? 'druid'
218-
_deprecated_response, @document = search_service.fetch(params[:id])
218+
@document = search_service.fetch(params[:id])
219219

220220
@cocina = maybe_load_cocina(params[:id])
221221
flash[:alert] = 'Warning: this object cannot currently be represented in the Cocina model.' if @cocina.instance_of?(NilModel)

app/controllers/manage_releases_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class ManageReleasesController < ApplicationController
77
def show
88
cocina = Dor::Services::Client.object(params[:item_id]).find
99
authorize! :manage_item, cocina
10-
_, @document = search_service.fetch params[:item_id]
10+
@document = search_service.fetch params[:item_id]
1111
@bulk_action = BulkAction.new
1212

1313
respond_to do |format|

app/forms/apo_form.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ def default_collection_objects
6161
@default_collection_objects ||=
6262
search_service
6363
.fetch(default_collections, rows: default_collections.size)
64-
.last
6564
.sort_by do |solr_doc|
6665
solr_doc.label.downcase
6766
end

spec/forms/apo_form_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
instance_double(SolrDocument, label: label)
260260
end
261261
end
262-
let(:search_service_result) { [nil, default_collection_objects] }
262+
let(:search_service_result) { default_collection_objects }
263263
let(:search_service) { instance_double(Blacklight::SearchService) }
264264

265265
before do

spec/requests/set_rights_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@
450450
version: version_client)
451451
end
452452
let(:events_client) { instance_double(Dor::Services::Client::Events, list: []) }
453-
let(:service) { instance_double(Blacklight::SearchService, fetch: [nil, doc]) }
453+
let(:service) { instance_double(Blacklight::SearchService, fetch: doc) }
454454
let(:doc) { SolrDocument.new id: pid }
455455
let(:error) do
456456
'{"errors":[{"status":"422","title":"Unexpected Cocina::Mapper.build error",' \

0 commit comments

Comments
 (0)