Merge pull request #3614 from magento-tango/MAGETWO-97495

[TANGO] PR
vasilii-b · Jan 21, 2019 · 2f30dde · 2f30dde
2 parents d1ebc17 + a3f2cde
commit 2f30dde
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
@@ -212,6 +212,7 @@ public function getAggregation(
                 'histogram' => [
                     'field' => $fieldName,
                     'interval' => (float)$range,
+                    'min_doc_count' => 1,
                 ],
             ],
         ];

diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
@@ -321,8 +321,15 @@ public function testGetAggregation()
         $this->clientMock->expects($this->once())
             ->method('query')
             ->with($this->callback(function ($query) {
+                $histogramParams = $query['body']['aggregations']['prices']['histogram'];
                 // Assert the interval is queried as a float. See MAGETWO-95471
-                return $query['body']['aggregations']['prices']['histogram']['interval'] === 10.0;
+                if ($histogramParams['interval'] !== 10.0) {
+                    return false;
+                }
+                if (!isset($histogramParams['min_doc_count']) || $histogramParams['min_doc_count'] !== 1) {
+                    return false;
+                }
+                return true;
             }))
             ->willReturn([
                 'aggregations' => [