Fix fulltext keys search (#4689)

Author: dafeder

modules/dkan_metastore/modules/dkan_metastore_search/src/QueryBuilderTrait.php

@@ -55,22 +55,12 @@ private function getQuery(array $params, IndexInterface $index, QueryHelperInter
    *   active as the second. Example: [$query, TRUE].
    */
   private function setFullText(QueryInterface $query, array $params, IndexInterface $index): array {
-    if (!isset($params['fulltext']) || empty($params['fulltext'])) {
+    if (!isset($params['fulltext']) || empty($params['fulltext']) || empty($index->getFulltextFields())) {
       return [$query, FALSE];
     }
 
-    $fulltextFields = $index->getFulltextFields();
-
-    if (empty($fulltextFields)) {
-      return [$query, FALSE];
-    }
-
-    $conditions = [];
-    foreach ($fulltextFields as $field) {
-      $conditions[$field][] = $params['fulltext'];
-    }
-
-    $query = $this->createConditionGroup($query, $conditions, 'OR');
+    // Use Search API fulltext parsing.
+    $query->keys($params['fulltext']);
 
     return [$query, TRUE];
   }

modules/dkan_metastore/modules/dkan_metastore_search/tests/src/Unit/SearchTest.php

@@ -10,7 +10,10 @@
 use Drupal\dkan_metastore\MetastoreService;
 use Drupal\search_api\IndexInterface;
 use Drupal\search_api\Item\Item;
+use Drupal\search_api\ParseMode\ParseModePluginManager;
+use Drupal\search_api\Plugin\search_api\parse_mode\Terms;
 use Drupal\search_api\Query\ConditionGroup;
+use Drupal\search_api\Query\Query;
 use Drupal\search_api\Query\QueryInterface;
 use Drupal\search_api\Query\ResultSet;
 use Drupal\search_api\Utility\QueryHelperInterface;
@@ -70,7 +73,19 @@ public function testSearch() {
     ]));
   }
 
-  public function testSearchParameterWithComma() {
+  /**
+   * Test two things.
+   *
+   * 1. That commas in non-fulltext parameters get properly handled and don't
+   *    mess up parsing.
+   * 2. That fulltext parameters get sent to keys()
+   *
+   * Because none of the functions we can test here return the query object, we
+   * can't test that the keys() are being parsed as expected, but we should be
+   * able to trust that if the input is sent to keys(), it will be handled
+   * as expected by Search API.
+   */
+  public function testSearchParameterWithCommaAndFulltext() {
     $options = (new Options())
       ->add('dkan.metastore.service', MetastoreService::class)
       ->add('entity_type.manager', EntityTypeManager::class)
@@ -88,6 +103,7 @@ public function testSearchParameterWithComma() {
       ->add(QueryHelperInterface::class, 'createQuery', QueryInterface::class)
       ->add(QueryInterface::class, 'execute', ResultSet::class)
       ->add(QueryInterface::class, 'createConditionGroup', ConditionGroup::class)
+      ->add(QueryInterface::class, 'keys', null, 'keys')
       ->add(ConditionGroup::class, 'addCondition', null, 'condition_group');
 
     \Drupal::setContainer($container->getMock());
@@ -102,6 +118,15 @@ public function testSearchParameterWithComma() {
       'Steve, and someone else',
       $container->getStoredInput('condition_group')[1]
     );
+
+    // Now assert fulltext ends up getting sent to keys()
+    $service->search([
+      'fulltext' => 'Fulltext Param, "Steve, and someone else"',
+    ]);
+    $this->assertEquals(
+      'Fulltext Param, "Steve, and someone else"',
+      $container->getStoredInput('keys')[0]
+    );
   }
 
   /**