Added highlighting ignore to engine count method

Author: babenkoivan

src/ElasticEngine.php

@@ -101,7 +101,10 @@ public function buildSearchQueryPayloadCollection(Builder $builder, array $optio
 
                     if ($ruleEntity->isApplicable()) {
                         $payload->setIfNotEmpty('body.query.bool', $ruleEntity->buildQueryPayload());
-                        $payload->setIfNotEmpty('body.highlight', $ruleEntity->buildHighlightPayload());
+
+                        if ($options['highlight'] ?? true) {
+                            $payload->setIfNotEmpty('body.highlight', $ruleEntity->buildHighlightPayload());
+                        }
                     } else {
                         continue;
                     }
@@ -226,7 +229,7 @@ public function count(Builder $builder)
         $count = 0;
 
         $this
-            ->buildSearchQueryPayloadCollection($builder)
+            ->buildSearchQueryPayloadCollection($builder, ['highlight' => false])
             ->each(function ($payload) use (&$count) {
                 $result = ElasticClient::count($payload);
 

tests/ElasticEngineTest.php

@@ -102,13 +102,13 @@ public function testBuildSearchQueryPayloadCollection()
                             ]
                         ],
                         'collapse' => [
-        'field' => 'brand'
-    ],
+                            'field' => 'brand'
+                        ],
                         'sort' => [
-        [
-            'id' => 'asc'
-        ]
-    ],
+                            [
+                                'id' => 'asc'
+                            ]
+                        ],
                         'from' => 100,
                         'size' => 10
                     ],
@@ -222,20 +222,14 @@ public function testCount()
                 'index' => 'test',
                 'type' => 'test',
                 'body' => [
+                    '_source' => [
+                        'title',
+                    ],
                     'query' => [
                         'bool' => [
                             'must' => [
-                                'match_all' => new stdClass()
-                            ],
-                            'filter' => [
-                                'bool' => [
-                                    'must' => [
-                                        [
-                                            'term' => [
-                                                'foo' => 'bar'
-                                            ]
-                                        ]
-                                    ]
+                                'query_string' => [
+                                    'query' => 'foo'
                                 ]
                             ]
                         ]
@@ -245,12 +239,13 @@ public function testCount()
 
         $model = $this->mockModel();
 
-        $filterBuilder = (new FilterBuilder($model))
-            ->where('foo', 'bar');
+        $searchBuilder = (new SearchBuilder($model, 'foo'))
+            ->rule(SearchRule::class)
+            ->select('title');
 
         $this
             ->engine
-            ->count($filterBuilder);
+            ->count($searchBuilder);
 
         $this->addToAssertionCount(1);
     }
@@ -444,4 +439,4 @@ public function testGetTotalCount()
             $this->engine->getTotalCount($results)
         );
     }
-}
+}