Move to permanent branch for Laravel 9 and ES 7.x

Author: pdphilip

src/DSL/Bridge.php

@@ -98,8 +98,6 @@ public function processFind($wheres, $options, $columns): Results
     public function processSearch($searchParams, $searchOptions, $wheres, $opts, $fields, $cols)
     {
         $params = $this->buildSearchParams($this->index, $searchParams, $searchOptions, $wheres, $opts, $fields, $cols);
-
-//        dd($params);
 
         return $this->_returnSearch($params, __FUNCTION__);
 
@@ -116,7 +114,8 @@ protected function _returnSearch($params, $source)
             return $this->_sanitizeSearchResponse($process, $params, $this->_queryTag($source));
         } catch (Exception $e) {
 
-            return $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag($source));
+            $error = $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
+            throw new Exception($error->errorMessage);
         }
     }
 
@@ -127,10 +126,9 @@ public function processDistinct($column, $wheres): Results
         if (is_array($column)) {
             $col = $column[0];
         }
-        
-        
+        $params = $this->buildParams($this->index, $wheres);
         try {
-            $params = $this->buildParams($this->index, $wheres);
+            
             $params['body']['aggs']['distinct_'.$col]['terms'] = [
                 'field' => $col,
                 'size'  => $this->maxSize,
@@ -146,7 +144,8 @@ public function processDistinct($column, $wheres): Results
             return $this->_return($data, $process, $params, $this->_queryTag(__FUNCTION__));
         } catch (Exception $e) {
 
-            return $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
+            $error = $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
+            throw new Exception($error->errorMessage);
         }
 
 
@@ -195,7 +194,9 @@ public function processSave($data, $refresh): Results
 
             return $this->_return($savedData, $response, $params, $this->_queryTag(__FUNCTION__));
         } catch (Exception $e) {
-            return $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
+            $error = $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
+            throw new Exception($error->errorMessage);
+            
         }
 
 
@@ -312,7 +313,8 @@ public function processDeleteAll($wheres, $options = []): Results
 
             return $this->_return($response['deleteCount'], $response, $params, $this->_queryTag(__FUNCTION__));
         } catch (Exception $e) {
-            return $this->_returnError($e->getMessage(), $e->getCode(), $params, $this->_queryTag(__FUNCTION__));
+            $error = $this->_returnError($e->getMessage(), $e->getCode(), [], $this->_queryTag(__FUNCTION__));
+            throw new Exception($error->errorMessage);
         }
 
     }

src/DSL/QueryBuilder.php

@@ -81,6 +81,13 @@ public function buildSearchParams($index, $searchQuery, $searchOptions, $wheres
     }
 
     /**
+     * @param $index
+     * @param $wheres
+     * @param $options
+     * @param $columns
+     * @param $_id
+     *
+     * @return array
      * @throws Exception
      */
     public function buildParams($index, $wheres, $options = [], $columns = [], $_id = null): array