Merge branch '2.4-develop' into comm_78764_32435

Author: sidolov

app/code/Magento/BundleGraphQl/etc/graphql/di.xml

@@ -114,22 +114,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\BundleGraphQl\Model\Resolver\Options\Label">
-        <arguments>
-            <argument name="product" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct</argument>
-        </arguments>
-    </type>
-    <type name="Magento\BundleGraphQl\Model\Resolver\PriceRange">
-        <arguments>
-            <argument name="productDataProvider" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct</argument>
-        </arguments>
-    </type>
-    <virtualType name="Magento\BundleGraphQl\Model\Resolver\Options\Product"
-                 type="Magento\CatalogGraphQl\Model\Resolver\Product">
-        <arguments>
-            <argument name="productDataProvider" xsi:type="object">
-                Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\ChildProduct
-            </argument>
-        </arguments>
-    </virtualType>
 </config>

app/code/Magento/BundleGraphQl/etc/schema.graphqls

@@ -69,7 +69,7 @@ type BundleItemOption @doc(description: "Defines the characteristics that compri
     price: Float @doc(description: "The price of the selected option.")
     price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")
     can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")
-    product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\Product")
+    product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
     uid: ID! @doc(description: "The unique ID for a `BundleItemOption` object.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid")
 }
 

app/code/Magento/Catalog/Model/ResourceModel/Product/ChildCollectionFactory.php

@@ -67,7 +67,7 @@ public function __construct(
      * @param StoreInterface $store
      * @param array $attributeNames
      * @param ContextInterface $context
-     * @return int[]
+     * @return array
      * @throws InputException
      */
     public function getResult(array $criteria, StoreInterface $store, array $attributeNames, ContextInterface $context)
@@ -84,6 +84,7 @@ public function getResult(array $criteria, StoreInterface $store, array $attribu
             ->columns(
                 'e.entity_id'
             );
+        $collection->setOrder('entity_id');
 
         $categoryIds = $collection->load()->getLoadedIds();
 

app/code/Magento/Catalog/Model/ResourceModel/Product/CollectionFactory.php

@@ -7,9 +7,11 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Categories\DataProvider\Category\CollectionProcessor;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\CatalogGraphQl\Model\Resolver\Categories\DataProvider\Category\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\DB\Sql\Expression;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface as SearchCriteriaCollectionProcessor;
 
@@ -20,16 +22,26 @@
  */
 class CatalogProcessor implements CollectionProcessorInterface
 {
-    /** @var SearchCriteriaCollectionProcessor */
+    /**
+     * @var SearchCriteriaCollectionProcessor
+     */
     private $collectionProcessor;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param SearchCriteriaCollectionProcessor $collectionProcessor
+     * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
-        SearchCriteriaCollectionProcessor $collectionProcessor
+        SearchCriteriaCollectionProcessor $collectionProcessor,
+        CategoryRepositoryInterface $categoryRepository
     ) {
         $this->collectionProcessor = $collectionProcessor;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -50,26 +62,27 @@ public function process(
     ): Collection {
         $this->collectionProcessor->process($searchCriteria, $collection);
         $store = $context->getExtensionAttributes()->getStore();
-        $this->addRootCategoryFilterForStore($collection, (string) $store->getRootCategoryId());
-
+        $category = $this->categoryRepository->get($store->getRootCategoryId());
+        $this->addRootCategoryFilterForStoreByPath($collection, $category->getPath());
         return $collection;
     }
 
     /**
      * Add filtration based on the store root category id
      *
      * @param Collection $collection
-     * @param string $rootCategoryId
+     * @param string $storeRootCategoryPath
      */
-    private function addRootCategoryFilterForStore(Collection $collection, string $rootCategoryId) : void
+    private function addRootCategoryFilterForStoreByPath(Collection $collection, string $storeRootCategoryPath) : void
     {
-        $select = $collection->getSelect();
-        $connection = $collection->getConnection();
-        $select->where(
-            $connection->quoteInto(
-                'e.path LIKE ? OR e.entity_id=' . $connection->quote($rootCategoryId, 'int'),
-                '%/' . $rootCategoryId . '/%'
-            )
+        $collection->addFieldToFilter(
+            'path',
+            [
+                ['eq' => $storeRootCategoryPath],
+                ['like' => new Expression(
+                    $collection->getConnection()->quoteInto('?', $storeRootCategoryPath . '/%')
+                )]
+            ]
         );
     }
 }

app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php

@@ -98,7 +98,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $rootCategoryIds = $filterResult['category_ids'] ?? [];
 
-        $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info, $store, $context);
+        $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info, $context);
         return $filterResult;
     }
 
@@ -107,31 +107,22 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      *
      * @param array $categoryIds
      * @param ResolveInfo $info
