Merge pull request #186 from einorler/issue146

Implemented a check if relatedSearch is required
ongr-io · Sep 1, 2016 · 5e5f708 · 5e5f708
2 parents 6501329 + 1a7caa5
commit 5e5f708
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 5 deletions.
diff --git a/Filter/FilterInterface.php b/Filter/FilterInterface.php
@@ -71,4 +71,12 @@ public function getViewData(DocumentIterator $result, ViewData $data);
      * @return array
      */
     public function getTags();
+
+    /**
+     * Defines whether its necessary to build a related search for
+     * the filters preProcessSearch() method
+     *
+     * @return bool
+     */
+    public function isRelated();
 }
diff --git a/Filter/Widget/Choice/SingleTermChoice.php b/Filter/Widget/Choice/SingleTermChoice.php
@@ -134,6 +134,14 @@ public function getViewData(DocumentIterator $result, ViewData $data)
         return $data;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isRelated()
+    {
+        return true;
+    }
+
     /**
      * Adds prioritized choices.
      *

diff --git a/Filter/Widget/Pager/Pager.php b/Filter/Widget/Pager/Pager.php
@@ -137,4 +137,12 @@ public function getViewData(DocumentIterator $result, ViewData $data)
 
         return $data;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isRelated()
+    {
+        return false;
+    }
 }
diff --git a/Filter/Widget/Range/AbstractRange.php b/Filter/Widget/Range/AbstractRange.php
@@ -73,4 +73,12 @@ public function modifySearch(Search $search, FilterState $state = null, SearchRe
             $search->addPostFilter($filter);
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isRelated()
+    {
+        return false;
+    }
 }
diff --git a/Filter/Widget/Search/AbstractSingleValue.php b/Filter/Widget/Search/AbstractSingleValue.php
@@ -41,4 +41,12 @@ public function preProcessSearch(Search $search, Search $relatedSearch, FilterSt
     {
         // Nothing more to do here.
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isRelated()
+    {
+        return false;
+    }
 }
diff --git a/Filter/Widget/Sort/Sort.php b/Filter/Widget/Sort/Sort.php
@@ -111,6 +111,14 @@ public function setChoices($choices)
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isRelated()
+    {
+        return false;
+    }
+
     /**
      * @param string   $key
      * @param ViewData $data

diff --git a/Search/FilterManager.php b/Search/FilterManager.php
@@ -11,6 +11,7 @@
 
 namespace ONGR\FilterManagerBundle\Search;
 
+use ONGR\ElasticsearchDSL\Search;
 use ONGR\ElasticsearchBundle\Service\Repository;
 use ONGR\ElasticsearchBundle\Result\DocumentIterator;
 use ONGR\FilterManagerBundle\Event\PreSearchEvent;
@@ -84,13 +85,19 @@ public function search(SearchRequest $request)
 
         /** @var FilterInterface $filter */
         foreach ($this->container->all() as $name => $filter) {
-            // We simply exclude not related filters and current filter itself.
-            $relatedFilters = $this->container->getFiltersByRelation(
-                new AndRelation([$filter->getSearchRelation(), new ExcludeRelation([$name])])
-            );
+            $relatedSearch = new Search();
+
+            if ($filter->isRelated()) {
+                // We simply exclude not related filters and current filter itself.
+                $relatedFilters = $this->container->getFiltersByRelation(
+                    new AndRelation([$filter->getSearchRelation(), new ExcludeRelation([$name])])
+                );
+                $relatedSearch = $this->container->buildSearch($request, $relatedFilters);
+            }
+
             $filter->preProcessSearch(
                 $search,
-                $this->container->buildSearch($request, $relatedFilters),
+                $relatedSearch,
                 $request->get($name)
             );
         }

diff --git a/Tests/Unit/Search/FilterManagerTest.php b/Tests/Unit/Search/FilterManagerTest.php
@@ -30,6 +30,9 @@ public function testHandleRequest()
         $mockFilterInterface = $this->getMock('ONGR\FilterManagerBundle\Filter\FilterInterface');
         $mockFilterInterface->expects($this->once())
             ->method('preProcessSearch');
+        $mockFilterInterface->expects($this->once())
+            ->method('isRelated')
+            ->will($this->returnValue(true));
         $mockFilterInterface->expects($this->once())
             ->method('getSearchRelation')
             ->will($this->returnValue(null));

diff --git a/Tests/app/fixture/TestBundle/Filter/FooRange/FooRange.php b/Tests/app/fixture/TestBundle/Filter/FooRange/FooRange.php
@@ -108,4 +108,12 @@ public function getViewData(DocumentIterator $result, ViewData $data)
 
         return $data;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isRelated()
+    {
+        return true;
+    }
 }