Merge branch 'magento-commerce:2.4-develop' into ACP2E-1338

Author: bubasuma

app/code/Magento/Catalog/Model/Category/AttributeRepository.php

@@ -29,6 +29,11 @@ class AttributeRepository implements CategoryAttributeRepositoryInterface
      */
     private $eavConfig;
 
+    /**
+     * @var array
+     */
+    private $metadataCache;
+
     /**
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
@@ -48,7 +53,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
@@ -59,7 +64,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($attributeCode)
     {
@@ -70,23 +75,27 @@ public function get($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
-        $defaultAttributeSetId = $this->eavConfig
-            ->getEntityType(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
-            ->getDefaultAttributeSetId();
-        $searchCriteria = $this->searchCriteriaBuilder->addFilters(
-            [
-                $this->filterBuilder
-                    ->setField('attribute_set_id')
-                    ->setValue($defaultAttributeSetId)
-                    ->create(),
-            ]
-        );
-
-        return $this->getList($searchCriteria->create())->getItems();
+        if (!isset($this->metadataCache[$dataObjectClassName])) {
+            $defaultAttributeSetId = $this->eavConfig
+                ->getEntityType(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
+                ->getDefaultAttributeSetId();
+            $searchCriteria = $this->searchCriteriaBuilder->addFilters(
+                [
+                    $this->filterBuilder
+                        ->setField('attribute_set_id')
+                        ->setValue($defaultAttributeSetId)
+                        ->create(),
+                ]
+            );
+            $this->metadataCache[$dataObjectClassName] = $this->getList($searchCriteria->create())
+                ->getItems();
+        }
+        return $this->metadataCache[$dataObjectClassName];
     }
 }

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

@@ -7,13 +7,11 @@
 
 namespace Magento\CatalogGraphQl\Model\Category;
 
-use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Catalog\Api\Data\CategorySearchResultsInterface;
-use Magento\Catalog\Api\Data\CategorySearchResultsInterfaceFactory;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\CatalogGraphQl\Model\Resolver\Categories\DataProvider\Category\CollectionProcessorInterface;
 use Magento\CatalogGraphQl\Model\Category\Filter\SearchCriteria;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
@@ -39,16 +37,6 @@ class CategoryFilter
      */
     private $extensionAttributesJoinProcessor;
 
-    /**
-     * @var CategorySearchResultsInterfaceFactory
-     */
-    private $categorySearchResultsFactory;
-
-    /**
-     * @var CategoryRepositoryInterface
-     */
-    private $categoryRepository;
-
     /**
      * @var SearchCriteria
      */
@@ -58,23 +46,17 @@ class CategoryFilter
      * @param CollectionFactory $categoryCollectionFactory
      * @param CollectionProcessorInterface $collectionProcessor
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
-     * @param CategorySearchResultsInterfaceFactory $categorySearchResultsFactory
-     * @param CategoryRepositoryInterface $categoryRepository
      * @param SearchCriteria $searchCriteria
      */
     public function __construct(
         CollectionFactory $categoryCollectionFactory,
         CollectionProcessorInterface $collectionProcessor,
         JoinProcessorInterface $extensionAttributesJoinProcessor,
-        CategorySearchResultsInterfaceFactory $categorySearchResultsFactory,
-        CategoryRepositoryInterface $categoryRepository,
         SearchCriteria $searchCriteria
     ) {
         $this->categoryCollectionFactory = $categoryCollectionFactory;
         $this->collectionProcessor = $collectionProcessor;
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
-        $this->categorySearchResultsFactory = $categorySearchResultsFactory;
-        $this->categoryRepository = $categoryRepository;
         $this->searchCriteria = $searchCriteria;
     }
 
