From c5766f5b1269c77140cb8d5fa117546381837706 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Thu, 10 Aug 2017 08:54:36 +0200
Subject: [PATCH] BUGFIX: Use fresh query for each creation

This prevents issues with modifying an build query.
---
 Classes/Domain/Search/QueryFactory.php | 62 ++++++++++++++------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/Classes/Domain/Search/QueryFactory.php b/Classes/Domain/Search/QueryFactory.php
index ce702f9..4edc7b0 100644
--- a/Classes/Domain/Search/QueryFactory.php
+++ b/Classes/Domain/Search/QueryFactory.php
@@ -39,11 +39,6 @@ class QueryFactory
      */
     protected $configuration;
 
-    /**
-     * @var array
-     */
-    protected $query = [];
-
     /**
      * @param \TYPO3\CMS\Core\Log\LogManager $logManager
      * @param ConfigurationContainerInterface $configuration
@@ -77,26 +72,28 @@ class QueryFactory
      */
     protected function createElasticaQuery(SearchRequestInterface $searchRequest)
     {
-        $this->addSize($searchRequest);
-        $this->addSearch($searchRequest);
-        $this->addBoosts($searchRequest);
-        $this->addFilter($searchRequest);
-        $this->addFacets($searchRequest);
+        $query = [];
+        $this->addSize($searchRequest, $query);
+        $this->addSearch($searchRequest, $query);
+        $this->addBoosts($searchRequest, $query);
+        $this->addFilter($searchRequest, $query);
+        $this->addFacets($searchRequest, $query);
 
         // Use last, as it might change structure of query.
         // Better approach would be something like DQL to generate query and build result in the end.
-        $this->addFactorBoost();
+        $this->addFactorBoost($query);
 
-        $this->logger->debug('Generated elasticsearch query.', [$this->query]);
-        return new \Elastica\Query($this->query);
+        $this->logger->debug('Generated elasticsearch query.', [$query]);
+        return new \Elastica\Query($query);
     }
 
     /**
      * @param SearchRequestInterface $searchRequest
+     * @param array &$query
      */
-    protected function addSize(SearchRequestInterface $searchRequest)
+    protected function addSize(SearchRequestInterface $searchRequest, array &$query)
     {
-        $this->query = ArrayUtility::arrayMergeRecursiveOverrule($this->query, [
+        $query = ArrayUtility::arrayMergeRecursiveOverrule($query, [
             'from' => 0,
             'size' => $searchRequest->getSize(),
         ]);
@@ -104,19 +101,20 @@ class QueryFactory
 
     /**
      * @param SearchRequestInterface $searchRequest
+     * @param array &$query
      */
-    protected function addSearch(SearchRequestInterface $searchRequest)
+    protected function addSearch(SearchRequestInterface $searchRequest, array &$query)
     {
-        $this->query = ArrayUtility::setValueByPath(
-            $this->query,
+        $query = ArrayUtility::setValueByPath(
+            $query,
             'query.bool.must.0.match._all.query',
             $searchRequest->getSearchTerm()
         );
 
         $minimumShouldMatch = $this->configuration->getIfExists('searching.minimumShouldMatch');
         if ($minimumShouldMatch) {
-            $this->query = ArrayUtility::setValueByPath(
-                $this->query,
+            $query = ArrayUtility::setValueByPath(
+                $query,
                 'query.bool.must.0.match._all.minimum_should_match',
                 $minimumShouldMatch
             );
@@ -125,8 +123,9 @@ class QueryFactory
 
     /**
      * @param SearchRequestInterface $searchRequest
+     * @param array &$query
      */
-    protected function addBoosts(SearchRequestInterface $searchRequest)
+    protected function addBoosts(SearchRequestInterface $searchRequest, array &$query)
     {
         try {
             $fields = $this->configuration->get('searching.boost');
@@ -147,7 +146,7 @@ class QueryFactory
             ];
         }
 
-        $this->query = ArrayUtility::arrayMergeRecursiveOverrule($this->query, [
+        $query = ArrayUtility::arrayMergeRecursiveOverrule($query, [
             'query' => [
                 'bool' => [
                     'should' => $boostQueryParts,
@@ -156,12 +155,15 @@ class QueryFactory
         ]);
     }
 
-    protected function addFactorBoost()
+    /**
+     * @param array &$query
+     */
+    protected function addFactorBoost(array &$query)
     {
         try {
-            $this->query['query'] = [
+            $query['query'] = [
                 'function_score' => [
-                    'query' => $this->query['query'],
+                    'query' => $query['query'],
                     'field_value_factor' => $this->configuration->get('searching.fieldValueFactor'),
                 ],
             ];
@@ -172,8 +174,9 @@ class QueryFactory
 
     /**
      * @param SearchRequestInterface $searchRequest
+     * @param array &$query
      */
-    protected function addFilter(SearchRequestInterface $searchRequest)
+    protected function addFilter(SearchRequestInterface $searchRequest, array &$query)
     {
         if (! $searchRequest->hasFilter()) {
             return;
@@ -188,7 +191,7 @@ class QueryFactory
             ];
         }
 
-        $this->query = ArrayUtility::arrayMergeRecursiveOverrule($this->query, [
+        $query = ArrayUtility::arrayMergeRecursiveOverrule($query, [
             'query' => [
                 'bool' => [
                     'filter' => $terms,
@@ -199,11 +202,12 @@ class QueryFactory
 
     /**
      * @param SearchRequestInterface $searchRequest
+     * @param array &$query
      */
-    protected function addFacets(SearchRequestInterface $searchRequest)
+    protected function addFacets(SearchRequestInterface $searchRequest, array &$query)
     {
         foreach ($searchRequest->getFacets() as $facet) {
-            $this->query = ArrayUtility::arrayMergeRecursiveOverrule($this->query, [
+            $query = ArrayUtility::arrayMergeRecursiveOverrule($query, [
                 'aggs' => [
                     $facet->getIdentifier() => [
                         'terms' => [