Bugfix for facet queries with local parameters (#937)

Co-authored-by: Markus Kalkbrenner <git@kalki.de>

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Query a single term in a Managed Resource
 
 ### Fixed
+- Syntax error in request with facet queries that contain local parameters
 - HEAD requests could lead to timeouts with cURL adapter
 
 ### Changed

src/Component/RequestBuilder/FacetSet.php

@@ -187,9 +187,18 @@ public function addFacetField(Request $request, FacetField $facet, bool $useLoca
      */
     public function addFacetQuery($request, $facet): void
     {
+        $localParams = $facet->getLocalParameters()->render();
+        $query = $facet->getQuery();
+
+        // add local params to those already present in the query, e.g. a qparser
+        if (null !== $localParams && null !== $query && 0 === strpos($query, '{!')) {
+            $localParams = strstr($query, '}', true).' '.substr($localParams, 2);
+            $query = substr($query, strpos($query, '}') + 1);
+        }
+
         $request->addParam(
             'facet.query',
-            sprintf('%s%s', $facet->getLocalParameters()->render(), $facet->getQuery())
+            sprintf('%s%s', $localParams, $query)
         );
     }
 

tests/Component/RequestBuilder/FacetSetTest.php

@@ -487,6 +487,26 @@ public function testBuildWithIntervalFacet()
             urldecode($request->getUri())
         );
     }
+
+    public function testBuildWithQueryFacetWithQparser()
+    {
+        $facet = new FacetQuery(
+            [
+                'local_key' => 'f1',
+                'query' => '{!frange l=100 u=200}price',
+            ]
+        );
+
+        $this->component->addFacet($facet);
+
+        $request = $this->builder->buildComponent($this->component, $this->request);
+
+        $this->assertNull($request->getRawData());
+        $this->assertEquals(
+            '?facet.query={!frange l=100 u=200 key=f1}price&facet=true',
+            urldecode($request->getUri())
+        );
+    }
 }
 
 class UnknownFacet extends FacetField