Merge pull request #129 from designmynight/4.2.0

Sync 4.2.0 with 4.2.4

src/Connection.php

@@ -3,6 +3,8 @@
 namespace DesignMyNight\Elasticsearch;
 
 use Closure;
+use DesignMyNight\Elasticsearch\Exceptions\BulkInsertQueryException;
+use DesignMyNight\Elasticsearch\Exceptions\QueryException;
 use Elasticsearch\ClientBuilder;
 use Illuminate\Database\Connection as BaseConnection;
 use Illuminate\Database\Events\QueryExecuted;
@@ -282,17 +284,24 @@ public function scroll(string $scrollId, string $scrollTimeout = '30s', int $lim
     /**
      * Run an insert statement against the database.
      *
-     * @param  array  $params
-     * @param  array  $bindings
+     * @param array $params
+     * @param array $bindings
      * @return bool
+     * @throws BulkInsertQueryException
      */
     public function insert($params, $bindings = [])
     {
-        return $this->run(
+        $result = $this->run(
             $this->addClientParams($params),
             $bindings,
             Closure::fromCallable([$this->connection, 'bulk'])
         );
+
+        if (!empty($result['errors'])) {
+            throw new BulkInsertQueryException($result);
+        }
+
+        return true;
     }
 
     /**
@@ -378,7 +387,7 @@ public function prepareBindings(array $bindings)
      * @param  \Closure  $callback
      * @return mixed
      *
-     * @throws \DesignMyNight\Elasticsearch\QueryException
+     * @throws \DesignMyNight\Elasticsearch\Exceptions\QueryException
      */
     protected function runQueryCallback($query, $bindings, Closure $callback)
     {

src/Exceptions/BulkInsertQueryException.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace DesignMyNight\Elasticsearch\Exceptions;
+
+use Exception;
+
+class BulkInsertQueryException extends Exception
+{
+    private $errorLimit = 10;
+
+    /**
+     * BulkInsertQueryException constructor.
+     *
+     * @param array $queryResult
+     */
+    public function __construct(array $queryResult)
+    {
+        parent::__construct($this->formatMessage($queryResult), 400);
+    }
+
+    /**
+     * Format the error message.
+     *
+     * Takes the first {$this->errorLimit} bulk issues and concatenates them to a single string message
+     *
+     * @param  array  $result
+     * @return string
+     */
+    private function formatMessage(array $result): string
+    {
+        $message = [];
+
+        $items = array_filter($result['items'] ?? [], function(array $item): bool {
+            $itemAction = reset($item);
+
+            return $itemAction && !empty($itemAction['error']);
+        });
+
+        $items = array_values($items);
+
+        $totalErrors = count($items);
+
+        // reduce to max limit
+        $items = array_splice($items, 0, $this->errorLimit);
+
+        $message[] = 'Bulk Insert Errors (' . 'Showing ' . count($items) . ' of ' . $totalErrors . '):';
+
+        foreach ($items as $item) {
+            $itemAction = reset($item);
+
+            $itemError = array_merge([
+                '_id'  => $itemAction['_id'],
+                'reason' => $itemAction['error']['reason'],
+            ], $itemAction['error']['caused_by'] ?? []);
+
+            $message[] = implode(': ', $itemError);
+        }
+
+        return implode(PHP_EOL, $message);
+    }
+}

src/QueryException.php → src/Exceptions/QueryException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignMyNight\Elasticsearch;
+namespace DesignMyNight\Elasticsearch\Exceptions;
 
 use Illuminate\Database\QueryException as BaseQueryException;