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

Author: dhorytskyi

app/code/Magento/CatalogGraphQl/Test/Unit/DataProvider/Product/SearchCriteriaBuilderTest.php

@@ -7,21 +7,22 @@
 
 namespace Magento\CatalogGraphQl\Test\Unit\DataProvider\Product;
 
-use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\CatalogGraphQl\DataProvider\Product\RequestDataBuilder;
 use Magento\CatalogGraphQl\DataProvider\Product\SearchCriteriaBuilder;
-use Magento\Eav\Model\Config;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
 use Magento\Framework\Api\Filter;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\FilterGroupBuilder;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\SearchCriteria;
 use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-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;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -32,32 +33,27 @@
 class SearchCriteriaBuilderTest extends TestCase
 {
     /**
-     * @var ScopeConfigInterface
+     * @var ScopeConfigInterface|MockObject
      */
     private ScopeConfigInterface $scopeConfig;
 
     /**
-     * @var FilterBuilder
+     * @var FilterBuilder|MockObject
      */
     private FilterBuilder $filterBuilder;
 
     /**
-     * @var FilterGroupBuilder
+     * @var FilterGroupBuilder|MockObject
      */
     private FilterGroupBuilder $filterGroupBuilder;
 
     /**
-     * @var Builder
-     */
-    private Builder $builder;
-
-    /**
-     * @var Visibility
+     * @var Visibility|MockObject
      */
     private Visibility $visibility;
 
     /**
-     * @var SortOrderBuilder
+     * @var SortOrderBuilder|MockObject
      */
     private SortOrderBuilder $sortOrderBuilder;
 
@@ -67,43 +63,58 @@ class SearchCriteriaBuilderTest extends TestCase
     private SearchCriteriaBuilder $model;
 
     /**
-     * @var Config
+     * @var ProductAttributeRepositoryInterface|MockObject
+     */
+    private ProductAttributeRepositoryInterface $productAttributeRepository;
+
+    /**
+     * @var SearchConfig|MockObject
      */
-    private Config $eavConfig;
+    private SearchConfig $searchConfig;
+
+    /**
+     * @var RequestDataBuilder|MockObject
+     */
+    private RequestDataBuilder $localData;
+
+    /**
+     * @var SearchCriteriaResolverFactory|MockObject
+     */
+    private SearchCriteriaResolverFactory $criteriaResolverFactory;
+
+    /**
+     * @var ArgumentApplierPool|MockObject
+     */
+    private ArgumentApplierPool $argumentApplierPool;
 
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         parent::setUp();
-        $objectManagerHelper = new ObjectManagerHelper($this);
-        $objects = [
-            [
-                SearchConfig::class,
-                $this->createMock(SearchConfig::class)
-            ],
-            [
-                RequestDataBuilder::class,
-                $this->createMock(RequestDataBuilder::class)
-            ]
-        ];
-        $objectManagerHelper->prepareObjectManager($objects);
-        $this->builder = $this->createMock(Builder::class);
+
         $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
         $this->filterBuilder = $this->createMock(FilterBuilder::class);
         $this->filterGroupBuilder = $this->createMock(FilterGroupBuilder::class);
         $this->sortOrderBuilder = $this->createMock(SortOrderBuilder::class);
         $this->visibility = $this->createMock(Visibility::class);
-        $this->eavConfig = $this->createMock(Config::class);
+        $this->productAttributeRepository = $this->createMock(ProductAttributeRepositoryInterface::class);
+        $this->searchConfig = $this->createMock(SearchConfig::class);
+        $this->localData = $this->createMock(RequestDataBuilder::class);
+        $this->criteriaResolverFactory = $this->createMock(SearchCriteriaResolverFactory::class);
+        $this->argumentApplierPool = $this->createMock(ArgumentApplierPool::class);
         $this->model = new SearchCriteriaBuilder(
-            $this->builder,
             $this->scopeConfig,
             $this->filterBuilder,
             $this->filterGroupBuilder,
             $this->visibility,
             $this->sortOrderBuilder,
-            $this->eavConfig
+            $this->productAttributeRepository,
+            $this->searchConfig,
+            $this->localData,
+            $this->criteriaResolverFactory,
+            $this->argumentApplierPool,
         );
     }
 
@@ -112,24 +123,24 @@ public function testBuild(): void
         $args = ['search' => '', 'pageSize' => 20, 'currentPage' => 1];
 
         $filter = $this->createMock(Filter::class);
-
-        $searchCriteria = $this->getMockBuilder(SearchCriteriaInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $searchCriteria = $this->createMock(SearchCriteria::class);
         $attributeInterface = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
         $attributeInterface->setData(['is_filterable' => 0]);
 
-        $this->builder->expects($this->any())
-            ->method('build')
-            ->with('products', $args)
+        $searchCriteriaResolver = $this->createMock(SearchCriteriaResolverInterface::class);
+        $this->criteriaResolverFactory->expects(self::once())
+            ->method('create')
+            ->willReturn($searchCriteriaResolver);
+        $searchCriteriaResolver->expects(self::once())
+            ->method('resolve')
             ->willReturn($searchCriteria);
         $searchCriteria->expects($this->any())->method('getFilterGroups')->willReturn([]);
-        $this->eavConfig->expects($this->any())
-            ->method('getAttribute')
-            ->with(Product::ENTITY, 'price')
+        $this->productAttributeRepository->expects(self::once())
+            ->method('get')
+            ->with('price')
             ->willReturn($attributeInterface);
         $sortOrderList = ['relevance', 'entity_id'];
 
@@ -149,8 +160,6 @@ public function testBuild(): void
             ->method('create')
             ->willReturn([]);
 
-        $filterOrderList = ['search_term', 'visibility'];
-
         $this->filterBuilder->expects($this->exactly(2))
             ->method('setField')
             ->willReturnCallback(function ($filterOrderList) {

app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Products/Query/SearchTest.php

@@ -119,7 +119,7 @@ protected function setUp(): void
 
     public function testPopulateSearchQueryStats(): void
     {
-        $args = ['search' => 'test'];
+        $args = ['search' => 'test', 'pageSize' => 10, 'currentPage' => 1];
         $context = $this->getMockBuilder(ContextInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();

app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php

@@ -53,7 +53,7 @@ public function __construct(
         string $searchRequestName,
         int $currentPage,
         int $size,
-        ?array $orders
+        ?array $orders = null
     ) {
         $this->builder = $builder;
         $this->searchRequestName = $searchRequestName;