Merge pull request #16 from apolloio/shivam/passing-es-4xx-errors-to-…

…response

[PLAT-695] Passing error down to Chewy Response to be accessible

lib/chewy/search/request.rb

@@ -46,7 +46,7 @@ class Request
 
       delegate :hits, :wrappers, :objects, :records, :documents,
         :object_hash, :record_hash, :document_hash,
-        :total, :max_score, :took, :timed_out?, to: :response
+        :total, :max_score, :took, :timed_out?, :errors, to: :response
       delegate :each, :size, :to_a, :[], to: :wrappers
       alias_method :to_ary, :to_a
       alias_method :total_count, :total
@@ -990,8 +990,9 @@ def perform(additional = {})
                 request_body.merge!({opaque_id: @x_opaque_id})
               end
               Chewy.client(_indices.first.hosts_name).search(request_body)
-            rescue Elasticsearch::Transport::Transport::Errors::NotFound
-              {}
+            rescue Elasticsearch::Transport::Transport::Errors::NotFound => error
+              # passing error as a separate param down to the response, hence won't affect any other logic
+              { "not_found_error" => error }
             end
           end
       end

lib/chewy/search/response.rb

@@ -19,6 +19,12 @@ def hits
         @hits ||= hits_root['hits'] || []
       end
 
+      # Raw response body obtained from ES.
+      # @return [Hash, nil]
+      def body
+        @body
+      end
+
       # Response `total` field. Returns `0` if something went wrong.
       #
       # @return [Integer]
@@ -33,6 +39,21 @@ def max_score
         @max_score ||= hits_root['max_score']
       end
 
+      # Response `errors` field. Returns `nil` if there is no error.
+      # @return [Hash, nil]
+      def errors
+        return nil if @body.blank?
+
+        not_found_error = @body['not_found_error']
+        # there's another case when failures could be present in some shards, in that case es returns them
+        # in @body[_shards][failures] array
+        shard_failures = @body['_shards']['failures'] if @body['_shards']
+        {
+          not_found_error: not_found_error,
+          shard_failures: shard_failures
+        }.compact.presence
+      end
+
       # Duration of the request handling in ms according to ES.
       #
       # @return [Integer]