ACP2E-2151: GraphQL GetCategories query works slowly and generates 1K SQL queries

- fix

Author: o-dubovyk

app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php

@@ -125,10 +125,6 @@ public function resolve(
             return [];
         }
 
-        if (!$product->getTierPrices()) {
-            return [];
-        }
-
         $productId = (int)$product->getId();
         $this->tiers->addProductFilter($productId);
 

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Price/Provider.php

@@ -17,40 +17,68 @@
  */
 class Provider implements ProviderInterface
 {
+    /**
+     * @var array
+     */
+    private $minimalPrice = [
+        FinalPrice::PRICE_CODE => [],
+        RegularPrice::PRICE_CODE => []
+    ];
+
+    /**
+     * @var array
+     */
+    private $maximalPrice = [
+        FinalPrice::PRICE_CODE => [],
+        RegularPrice::PRICE_CODE => []
+    ];
+
     /**
      * @inheritdoc
      */
     public function getMinimalFinalPrice(SaleableInterface $product): AmountInterface
     {
-        /** @var FinalPrice $finalPrice */
-        $finalPrice =  $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE);
-        return $finalPrice->getMinimalPrice();
+        if (!isset($this->minimalPrice[FinalPrice::PRICE_CODE][$product->getId()])) {
+            /** @var FinalPrice $finalPrice */
+            $finalPrice = $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE);
+            $this->minimalPrice[FinalPrice::PRICE_CODE][$product->getId()] = $finalPrice->getMinimalPrice();
+        }
+        return $this->minimalPrice[FinalPrice::PRICE_CODE][$product->getId()];
     }
 
     /**
      * @inheritdoc
      */
     public function getMinimalRegularPrice(SaleableInterface $product): AmountInterface
     {
-        return $this->getRegularPrice($product);
+        if (!isset($this->minimalPrice[RegularPrice::PRICE_CODE][$product->getId()])) {
+            $this->minimalPrice[RegularPrice::PRICE_CODE][$product->getId()] = $this->getRegularPrice($product);
+        }
+        return $this->minimalPrice[RegularPrice::PRICE_CODE][$product->getId()];
     }
 
     /**
      * @inheritdoc
      */
     public function getMaximalFinalPrice(SaleableInterface $product): AmountInterface
     {
-        /** @var FinalPrice $finalPrice */
-        $finalPrice = $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE);
-        return $finalPrice->getMaximalPrice();
+        if (!isset($this->maximalPrice[FinalPrice::PRICE_CODE][$product->getId()])) {
+            /** @var FinalPrice $finalPrice */
+            $finalPrice =  $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE);
+            $this->maximalPrice[FinalPrice::PRICE_CODE][$product->getId()] = $finalPrice->getMaximalPrice();
+        }
+        return $this->maximalPrice[FinalPrice::PRICE_CODE][$product->getId()];
     }
 
     /**
      * @inheritdoc
      */
     public function getMaximalRegularPrice(SaleableInterface $product): AmountInterface
     {
-        return $this->getRegularPrice($product);
+        if (!isset($this->maximalPrice[RegularPrice::PRICE_CODE][$product->getId()])) {
+            $this->maximalPrice[RegularPrice::PRICE_CODE][$product->getId()] = $this->getRegularPrice($product);
+        }
+        return $this->maximalPrice[RegularPrice::PRICE_CODE][$product->getId()];
     }
 
     /**

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Product/Price/Provider.php

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider as CatalogPriceProvider;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface;
 use Magento\ConfigurableProduct\Pricing\Price\ConfigurableOptionsProviderInterfaceFactory;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
@@ -52,17 +53,25 @@ class Provider implements ProviderInterface, ResetAfterRequestInterface
         RegularPrice::PRICE_CODE => []
     ];
 
+    /**
+     * @var CatalogPriceProvider
+     */
+    private $catalogPriceProvider;
+
     /**
      * @param ConfigurableOptionsProviderInterfaceFactory $optionsProviderFactory
      * @param BaseFactory $amountFactory
+     * @param CatalogPriceProvider $catalogPriceProvider
      */
     public function __construct(
         ConfigurableOptionsProviderInterfaceFactory $optionsProviderFactory,
-        BaseFactory $amountFactory
+        BaseFactory $amountFactory,
+        CatalogPriceProvider $catalogPriceProvider
     ) {
         $this->optionsProvider = $optionsProviderFactory->create();
         $this->optionsProviderFactory = $optionsProviderFactory;
         $this->amountFactory = $amountFactory;
+        $this->catalogPriceProvider = $catalogPriceProvider;
     }
 
     /**
@@ -117,7 +126,13 @@ private function getMinimalPrice(SaleableInterface $product, string $code): Amou
         if (!isset($this->minimalPrice[$code][$product->getId()])) {
             $minimumAmount = null;
             foreach ($this->optionsProvider->getProducts($product) as $variant) {
-                $variantAmount = $variant->getPriceInfo()->getPrice($code)->getAmount();
+                $variantAmount = null;
+                if ($code === FinalPrice::PRICE_CODE) {
+                    $variantAmount = $this->catalogPriceProvider->getMinimalFinalPrice($variant);
+                } elseif ($code === RegularPrice::PRICE_CODE) {
+                    $variantAmount = $this->catalogPriceProvider->getMinimalRegularPrice($variant);
+                }
+
                 if (!$minimumAmount || ($variantAmount->getValue() < $minimumAmount->getValue())) {
                     $minimumAmount = $variantAmount;
                     $this->minimalPrice[$code][$product->getId()] = $variantAmount;
@@ -140,7 +155,13 @@ private function getMaximalPrice(SaleableInterface $product, string $code): Amou
         if (!isset($this->maximalPrice[$code][$product->getId()])) {
             $maximumAmount = null;
             foreach ($this->optionsProvider->getProducts($product) as $variant) {
-                $variantAmount = $variant->getPriceInfo()->getPrice($code)->getAmount();
+                $variantAmount = null;
+                if ($code === FinalPrice::PRICE_CODE) {
+                    $variantAmount = $this->catalogPriceProvider->getMaximalFinalPrice($variant);
+                } elseif ($code === RegularPrice::PRICE_CODE) {
+                    $variantAmount = $this->catalogPriceProvider->getMaximalRegularPrice($variant);
+                }
+
                 if (!$maximumAmount || ($variantAmount->getValue() > $maximumAmount->getValue())) {
                     $maximumAmount = $variantAmount;
                     $this->maximalPrice[$code][$product->getId()] = $variantAmount;