Fix range filter preprocess search (#254)

* Bumped development version to 2.1
* Fix doc
* implemented filtering results when retrieving bounds in range filter
* fixed tests

Author: einorler

Filter/ViewData.php

@@ -92,7 +92,7 @@ public function setState(FilterState $state)
     }
 
     /**
-     * @return string
+     * @return array
      */
     public function getTags()
     {

Filter/Widget/Range/Range.php

@@ -11,6 +11,7 @@
 
 namespace ONGR\FilterManagerBundle\Filter\Widget\Range;
 
+use ONGR\ElasticsearchDSL\Aggregation\Bucketing\FilterAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Metric\StatsAggregation;
 use ONGR\ElasticsearchDSL\Search;
 use ONGR\ElasticsearchBundle\Result\DocumentIterator;
@@ -58,9 +59,17 @@ public function getState(Request $request)
      */
     public function preProcessSearch(Search $search, Search $relatedSearch, FilterState $state = null)
     {
-        $stateAgg = new StatsAggregation($state->getName());
-        $stateAgg->setField($this->getDocumentField());
-        $search->addAggregation($stateAgg);
+        $aggregation = new StatsAggregation($state->getName());
+        $aggregation->setField($this->getDocumentField());
+
+        if ($relatedSearch->getPostFilters()) {
+            $filterAggregation = new FilterAggregation($state->getName() . '-filter');
+            $filterAggregation->setFilter($relatedSearch->getPostFilters());
+            $filterAggregation->addAggregation($aggregation);
+            $aggregation = $filterAggregation;
+        }
+
+        $search->addAggregation($aggregation);
     }
 
     /**
@@ -69,9 +78,15 @@ public function preProcessSearch(Search $search, Search $relatedSearch, FilterSt
     public function getViewData(DocumentIterator $result, ViewData $data)
     {
         $name = $data->getState()->getName();
+        $aggregation = $result->getAggregation($name);
+
+        if (!$aggregation) {
+            $aggregation = $result->getAggregation($name . '-filter')->getAggregation($name);
+        }
+
         /** @var $data ViewData\RangeAwareViewData */
-        $data->setMinBounds($result->getAggregation($name)['min']);
-        $data->setMaxBounds($result->getAggregation($name)['max']);
+        $data->setMinBounds($aggregation['min']);
+        $data->setMaxBounds($aggregation['max']);
 
         return $data;
     }

Tests/Functional/Filter/Widget/Range/DateRangeTest.php

@@ -120,7 +120,7 @@ public function testBoundsFormation()
 
         $result = $manager->handleRequest(new Request(['limit' => 'blue']))->getFilters()['date_range_filter'];
 
-        $this->assertEquals('2001-09-11', $result->getMinBounds()->format('Y-m-d'));
-        $this->assertEquals('2005-10-11', $result->getMaxBounds()->format('Y-m-d'));
+        $this->assertEquals('2002-09-12', $result->getMinBounds()->format('Y-m-d'));
+        $this->assertEquals('2004-09-11', $result->getMaxBounds()->format('Y-m-d'));
     }
 }

Tests/Functional/Filter/Widget/Range/RangeTest.php

@@ -121,7 +121,6 @@ public function getTestResultsData()
      */
     public function testFilter($expectedChoices, $query = [])
     {
-
         $manager = $this->getContainer()->get(ONGRFilterManagerExtension::getFilterManagerId('range'));
         $result = $manager->handleRequest(new Request($query))->getResult();
 
@@ -141,6 +140,6 @@ public function testFilterWithRelatedSearch()
         $priceViewData = $result->getFilters()['price_range'];
 
         $this->assertEquals(1, floor($priceViewData->getMinBounds()));
-        $this->assertEquals(5, ceil($priceViewData->getMaxBounds()));
+        $this->assertEquals(3, ceil($priceViewData->getMaxBounds()));
     }
 }

composer.json

@@ -29,7 +29,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "2.1-dev"
         }
     }
 }