!!! TASK: Fix highlighting by using anylyzed fulltext fields instead of _all

Author: daniellienert

Classes/Driver/Version5/Query/FilteredQuery.php

@@ -13,6 +13,7 @@
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractQuery;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException;
 
 /**
  * Filtered query for elastic version 5
@@ -22,6 +23,7 @@ class FilteredQuery extends AbstractQuery
 
     /**
      * {@inheritdoc}
+     * @throws QueryBuildingException
      */
     public function getCountRequestAsJson()
     {
@@ -57,7 +59,10 @@ public function from($size)
     public function fulltext(string $searchWord, array $options = [])
     {
         $this->appendAtPath('query.bool.must', [
-            'query_string' => array_merge($options, ['query' => $searchWord])
+            'query_string' => array_merge($options, [
+                'query' => $searchWord,
+                'fields' => ['__fulltext*']
+            ])
         ]);
     }
 
@@ -67,7 +72,7 @@ public function fulltext(string $searchWord, array $options = [])
     public function queryFilter($filterType, $filterOptions, $clauseType = 'must')
     {
         if (!in_array($clauseType, ['must', 'should', 'must_not'])) {
-            throw new Exception\QueryBuildingException('The given clause type "' . $clauseType . '" is not supported. Must be one of "must", "should", "must_not".', 1383716082);
+            throw new QueryBuildingException('The given clause type "' . $clauseType . '" is not supported. Must be one of "must", "should", "must_not".', 1383716082);
         }
 
         $this->appendAtPath('query.bool.filter.bool.' . $clauseType, [$filterType => $filterOptions]);

Configuration/NodeTypes.yaml

@@ -136,31 +136,31 @@
           properties:
             'h1':
               type: string
-              include_in_all: true
+              index: analyzed
               boost: 20
             'h2':
               type: string
-              include_in_all: true
+              index: analyzed
               boost: 12
             'h3':
               type: string
-              include_in_all: true
+              index: analyzed
               boost: 10
             'h4':
               type: string
-              include_in_all: true
+              index: analyzed
               boost: 5
             'h5':
               type: string
-              include_in_all: true
+              index: analyzed
               boost: 3
             'h6':
               type: string
-              include_in_all: true
+              index: analyzed
               boost: 2
             'text':
               type: string
-              include_in_all: true
+              index: analyzed
               boost: 1
     '_hiddenInIndex':
       search:

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -120,6 +120,43 @@ public function elasticSearchQueryBuilderStartsClean()
         $this->assertEquals($cleanRequestArray, $query2->getRequest()->toArray());
     }
 
+    /**
+     * @test
+     */
+    public function fullTextSearchReturnsTheDocumentNode()
+    {
+        /** @var ElasticSearchQueryResult $result */
+        $result = $this->getQueryBuilder()
+            ->fulltext('circum*')
+            ->execute();
+        $this->assertEquals(1, $result->count());
+
+        /** @var NodeInterface $node */
+        $node = $result->current();
+        $this->assertEquals('Neos.NodeTypes:Page', $node->getNodeType()->getName());
+        $this->assertEquals('test-node-1', $node->getName());
+    }
+
+    /**
+     * @test
+     */
+    public function fullTextHighlighting()
+    {
+        /** @var ElasticSearchQueryBuilder $queryBuilder */
+        $queryBuilder = $this->getQueryBuilder();
+
+        /** @var NodeInterface $resultNode */
+        $resultNode = $queryBuilder
+            ->fulltext('whistles')
+            ->log($this->getLogMessagePrefix(__METHOD__))
+            ->execute()
+            ->current();
+        $searchHitForNode = $queryBuilder->getFullElasticSearchHitForNode($resultNode);
+        $highlightedText = current($searchHitForNode['highlight']['__fulltext.text']);
+        $expected = 'A Scout smiles and <em>whistles</em> under all circumstances.';
+        $this->assertEquals($expected, $highlightedText);
+    }
+
     /**
      * @test
      */