From 1f78b97464d650ae712480c2bb05358c6705d5fa Mon Sep 17 00:00:00 2001 From: Dmytro Horytskyi Date: Tue, 8 Jan 2019 17:46:22 +0200 Subject: [PATCH] MAGETWO-97495: [Magento Cloud] Price Filters include ranges that have no products --- .../Elasticsearch/SearchAdapter/Dynamic/DataProvider.php | 1 + .../Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php index cfdab2463311..496a77e4c5ac 100644 --- 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 index 9c717ea240a5..6258a4a20d69 100644 --- 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' => [