Add current nested path in filter query builder to condition the gene…

src/module-elasticsuite-core/Search/Request/Aggregation/AggregationBuilder.php

@@ -17,7 +17,7 @@
 use Smile\ElasticsuiteCore\Api\Index\Mapping\FieldInterface;
 use Smile\ElasticsuiteCore\Search\Request\BucketInterface;
 use Smile\ElasticsuiteCore\Api\Search\Request\ContainerConfigurationInterface;
-use Smile\ElasticsuiteCore\Search\Request\Query\Builder as QueryBuilder;
+use Smile\ElasticsuiteCore\Search\Request\Query\Filter\QueryBuilder;
 use Smile\ElasticsuiteCore\Search\Request\QueryInterface;
 
 /**
@@ -89,7 +89,11 @@ public function buildAggregations(
                 }
 
                 if (isset($bucketParams['nestedFilter'])) {
-                    $nestedFilter = $this->createFilter($containerConfiguration, $bucketParams['nestedFilter']);
+                    $nestedFilter = $this->createFilter(
+                        $containerConfiguration,
+                        $bucketParams['nestedFilter'],
+                        $bucketParams['nestedPath']
+                    );
                     $bucketParams['nestedFilter'] = $nestedFilter;
                 }
 
@@ -113,12 +117,13 @@ public function buildAggregations(
      *
      * @param ContainerConfigurationInterface $containerConfiguration Search container configuration
      * @param array                           $filters                Filters definition.
+     * @param string|null                     $currentPath            Current nested path or null.
      *
      * @return QueryInterface
      */
-    private function createFilter(ContainerConfigurationInterface $containerConfiguration, array $filters)
+    private function createFilter(ContainerConfigurationInterface $containerConfiguration, array $filters, $currentPath = null)
     {
-        return $this->queryBuilder->createFilterQuery($containerConfiguration, $filters);
+        return $this->queryBuilder->create($containerConfiguration, $filters, $currentPath);
     }
 
     /**

src/module-elasticsuite-core/Search/Request/Query/Filter/QueryBuilder.php

@@ -72,10 +72,11 @@ public function __construct(QueryFactory $queryFactory)
      *
      * @param ContainerConfigurationInterface $containerConfig Search request container configuration.
      * @param array                           $filters         Filters to be built.
+     * @param string|null                     $currentPath     Current nested path or null.
      *
      * @return QueryInterface
      */
-    public function create(ContainerConfigurationInterface $containerConfig, array $filters)
+    public function create(ContainerConfigurationInterface $containerConfig, array $filters, $currentPath = null)
     {
         $queries = [];
 
@@ -86,7 +87,7 @@ public function create(ContainerConfigurationInterface $containerConfig, array $
                 $queries[] = $condition;
             } else {
                 $mappingField = $mapping->getField($fieldName);
-                $queries[]    = $this->prepareFieldCondition($mappingField, $condition);
+                $queries[]    = $this->prepareFieldCondition($mappingField, $condition, $currentPath);
             }
         }
 
@@ -102,12 +103,13 @@ public function create(ContainerConfigurationInterface $containerConfig, array $
     /**
      * Transform the condition into a search request query object.
      *
-     * @param FieldInterface $field     Filter field.
-     * @param array|string   $condition Filter condition.
+     * @param FieldInterface $field       Filter field.
+     * @param array|string   $condition   Filter condition.
+     * @param string|null    $currentPath Current nested path or null.
      *
      * @return QueryInterface
      */
-    private function prepareFieldCondition(FieldInterface $field, $condition)
+    private function prepareFieldCondition(FieldInterface $field, $condition, $currentPath)
     {
         $queryType = QueryInterface::TYPE_TERMS;
         $condition = $this->prepareCondition($condition);
@@ -134,14 +136,33 @@ private function prepareFieldCondition(FieldInterface $field, $condition)
 
         $query = $this->queryFactory->create($queryType, $condition);
 
-        if ($field->isNested()) {
+        if ($this->isNestedField($field, $currentPath)) {
             $queryParams = ['path' => $field->getNestedPath(), 'query' => $query];
             $query = $this->queryFactory->create(QueryInterface::TYPE_NESTED, $queryParams);
         }
 
         return $query;
     }
 
+    /**
+     * @param FieldInterface $field       Filter field.
+     * @param string|null    $currentPath Current nested path or null.
+     *
+     * @return bool
+     * @throws \LogicException
+     */
+    private function isNestedField(FieldInterface $field, $currentPath)
+    {
+        if ($field->isNested() && $field->getNestedPath() !== $currentPath) {
+            throw new \LogicException("Can not filter nested field {$field->getName()} with nested path $currentPath");
+        }
+        if (!$field->isNested() && $currentPath !== null) {
+             throw new \LogicException("Can not filter non nested field {$field->getName()} in nested context ($currentPath)");
+        }
+
+        return $field->isNested() && $currentPath === null;
+    }
+
     /**
      * Ensure the condition is supported and try to tranform it into a supported type.
      *

src/module-elasticsuite-core/Search/Request/SortOrder/SortOrderBuilder.php

@@ -88,7 +88,11 @@ public function buildSordOrders(ContainerConfigurationInterface $containerConfig
                 }
 
                 if (isset($sortOrderParams['nestedFilter'])) {
-                    $nestedFilter = $this->queryBuilder->create($containerConfig, $sortOrderParams['nestedFilter']);
+                    $nestedFilter = $this->queryBuilder->create(
+                        $containerConfig,
+                        $sortOrderParams['nestedFilter'],
+                        $sortOrderParams['nestedPath']
+                    );
                     $sortOrderParams['nestedFilter'] = $nestedFilter;
                 }
             } catch (\LogicException $e) {