ACP2E-68: Search terms queries via graphQL are not populated in popular search terms in admin

Author: Oleksandr Iegorov

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

@@ -13,13 +13,14 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ArgumentsProcessorInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Search\Api\SearchInterface;
 use Magento\Search\Model\Search\PageSizeProvider;
-use Magento\Search\Model\QueryFactory;
+use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search\QueryPopularity;
 
 /**
  * Full text search for catalog using given search criteria.
@@ -62,9 +63,9 @@ class Search implements ProductQueryInterface
     private $searchCriteriaBuilder;
 
     /**
-     * @var QueryFactory
+     * @var QueryPopularity
      */
-    private $queryFactory;
+    private $queryPopularity;
 
     /**
      * @param SearchInterface $search
@@ -74,7 +75,7 @@ class Search implements ProductQueryInterface
      * @param ProductSearch $productsProvider
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param ArgumentsProcessorInterface|null $argsSelection
-     * @param QueryFactory|null $queryFactory
+     * @param QueryPopularity|null $queryPopularity
      */
     public function __construct(
         SearchInterface $search,
@@ -84,18 +85,16 @@ public function __construct(
         ProductSearch $productsProvider,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         ArgumentsProcessorInterface $argsSelection = null,
-        QueryFactory $queryFactory = null
+        QueryPopularity $queryPopularity = null
     ) {
         $this->search = $search;
         $this->searchResultFactory = $searchResultFactory;
         $this->pageSizeProvider = $pageSize;
         $this->fieldSelection = $fieldSelection;
         $this->productsProvider = $productsProvider;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->argsSelection = $argsSelection ?: ObjectManager::getInstance()
-            ->get(ArgumentsProcessorInterface::class);
-        $this->queryFactory = $queryFactory ?: ObjectManager::getInstance()
-            ->get(QueryFactory::class);
+        $this->argsSelection = $argsSelection ?: ObjectManager::getInstance()->get(ArgumentsProcessorInterface::class);
+        $this->queryPopularity = $queryPopularity ?: ObjectManager::getInstance()->get(QueryPopularity::class);
     }
 
     /**
@@ -136,12 +135,7 @@ public function getResult(
 
         // add query statistics data
         if (!empty($args['search'])) {
-            $query = $this->queryFactory->get();
-            $query->setQueryText($args['search']);
-            $store = $context->getExtensionAttributes()->getStore();
-            $query->setStoreId($store->getId());
-            $query->saveIncrementalPopularity();
-            $query->saveNumResults($searchResults->getTotalCount());
+            $this->queryPopularity->execute($context, $args['search'], (int) $searchResults->getTotalCount());
         }
 
         $productArray = [];

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search/QueryPopularity.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
+
+use Magento\Framework\Stdlib\StringUtils as StdlibString;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\GraphQl\Model\Query\ContextInterface;
+use Magento\Search\Model\QueryFactory;
+
+/**
+ * Query statics handler
+ */
+class QueryPopularity
+{
+    /**
+     * @var QueryFactory
+     */
+    private $queryFactory;
+
+    /**
+     * @var StdlibString
+     */
+    private $string;
+
+    /**
+     * @param QueryFactory $queryFactory
+     * @param StdlibString $string
+     */
+    public function __construct(
+        QueryFactory $queryFactory,
+        StdlibString $string
+    ) {
+        $this->queryFactory = $queryFactory;
+        $this->string = $string;
+    }
+
+    /**
+     * Fill the query popularity
+     *
+     * @param ContextInterface $context
+     * @param string $queryText
+     * @param int $numResults
+     * @return void
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     */
+    public function execute(ContextInterface $context, string $queryText, int $numResults) : void
+    {
+        $query = $this->queryFactory->create();
+        $maxQueryLength = (int) $query->getMaxQueryLength();
+        if ($maxQueryLength && $this->string->strlen($queryText) > $maxQueryLength) {
+            $queryText = $this->string->substr($queryText, 0, $maxQueryLength);
+        }
+        $query->loadByQueryText($queryText);
+        $store = $context->getExtensionAttributes()->getStore();
+        $query->setStoreId($store->getId());
+        $query->saveIncrementalPopularity();
+        $query->saveNumResults($numResults);
+    }
+}