-     * @param StoreInterface $store
      * @param ContextInterface $context
      * @return array
      */
     private function fetchCategories(
         array $categoryIds,
         ResolveInfo $info,
-        StoreInterface $store,
         ContextInterface $context
     ) {
-        $fetchedCategories = [];
-        foreach ($categoryIds as $categoryId) {
-            /* Search Criteria is created for compatibility */
-            $searchCriteria = $this->searchCriteriaFactory->create();
-            $categoryTree = $this->categoryTree->getFilteredTree(
-                $info,
-                $categoryId,
-                $searchCriteria,
-                $store,
-                [],
-                $context
-            );
-            $fetchedCategories[] = current($this->extractDataFromCategoryTree->execute($categoryTree));
-        }
-
-        return $fetchedCategories;
+        $searchCriteria = $this->searchCriteriaFactory->create();
+        $categoryCollection = $this->categoryTree->getFlatCategoriesByRootIds(
+            $info,
+            $categoryIds,
+            $searchCriteria,
+            [],
+            $context
+        );
+        return $this->extractDataFromCategoryTree->buildTree($categoryCollection, $categoryIds);
     }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories/DataProvider/Category/CollectionProcessor/CatalogProcessor.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\CatalogGraphQl\Model\Category\Filter\SearchCriteria;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\GraphQl\Model\Query\ContextInterface;
@@ -89,47 +90,45 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             $processedArgs = $this->argsSelection->process($info->fieldName, $args);
             $filterResults = $this->categoryFilter->getResult($processedArgs, $store, [], $context);
 
-            $rootCategoryIds = $filterResults['category_ids'];
+            $topLevelCategoryIds = $filterResults['category_ids'];
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
-        return $this->fetchCategories($rootCategoryIds, $info, $processedArgs, $store, [], $context);
+
+        return $this->fetchCategoriesByTopLevelIds($topLevelCategoryIds, $info, $processedArgs, [], $context);
     }
 
     /**
      * Fetch category tree data
      *
-     * @param array $categoryIds
+     * @param array $topLevelCategoryIds
      * @param ResolveInfo $info
-     * @param array $criteria
-     * @param StoreInterface $store
+     * @param array $processedArgs
      * @param array $attributeNames
      * @param ContextInterface $context
      * @return array
      * @throws LocalizedException
      */
-    private function fetchCategories(
-        array $categoryIds,
+    private function fetchCategoriesByTopLevelIds(
+        array $topLevelCategoryIds,
         ResolveInfo $info,
-        array $criteria,
-        StoreInterface $store,
+        array $processedArgs,
         array $attributeNames,
         ContextInterface $context
     ) : array {
-        $fetchedCategories = [];
-        foreach ($categoryIds as $categoryId) {
-            $searchCriteria = $this->searchCriteria->buildCriteria($criteria, $store);
-            $categoryTree = $this->categoryTree->getFilteredTree(
-                $info,
-                $categoryId,
-                $searchCriteria,
-                $store,
-                $attributeNames,
-                $context
-            );
-            $fetchedCategories[] = current($this->extractDataFromCategoryTree->execute($categoryTree));
-        }
-
-        return $fetchedCategories;
+        // pagination must be applied to top level category results, children categories are not paginated
+        $processedArgs['pageSize'] = 0;
+        $searchCriteria = $this->searchCriteria->buildCriteria(
+            $processedArgs,
+            $context->getExtensionAttributes()->getStore()
+        );
+        $categoryCollection = $this->categoryTree->getFlatCategoriesByRootIds(
+            $info,
+            $topLevelCategoryIds,
+            $searchCriteria,
+            $attributeNames,
+            $context
+        );
+        return $this->extractDataFromCategoryTree->buildTree($categoryCollection, $topLevelCategoryIds);
     }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/CategoriesQuery.php

@@ -24,7 +24,7 @@ class CategoryTree implements ResolverInterface
     /**
      * Name of type in GraphQL
      */
-    const CATEGORY_INTERFACE = 'CategoryInterface';
+    public const CATEGORY_INTERFACE = 'CategoryInterface';
 
     /**
      * @var CategoryTreeDataProvider
@@ -72,13 +72,13 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             $this->checkCategoryIsActive->execute($rootCategoryId);
         }
         $store = $context->getExtensionAttributes()->getStore();
-        $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId, (int)$store->getId());
+        $categoriesTree = $this->categoryTree->getTreeCollection($info, $rootCategoryId, (int)$store->getId());
 
-        if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
+        if ($categoriesTree->count() == 0) {
             throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }
 
-        $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
+        $result = $this->extractDataFromCategoryTree->buildTree($categoriesTree, [$rootCategoryId]);
         return current($result);
     }
 }