ACP2E-948: Product listing GraphQL query limited to total_count 10,000 products only

dhorytskyi · dhorytskyi · commit 1999a6c08bb3 · 2024-09-12T17:46:25.000-05:00
diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
@@ -8,103 +8,49 @@
 namespace Magento\CatalogGraphQl\DataProvider\Product;
 
 use Magento\Catalog\Api\Data\EavAttributeInterface;
-use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\Eav\Model\Config;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\FilterGroupBuilder;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\Builder;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\ArgumentApplierPool;
 use Magento\Framework\Search\Request\Config as SearchConfig;
 
 /**
  * Build search criteria
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-
 class SearchCriteriaBuilder
 {
     /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * @var FilterBuilder
-     */
-    private $filterBuilder;
-
-    /**
-     * @var FilterGroupBuilder
-     */
-    private $filterGroupBuilder;
-
-    /**
-     * @var Builder
-     */
-    private $builder;
-
-    /**
-     * @var Visibility
-     */
-    private $visibility;
-
-    /**
-     * @var SortOrderBuilder
-     */
-    private $sortOrderBuilder;
-
-    /**
-     * @var Config
-     */
-    private Config $eavConfig;
-
-    /**
-     * @var SearchConfig
-     */
-    private SearchConfig $searchConfig;
-
-    /**
-     * @var RequestDataBuilder|mixed
-     */
-    private RequestDataBuilder $localData;
-
-    /**
-     * @param Builder $builder
      * @param ScopeConfigInterface $scopeConfig
      * @param FilterBuilder $filterBuilder
      * @param FilterGroupBuilder $filterGroupBuilder
      * @param Visibility $visibility
-     * @param SortOrderBuilder|null $sortOrderBuilder
-     * @param Config|null $eavConfig
-     * @param SearchConfig|null $searchConfig
-     * @param RequestDataBuilder|null $localData
+     * @param SortOrderBuilder $sortOrderBuilder
+     * @param ProductAttributeRepositoryInterface $productAttributeRepository
+     * @param SearchConfig $searchConfig
+     * @param RequestDataBuilder $localData
+     * @param SearchCriteriaResolverFactory $criteriaResolverFactory
+     * @param ArgumentApplierPool $argumentApplierPool
      */
     public function __construct(
-        Builder $builder,
-        ScopeConfigInterface $scopeConfig,
-        FilterBuilder $filterBuilder,
-        FilterGroupBuilder $filterGroupBuilder,
-        Visibility $visibility,
-        SortOrderBuilder $sortOrderBuilder = null,
-        Config $eavConfig = null,
-        SearchConfig $searchConfig = null,
-        RequestDataBuilder $localData = null,
+        private readonly ScopeConfigInterface $scopeConfig,
+        private readonly FilterBuilder $filterBuilder,
+        private readonly FilterGroupBuilder $filterGroupBuilder,
+        private readonly Visibility $visibility,
+        private readonly SortOrderBuilder $sortOrderBuilder,
+        private readonly ProductAttributeRepositoryInterface $productAttributeRepository,
+        private readonly SearchConfig $searchConfig,
+        private readonly RequestDataBuilder $localData,
+        private readonly SearchCriteriaResolverFactory $criteriaResolverFactory,
+        private readonly ArgumentApplierPool $argumentApplierPool,
     ) {
-        $this->scopeConfig = $scopeConfig;
-        $this->filterBuilder = $filterBuilder;
-        $this->filterGroupBuilder = $filterGroupBuilder;
-        $this->builder = $builder;
-        $this->visibility = $visibility;
-        $this->sortOrderBuilder = $sortOrderBuilder ?? ObjectManager::getInstance()->get(SortOrderBuilder::class);
-        $this->eavConfig = $eavConfig ?? ObjectManager::getInstance()->get(Config::class);
-        $this->searchConfig = $searchConfig ?? ObjectManager::getInstance()->get(SearchConfig::class);
-        $this->localData = $localData ?? ObjectManager::getInstance()->get(RequestDataBuilder::class);
     }
 
     /**
@@ -117,45 +63,41 @@ public function __construct(
      */
     public function build(array $args, bool $includeAggregation): SearchCriteriaInterface
     {
-        $partialMatchFilters = [];
+        $isSearch = isset($args['search']);
+        $requestName = $includeAggregation ? 'graphql_product_search_with_aggregation' : 'graphql_product_search';
+
         if (isset($args['filter'])) {
             $partialMatchFilters = $this->getPartialMatchFilters($args);
+            if (count($partialMatchFilters)) {
+                $this->updateMatchTypeRequestConfig($requestName, $partialMatchFilters);
+            }
             $args = $this->removeMatchTypeFromArguments($args);
         }
-        $searchCriteria = $this->builder->build('products', $args);
-        $isSearch = isset($args['search']);
-        $this->updateRangeFilters($searchCriteria);
-        if ($includeAggregation) {
-            $attributeData = $this->eavConfig->getAttribute(Product::ENTITY, 'price');
-            $priceOptions = $attributeData->getData();
 
-            if ($priceOptions['is_filterable'] != 0) {
-                $this->preparePriceAggregation($searchCriteria);
+        $searchCriteria = $this->criteriaResolverFactory->create(
+            [
+                'searchRequestName' => $requestName,
+                'currentPage' => $args['currentPage'],
+                'size' => $args['pageSize'],
+            ]
+        )->resolve();
+        foreach ($args as $argumentName => $argument) {
+            if ($this->argumentApplierPool->hasApplier($argumentName)) {
+                $argumentApplier = $this->argumentApplierPool->getApplier($argumentName);
+                $argumentApplier->applyArgument($searchCriteria, 'products', $argumentName, $argument);
             }
-            $requestName = 'graphql_product_search_with_aggregation';
-        } else {
-            $requestName = 'graphql_product_search';
-        }
-        $searchCriteria->setRequestName($requestName);
-
-        if (count($partialMatchFilters)) {
-            $this->updateMatchTypeRequestConfig($requestName, $partialMatchFilters);
         }
-
+        $this->updateRangeFilters($searchCriteria);
+        $this->preparePriceAggregation($searchCriteria, $includeAggregation);
         if ($isSearch) {
             $this->addFilter($searchCriteria, 'search_term', $args['search']);
         }
-
         if (!$searchCriteria->getSortOrders()) {
-            $this->addDefaultSortOrder($searchCriteria, $args, $isSearch);
+            $this->addDefaultSortOrder($searchCriteria, $args);
         }
-
         $this->addEntityIdSort($searchCriteria);
         $this->addVisibilityFilter($searchCriteria, $isSearch, !empty($args['filter']['category_id']));
 
-        $searchCriteria->setCurrentPage($args['currentPage'] - 1);
-        $searchCriteria->setPageSize($args['pageSize']);
-
         return $searchCriteria;
     }
 
@@ -164,7 +106,6 @@ public function build(array $args, bool $includeAggregation): SearchCriteriaInte
      *
      * @param string $requestName
      * @param array $partialMatchFilters
-     *
      * @return void
      */
     private function updateMatchTypeRequestConfig(string $requestName, array $partialMatchFilters): void
@@ -184,7 +125,6 @@ private function updateMatchTypeRequestConfig(string $requestName, array $partia
      * Check if and what type of match_type value was requested
      *
      * @param array $args
-     *
      * @return array
      */
     private function getPartialMatchFilters(array $args): array
@@ -202,7 +142,6 @@ private function getPartialMatchFilters(array $args): array
      * Remove the match_type to avoid search criteria containing it
      *
      * @param array $args
-     *
      * @return array
      */
     private function removeMatchTypeFromArguments(array $args): array
@@ -264,10 +203,21 @@ private function addEntityIdSort(SearchCriteriaInterface $searchCriteria): void
      * Prepare price aggregation algorithm
      *
      * @param SearchCriteriaInterface $searchCriteria
+     * @param bool $includeAggregation
      * @return void
      */
-    private function preparePriceAggregation(SearchCriteriaInterface $searchCriteria): void
+    private function preparePriceAggregation(SearchCriteriaInterface $searchCriteria, bool $includeAggregation): void
     {
+        if (!$includeAggregation) {
+            return;
+        }
+
+        $attributeData = $this->productAttributeRepository->get('price');
+        $priceOptions = $attributeData->getData();
+        if ((int) $priceOptions['is_filterable'] === 0) {
+            return;
+        }
+
         $priceRangeCalculation = $this->scopeConfig->getValue(
             \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -308,18 +258,17 @@ private function addFilter(
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @param array $args
-     * @param bool $isSearch
      */
-    private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, array $args, $isSearch = false): void
+    private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, array $args): void
     {
         $defaultSortOrder = [];
-        if ($isSearch) {
+        if (isset($args['search'])) {
             $defaultSortOrder[] = $this->sortOrderBuilder
                 ->setField('relevance')
                 ->setDirection(SortOrder::SORT_DESC)
                 ->create();
         } else {
-            $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
+            $categoryIdFilter = $args['filter']['category_id'] ?? false;
             if ($categoryIdFilter) {
                 if (!is_array($categoryIdFilter[array_key_first($categoryIdFilter)])
                     || count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
@@ -146,8 +146,8 @@ public function getResult(
                 'totalCount' => $totalCount,
                 'productsSearchResult' => $productArray,
                 'searchAggregation' => $itemsResults->getAggregations(),
-                'pageSize' => $searchCriteria->getPageSize(),
-                'currentPage' => $searchCriteria->getCurrentPage() + 1, //search criteria pagination starts with 0
+                'pageSize' => $args['pageSize'],
+                'currentPage' => $args['currentPage'],
                 'totalPages' => $totalPages,
                 'suggestions' => $suggestions,
             ]
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php
@@ -3,11 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
 
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
-use Magento\Framework\Data\Collection;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\Api\Search\SearchCriteria;
 
@@ -23,11 +21,6 @@ class SearchCriteriaResolver implements SearchCriteriaResolverInterface
      */
     private $builder;
 
-    /**
-     * @var Collection
-     */
-    private $collection;
-
     /**
      * @var string
      */
@@ -39,7 +32,7 @@ class SearchCriteriaResolver implements SearchCriteriaResolverInterface
     private $size;
 
     /**
-     * @var array
+     * @var array|null
      */
     private $orders;
 
@@ -49,24 +42,20 @@ class SearchCriteriaResolver implements SearchCriteriaResolverInterface
     private $currentPage;
 
     /**
-     * SearchCriteriaResolver constructor.
      * @param SearchCriteriaBuilder $builder
-     * @param Collection $collection
      * @param string $searchRequestName
      * @param int $currentPage
      * @param int $size
-     * @param array $orders
+     * @param array|null $orders
      */
     public function __construct(
         SearchCriteriaBuilder $builder,
-        Collection $collection,
         string $searchRequestName,
         int $currentPage,
         int $size,
         ?array $orders
     ) {
         $this->builder = $builder;
-        $this->collection = $collection;
         $this->searchRequestName = $searchRequestName;
         $this->currentPage = $currentPage;
         $this->size = $size;
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -418,4 +418,9 @@
             <argument name="sortExpressionBuilder" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\Builder\Sort\ExpressionBuilder</argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolver</argument>
+        </arguments>
+    </type>
 </config>
