Merge pull request #7762 from magento-arcticfoxes/B2B-2379

B2B-2379: Cart is being loaded twice in multiple graphql mutation

Author: joanhe

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

@@ -8,6 +8,8 @@
 namespace Magento\Quote\Model\Cart;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Cart\BuyRequest\BuyRequestBuilder;
@@ -65,22 +67,32 @@ class AddProductsToCart
      */
     private $requestBuilder;
 
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param CartRepositoryInterface $cartRepository
      * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param BuyRequestBuilder $requestBuilder
+     * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
         CartRepositoryInterface $cartRepository,
         MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
-        BuyRequestBuilder $requestBuilder
+        BuyRequestBuilder $requestBuilder,
+        SearchCriteriaBuilder $searchCriteriaBuilder = null
     ) {
         $this->productRepository = $productRepository;
         $this->cartRepository = $cartRepository;
         $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->requestBuilder = $requestBuilder;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()->get(
+            SearchCriteriaBuilder::class
+        );
     }
 
     /**
@@ -145,6 +157,16 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
     public function addItemsToCart(Quote $cart, array $cartItems): array
     {
         $failedCartItems = [];
+        $cartItemSkus = \array_map(
+            function ($item) {
+                return $item->getSku();
+            },
+            $cartItems
+        );
+
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('sku', $cartItemSkus, 'in')->create();
+        // getList() call caches product models in runtime cache
+        $this->productRepository->getList($searchCriteria)->getItems();
 
         foreach ($cartItems as $cartItemPosition => $cartItem) {
             $errors = $this->addItemToCart($cart, $cartItem, $cartItemPosition);
@@ -178,7 +200,7 @@ private function addItemToCart(Quote $cart, Data\CartItem $cartItem, int $cartIt
             );
         } else {
             try {
-                $product = $this->productRepository->get($sku, false, null, true);
+                $product = $this->productRepository->get($sku, false, $cart->getStoreId(), false);
             } catch (NoSuchEntityException $e) {
                 $errors[] = $this->createError(
                     __('Could not find a product with SKU "%sku"', ['sku' => $sku])->render(),

app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php

@@ -90,7 +90,6 @@ private function run($context, ?array $args): array
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->addProductsToCart->execute($cart, $cartItems);
-        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
 
         return [
             'cart' => [

app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php

@@ -85,7 +85,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new LocalizedException(__($e->getMessage()), $e);
         }
 
-        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId, $storeId);
         return [
             'cart' => [
                 'model' => $cart,

app/code/Magento/QuoteGraphQl/Model/Resolver/SetBillingAddressOnCart.php

@@ -69,7 +69,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
         $this->setBillingAddressOnCart->execute($context, $cart, $billingAddress);
-        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
 
         return [
             'cart' => [

app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php

@@ -69,7 +69,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
         $this->setPaymentMethodOnCart->execute($cart, $paymentData);
-        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
 
         return [
             'cart' => [

app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingAddressesOnCart.php

@@ -69,8 +69,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
         $this->setShippingAddressesOnCart->execute($context, $cart, $shippingAddresses);
-        // reload updated cart
-        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
 
         return [
             'cart' => [

app/code/Magento/QuoteGraphQl/Model/Resolver/SetShippingMethodsOnCart.php

@@ -69,7 +69,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
         $this->setShippingMethodsOnCart->execute($context, $cart, $shippingMethods);
-        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
 
         return [
             'cart' => [

app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php

@@ -94,7 +94,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }
 
-        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         return [
             'cart' => [
                 'model' => $cart,