Merge branch 'master' into tagged_filters

Conflicts:
	Tests/app/config/config_test.yml

Author: asev

DependencyInjection/Configuration.php

@@ -92,6 +92,7 @@ function ($v) {
                         ->append($this->buildFilterTree('pager'))
                         ->append($this->buildFilterTree('document_field'))
                         ->append($this->buildFilterTree('range'))
+                        ->append($this->buildFilterTree('date_range'))
                     ->end()
                 ->end()
             ->end();

DependencyInjection/Filter/DateRangeFilterFactory.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\FilterManagerBundle\DependencyInjection\Filter;
+
+/**
+ * Factory for range filter on date fields.
+ */
+class DateRangeFilterFactory extends RangeFilterFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function getNamespace()
+    {
+        return 'ONGR\FilterManagerBundle\Filters\Widget\Range\DateRange';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'date_range';
+    }
+}

DependencyInjection/Filter/FuzzyFilterFactory.php

@@ -40,7 +40,7 @@ protected function configure(Definition $definition, array $configuration)
      */
     protected function getNamespace()
     {
-        return 'ONGR\FilterManagerBundle\Filters\Widget\Search\MatchSearch';
+        return 'ONGR\FilterManagerBundle\Filters\Widget\Search\FuzzySearch';
     }
 
     /**

Filters/ViewData/RangeAwareViewData.php

@@ -14,46 +14,46 @@
 use ONGR\FilterManagerBundle\Filters\ViewData;
 
 /**
- * This class holds extra data for range filter.
+ * This class holds extra data for range and date_range filters.
  */
 class RangeAwareViewData extends ViewData
 {
     /**
-     * @var float
+     * @var float|\DateTime
      */
     private $minBounds;
 
     /**
-     * @var float
+     * @var float|\DateTime
      */
     private $maxBounds;
 
     /**
-     * @return float
+     * @return float|\DateTime
      */
     public function getMaxBounds()
     {
         return $this->maxBounds;
     }
 
     /**
-     * @param float $maxBounds
+     * @param float|\DateTime $maxBounds
      */
     public function setMaxBounds($maxBounds)
     {
         $this->maxBounds = $maxBounds;
     }
 
     /**
-     * @return float
+     * @return float|\DateTime
      */
     public function getMinBounds()
     {
         return $this->minBounds;
     }
 
     /**
-     * @param float $minBounds
+     * @param float|\DateTime $minBounds
      */
     public function setMinBounds($minBounds)
     {

Filters/Widget/AbstractSingleRequestValueFilter.php

@@ -42,6 +42,7 @@ public function getState(Request $request)
         $value = $request->get($this->getRequestField());
 
         if (isset($value) && $value !== '') {
+            $value = is_array($value) ? array_values($value) : $value;
             $state->setActive(true);
             $state->setValue($value);
             $state->setUrlParameters([$this->getRequestField() => $value]);

Filters/Widget/Range/DateRange.php

@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\FilterManagerBundle\Filters\Widget\Range;
+
+use ONGR\ElasticsearchBundle\DSL\Aggregation\StatsAggregation;
+use ONGR\ElasticsearchBundle\DSL\Filter\RangeFilter;
+use ONGR\ElasticsearchBundle\DSL\Search;
+use ONGR\ElasticsearchBundle\Result\DocumentIterator;
+use ONGR\FilterManagerBundle\Filters\FilterState;
+use ONGR\FilterManagerBundle\Filters\Helper\FieldAwareInterface;
+use ONGR\FilterManagerBundle\Filters\Helper\FieldAwareTrait;
+use ONGR\FilterManagerBundle\Filters\Helper\ViewDataFactoryInterface;
+use ONGR\FilterManagerBundle\Filters\ViewData;
+use ONGR\FilterManagerBundle\Filters\Widget\AbstractSingleRequestValueFilter;
+use ONGR\FilterManagerBundle\Search\SearchRequest;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Date range filter, selects documents from lower date to upper date.
+ */
+class DateRange extends AbstractSingleRequestValueFilter implements FieldAwareInterface, ViewDataFactoryInterface
+{
+    use FieldAwareTrait;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getState(Request $request)
+    {
+        $state = parent::getState($request);
+
+        if ($state->getValue()) {
+            $values = explode(';', $state->getValue(), 2);
+            $normalized['gt'] = $values[0];
+            $normalized['lt'] = $values[1];
+
+            $state->setValue($normalized);
+        }
+
+        return $state;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function preProcessSearch(Search $search, Search $relatedSearch, FilterState $state = null)
+    {
+        $stateAgg = new StatsAggregation('date_range_agg');
+        $stateAgg->setField($this->getField());
+        $search->addAggregation($stateAgg);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function modifySearch(Search $search, FilterState $state = null, SearchRequest $request = null)
+    {
+        if ($state && $state->isActive()) {
+            $filter = new RangeFilter($this->getField(), $state->getValue());
+            $search->addPostFilter($filter);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createViewData()
+    {
+        return new ViewData\RangeAwareViewData();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getViewData(DocumentIterator $result, ViewData $data)
+    {
+        /** @var $data ViewData\RangeAwareViewData */
+        $data->setMinBounds(
+            new \DateTime(
+                date(
+                    \DateTime::ISO8601,
+                    $result->getAggregations()['date_range_agg']->getValue()['min'] / 1000
+                )
+            )
+        );
+
+        $data->setMaxBounds(
+            new \DateTime(
+                date(
+                    \DateTime::ISO8601,
+                    $result->getAggregations()['date_range_agg']->getValue()['max'] / 1000
+                )
+            )
+        );
+
+        return $data;
+    }
+}

ONGRFilterManagerBundle.php

@@ -13,6 +13,7 @@
 
 use ONGR\FilterManagerBundle\DependencyInjection\Compiler\FilterPass;
 use ONGR\FilterManagerBundle\DependencyInjection\Filter\ChoiceFilterFactory;
+use ONGR\FilterManagerBundle\DependencyInjection\Filter\DateRangeFilterFactory;
 use ONGR\FilterManagerBundle\DependencyInjection\Filter\DocumentFieldFilterFactory;
 use ONGR\FilterManagerBundle\DependencyInjection\Filter\FuzzyFilterFactory;
 use ONGR\FilterManagerBundle\DependencyInjection\Filter\MatchFilterFactory;
@@ -46,7 +47,8 @@ public function build(ContainerBuilder $container)
         $extension->addFilterFactory(new SortFilterFactory());
         $extension->addFilterFactory(new PagerFilterFactory());
         $extension->addFilterFactory(new RangeFilterFactory());
-        
+        $extension->addFilterFactory(new DateRangeFilterFactory());
+
         $container->addCompilerPass(new FilterPass());
     }
 }

Tests/Functional/DependencyInjection/ServiceCreationTest.php

@@ -66,6 +66,10 @@ public function getTestServicesData()
                 'ongr_filter_manager.foo_filters',
                 'ONGR\FilterManagerBundle\Search\FiltersManager',
             ],
+            [
+                'ongr_filter_manager.filter.fuzzy',
+                'ONGR\FilterManagerBundle\Filters\Widget\Search\FuzzySearch',
+            ],
         ];
     }
 

Tests/Functional/Filters/Widget/Choice/MultiTermChoiceTest.php

@@ -78,6 +78,9 @@ public function getTestResultsData()
         // Case #2 all elements.
         $out[] = [new Request(['choice' => ['red', 'green', 'blue']]), ['1', '2', '3', '4', '5']];
 
+        // Case #3 non ordered choices.
+        $out[] = [new Request(['choice' => [0 => 'black', 2 => 'red']]), ['1', '3']];
+
         return $out;
     }