@@ -95,22 +77,21 @@ public function getResult(array $criteria, StoreInterface $store, array $attribu
         $this->extensionAttributesJoinProcessor->process($collection);
         $this->collectionProcessor->process($collection, $searchCriteria, $attributeNames, $context);
 
-        /** @var CategorySearchResultsInterface $searchResult */
-        $categories = $this->categorySearchResultsFactory->create();
-        $categories->setSearchCriteria($searchCriteria);
-        $categories->setItems($collection->getItems());
-        $categories->setTotalCount($collection->getSize());
+        // only fetch necessary category entity id
+        $collection
+            ->getSelect()
+            ->reset(Select::COLUMNS)
+            ->columns(
+                'e.entity_id'
+            );
 
-        $categoryIds = [];
-        foreach ($categories->getItems() as $category) {
-            $categoryIds[] = (int)$category->getId();
-        }
+        $categoryIds = $collection->load()->getLoadedIds();
 
         $totalPages = 0;
-        if ($categories->getTotalCount() > 0 && $searchCriteria->getPageSize() > 0) {
-            $totalPages = ceil($categories->getTotalCount() / $searchCriteria->getPageSize());
+        if ($collection->getSize() > 0 && $searchCriteria->getPageSize() > 0) {
+            $totalPages = ceil($collection->getSize() / $searchCriteria->getPageSize());
         }
-        if ($searchCriteria->getCurrentPage() > $totalPages && $categories->getTotalCount() > 0) {
+        if ($searchCriteria->getCurrentPage() > $totalPages && $collection->getSize() > 0) {
             throw new GraphQlInputException(
                 __(
                     'currentPage value %1 specified is greater than the %2 page(s) available.',
@@ -121,7 +102,7 @@ public function getResult(array $criteria, StoreInterface $store, array $attribu
 
         return [
             'category_ids' => $categoryIds,
-            'total_count' => $categories->getTotalCount(),
+            'total_count' => $collection->getSize(),
             'page_info' => [
                 'total_pages' => $totalPages,
                 'page_size' => $searchCriteria->getPageSize(),

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

@@ -60,8 +60,12 @@ public function hydrateCategory(Category $category, $basicFieldsOnly = false) :
         if ($basicFieldsOnly) {
             $categoryData = $category->getData();
         } else {
-            $categoryData = $this->dataObjectProcessor->buildOutputDataArray($category, CategoryInterface::class);
+            $categoryData = $this->dataObjectProcessor->buildOutputDataArray(
+                $category,
+                CategoryInterface::class
+            );
         }
+
         $categoryData['id'] = $category->getId();
         $categoryData['uid'] = $this->uidEncoder->encode((string) $category->getId());
         $categoryData['children'] = [];

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

@@ -191,6 +191,11 @@
     <type name="Magento\Catalog\Api\ProductRepositoryInterface">
         <plugin name="availableProductsFilter" type="Magento\CatalogGraphQl\Plugin\AvailableProductsFilter" />
     </type>
+    <type name="Magento\CatalogGraphQl\Model\Category\Hydrator">
+        <arguments>
+            <argument name="dataObjectProcessor" xsi:type="object">Magento\CatalogGraphQl\Category\DataObjectProcessor</argument>
+        </arguments>
+    </type>
     <virtualType name="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ChildProduct"
                  type="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product">
         <arguments>
@@ -207,4 +212,16 @@
             </argument>
         </arguments>
     </virtualType>
+    <virtualType
+        name="Magento\CatalogGraphQl\Category\DataObjectProcessor"
+        type="Magento\Framework\Reflection\DataObjectProcessor"
+    >
+        <arguments>
+            <argument name="excludedMethodsClassMap" xsi:type="array">
+                <item name="Magento\Catalog\Api\Data\CategoryInterface" xsi:type="array">
+                    <item name="getChildren" xsi:type="string">getChildren</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
 </config>

app/code/Magento/Quote/Model/Cart/AddProductsToCart.php

@@ -7,8 +7,6 @@
 
 namespace Magento\Quote\Model\Cart;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Cart\BuyRequest\BuyRequestBuilder;
@@ -23,29 +21,6 @@
  */
 class AddProductsToCart
 {
-    /**#@+
-     * Error message codes
-     */
-    private const ERROR_PRODUCT_NOT_FOUND = 'PRODUCT_NOT_FOUND';
-    private const ERROR_INSUFFICIENT_STOCK = 'INSUFFICIENT_STOCK';
-    private const ERROR_NOT_SALABLE = 'NOT_SALABLE';
-    private const ERROR_UNDEFINED = 'UNDEFINED';
-    /**#@-*/
-
-    /**
-     * List of error messages and codes.
-     */
-    private const MESSAGE_CODES = [
-        'Could not find a product with SKU' => self::ERROR_PRODUCT_NOT_FOUND,
-        'The required options you selected are not available' => self::ERROR_NOT_SALABLE,
-        'Product that you are trying to add is not available.' => self::ERROR_NOT_SALABLE,
-        'This product is out of stock' => self::ERROR_INSUFFICIENT_STOCK,
-        'There are no source items' => self::ERROR_NOT_SALABLE,
-        'The fewest you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
-        'The most you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
-        'The requested qty is not available' => self::ERROR_INSUFFICIENT_STOCK,
-    ];
-
     /**
      * @var CartRepositoryInterface
      */
@@ -67,25 +42,29 @@ class AddProductsToCart
     private $productReader;
 
     /**
-     * @param ProductRepositoryInterface $productRepository
+     * @var AddProductsToCartError
+     */
+    private $error;
+
+    /**
      * @param CartRepositoryInterface $cartRepository
      * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param BuyRequestBuilder $requestBuilder
-     * @param ProductReaderInterface|null $productReader
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @param ProductReaderInterface $productReader
+     * @param AddProductsToCartError $addProductsToCartError
      */
     public function __construct(
-        ProductRepositoryInterface $productRepository,
         CartRepositoryInterface $cartRepository,
         MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
         BuyRequestBuilder $requestBuilder,
-        ProductReaderInterface $productReader = null
+        ProductReaderInterface $productReader,
+        AddProductsToCartError $addProductsToCartError
     ) {
         $this->cartRepository = $cartRepository;
         $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->requestBuilder = $requestBuilder;
-        $this->productReader = $productReader ?: ObjectManager::getInstance()->get(ProductReaderInterface::class);
+        $this->productReader = $productReader;
+        $this->error = $addProductsToCartError;
     }
 
     /**
@@ -106,7 +85,7 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
 
             /** @var MessageInterface $error */
             foreach ($errors as $error) {
-                $allErrors[] = $this->createError($error->getText());
+                $allErrors[] = $this->error->create($error->getText());
             }
         }
 
@@ -181,22 +160,22 @@ private function addItemToCart(Quote $cart, Data\CartItem $cartItem, int $cartIt
         $result = null;
 
         if ($cartItem->getQuantity() <= 0) {
-            $errors[] = $this->createError(
+            $errors[] = $this->error->create(
                 __('The product quantity should be greater than 0')->render(),
                 $cartItemPosition
             );
         } else {
             $product = $this->productReader->getProductBySku($sku);
             if (!$product || !$product->isSaleable() || !$product->isAvailable()) {
-                $errors[] = $this->createError(
+                $errors[] = $this->error->create(
                     __('Could not find a product with SKU "%sku"', ['sku' => $sku])->render(),
                     $cartItemPosition
                 );
             } else {
                 try {
                     $result = $cart->addProduct($product, $this->requestBuilder->build($cartItem));
                 } catch (\Throwable $e) {
-                    $errors[] = $this->createError(
+                    $errors[] = $this->error->create(
                         __($e->getMessage())->render(),
                         $cartItemPosition
                     );
@@ -205,50 +184,14 @@ private function addItemToCart(Quote $cart, Data\CartItem $cartItem, int $cartIt
 
             if (is_string($result)) {
                 foreach (array_unique(explode("\n", $result)) as $error) {
-                    $errors[] = $this->createError(__($error)->render(), $cartItemPosition);
+                    $errors[] = $this->error->create(__($error)->render(), $cartItemPosition);
                 }
             }
         }
 
         return $errors;
     }
 
-    /**
-     * Returns an error object
-     *
-     * @param string $message
-     * @param int $cartItemPosition
-     * @return Data\Error
-     */
-    private function createError(string $message, int $cartItemPosition = 0): Data\Error
-    {
-        return new Data\Error(
-            $message,
-            $this->getErrorCode($message),
-            $cartItemPosition
-        );
-    }
-
-    /**
-     * Get message error code.
-     *
-     * TODO: introduce a separate class for getting error code from a message
-     *
-     * @param string $message
-     * @return string
-     */
-    private function getErrorCode(string $message): string
-    {
-        foreach (self::MESSAGE_CODES as $codeMessage => $code) {
-            if (false !== stripos($message, $codeMessage)) {
-                return $code;
-            }
-        }
-
-        /* If no code was matched, return the default one */
-        return self::ERROR_UNDEFINED;
-    }
-
     /**
      * Creates a new output from existing errors
      *