Update Suggestor to use repository objects to query

Author: estolfo

app/models/suggester.rb

@@ -5,78 +5,42 @@ def initialize(params={})
  @term = params[:term]
  end
 
- def response
- @response ||= begin
- Elasticsearch::Persistence.client.search \
- index: Album.index_name,
- body: {
- suggest: {
- suggest_albums: {
- prefix: @term,
- completion: { field: 'suggest.album_title', size: 25 }
- },
- suggest_members: {
- prefix: @term,
- completion: { field: 'suggest.artist_members', size: 25 }
- },
- suggest_artists: {
- prefix: @term,
- completion: { field: 'suggest.artist_name', size: 25 }
- }
- },
- _source: ['suggest.*']
- }
+ def execute!(*repositories)
+ @responses ||= []
+ repositories.each do |repository|
+ @responses << begin
+ repository.client.search(index: repository.index_name,
+ body: repository.suggest_body(@term))
+ end
  end
  end
 
  def as_json(options={})
- return [] unless response['suggest']
  json = []
-
- if response['suggest']['suggest_artists']
- artists = response['suggest']['suggest_artists'].inject({}) do |matches, suggestion|
- suggestion['options'].each do |option|
- matches[option['_source']['suggest']['artist_name']['input'][1]] = option['text']
+ @responses.each do |response|
+ results = {}
+ next unless response['suggest']
+ ['artist_names', 'artist_members', 'album_title', 'album_tracklist'].each do |result_field|
+
+ if suggestion = response['suggest'][result_field]
+ results.merge!(suggestion.inject({}) do |matches, suggestion|
+ suggestion['options'].each do |option|
+ matches[option['text']] = option['_source']['artist_id'] || option['_id']
+ end
+ matches
+ end)
  end
- matches
  end
- end
-
- if response['suggest']['suggest_members']
- artists.merge!(response['suggest']['suggest_members'].inject({}) do |matches, suggestion|
- suggestion['options'].each do |option|
- matches[option['_source']['suggest']['artist_name']['input'][1]] = option['_source']['suggest']['artist_name']['input'][0]
- end
- matches
- end)
- end
 
- if !artists.empty?
- json << { label: 'Bands',
- value: artists.map do |id, name|
- { text: name,
- url: "artists/#{id}" }
- end }
+  if !results.empty?
+  json << { label: 'Matches',
+  value: results.map do |matching_text, artist_id|
+  { text: matching_text,
+  url: "artists/#{artist_id}" }
+  end }
 
- end
-
- if response['suggest']['suggest_albums']
- albums = response['suggest']['suggest_albums'].inject({}) do |matches, suggestion|
- suggestion['options'].each do |option|
- matches[option['_source']['suggest']['artist_name']['input'][1]] = option['text']
- end
- matches
  end
  end
-
- if !albums.empty?
- json << { label: 'Albums',
- value: albums.map do |id, name|
- { text: name,
- url: "artists/#{id}" }
- end }
-
- end
  json
  end
 end