update

Author: phcent

README.md

@@ -129,6 +129,16 @@ php webman search:drop:index  //删除索引
     $result = $search->where('type','B')->limit(20)->highlight(['title'])->q('我')->paginate(\request()->input('page',1));
 
  ```
+- elasticSearch新升级whereRaw特定写法 支持query下的全部写法
+```php
+    $search->whereRaw(['bool'=>['filter'=>[['term'=>['color'=>'red']],['term'=>['color'=>'blue']]]]]);
+    $search->whereRaw(['bool'=>['must'=>[['term'=>['color'=>'red']],['term'=>['color'=>'blue']]]]]);
+    // 如需使用aggs
+    $result = $search->aggs(['avg_price'=>['avg'=>['field'=>'price']]])->q('华为')->get();
+     // 获取原文返回内容
+    $result->raw
+```
+
 - 获取建议词（如搜索s则会出现与s相关的汉字数组 ,meilisearch不支持，es请使用原sdk方法查询）
 ```php
 

src/Adapter/ElasticSearch.php

@@ -38,6 +38,7 @@ class ElasticSearch
     protected $sort = [];
     protected $ignores = [];
     protected $attributesToHighlight = [];
+    protected $attributesAggregations = [];
     protected $searchable = [];
     protected $facetsDistribution = [];
     protected $query = '';
@@ -316,6 +317,10 @@ public function highlight(array $attributes = [])
         $this->attributesToHighlight = $attributes;
         return $this;
     }
+    public function aggs(array $attributes = []){
+        $this->attributesAggregations = $attributes;
+        return $this;
+    }
 
     public function facets(array $attributes = ['*'])
     {
@@ -416,10 +421,11 @@ protected function getFirst($result = [])
             $model = new Collection($result["_source"]);
             // match earlier version
             $model->_index = $result["_index"];
-            $model->_type = $result["_type"];
+            $model->_type = $result["_type"] ?? '';
             $model->_id = $result["_id"];
             $model->_score = $result["_score"] ?? [];
             $model->_highlight = isset($result["highlight"]) ? $result["highlight"] : [];
+            $model->raw = $result;
             $new = $model;
         } else {
             $new = NULL;
@@ -446,6 +452,7 @@ protected function getAll($result = []){
             }
             $collect = new Collection([]);
             $collect->items = $new;
+            $collect->raw = $result;
             $total = $result["hits"]["total"];
             $collect->total = is_array($total) ? $total["value"] : $total;
             $collect->page = request() ? request()->input('page',1) : $this->page;
@@ -487,7 +494,7 @@ protected function filters()
                         $body["query"]["bool"]["filter"][] = ["range" => [$item['column'] => ["lte" => $item['value']]]];
                     }
                     if ($item['operator'] == "like") {
-                        $body["query"]["bool"]["must"][] = ["match" => [$item['column'] => $item['value']]];
+                        $body["query"]["bool"]["filter"][] = ["match" => [$item['column'] => $item['value']]];
                     }
                     if ($item['operator'] == "exists") {
                         if (!$item['value']) {
@@ -504,10 +511,10 @@ protected function filters()
                     $body["query"]["bool"]["must_not"][] = ["terms" => [$item['column'] => $item['value']]];
                     break;
                 case 'Raw':
-
+                    $body["query"] = array_merge_recursive($body["query"] ?? [],$item['sql']) ;
                     break;
                 case 'Between':
-                    $body["query"]["bool"]["filter"][] = ["range" => [$item['column'] => ["gte" => $item['values'][0], "lte" => $item['values'][1]]]];
+                    $body["query"]["bool"]["must"][] = ["range" => [$item['column'] => ["gte" => $item['values'][0], "lte" => $item['values'][1]]]];
                     break;
                 case 'NotBetween':
                     $body["query"]["bool"]["must_not"][] = ["range" => [$item['column'] => ["gte" => $item['values'][0], "lte" => $item['values'][1]]]];
@@ -528,9 +535,12 @@ protected function filters()
         if(count($body["query"]) == 0){
             unset($body["query"]);
         }
-//        if(count($this->attributesToHighlight)){
-//            $body["highlight"]['fields'] = $this->attributesToHighlight;
-//        }
+        if(!empty($this->attributesToHighlight)){
+            $body["highlight"]['fields'] = $this->attributesToHighlight;
+        }
+        if(!empty($this->attributesAggregations)){
+            $body['aggs'] = $this->attributesAggregations;
+        }
         if (count($this->sort)) {
             $sortFields = array_key_exists("sort", $body) ? $body["sort"] : [];
             $body["sort"] = array_unique(array_merge($sortFields, $this->sort), SORT_REGULAR);