Merge remote-tracking branch 'origin/AC-14464' into spartans_pr_29102025

Author: glo60612

app/code/Magento/WishlistGraphQl/Model/Resolver/Wishlist/AddToCart.php

@@ -7,35 +7,33 @@
 
 namespace Magento\WishlistGraphQl\Model\Resolver\Wishlist;
 
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
 use Magento\QuoteGraphQl\Model\Cart\CreateEmptyCartForCustomer;
 use Magento\Quote\Model\Cart\AddProductsToCart as AddProductsToCartService;
 use Magento\Quote\Model\Cart\Data\CartItemFactory;
 use Magento\Quote\Model\Cart\Data\Error;
 use Magento\WishlistGraphQl\Mapper\WishlistDataMapper;
 use Magento\WishlistGraphQl\Model\CartItems\CartItemsRequestBuilder;
-use Magento\Wishlist\Model\LocaleQuantityProcessor;
 use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemsCollection;
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResourceModel;
 use Magento\Wishlist\Model\Wishlist;
 use Magento\Wishlist\Model\WishlistFactory;
-use Magento\Wishlist\Model\Wishlist\AddProductsToWishlist as AddProductsToWishlistModel;
 use Magento\Wishlist\Model\Wishlist\Config as WishlistConfig;
 
 /**
  * Adding products to wishlist resolver
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddToCart implements ResolverInterface
 {
-    /**
-     * @var AddProductsToWishlistModel
-     */
-    private $addProductsToWishlist;
-
     /**
      * @var WishlistDataMapper
      */
@@ -56,11 +54,6 @@ class AddToCart implements ResolverInterface
      */
     private $wishlistFactory;
 
-    /**
-     * @var LocaleQuantityProcessor
-     */
-    private $quantityProcessor;
-
     /**
      * @var CreateEmptyCartForCustomer
      */
@@ -76,41 +69,53 @@ class AddToCart implements ResolverInterface
      */
     private $cartItemsRequestBuilder;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
     /**
      * @param WishlistResourceModel $wishlistResource
      * @param WishlistFactory $wishlistFactory
      * @param WishlistConfig $wishlistConfig
-     * @param AddProductsToWishlistModel $addProductsToWishlist
      * @param WishlistDataMapper $wishlistDataMapper
-     * @param LocaleQuantityProcessor $quantityProcessor
      * @param CreateEmptyCartForCustomer $createEmptyCartForCustomer
      * @param AddProductsToCartService $addProductsToCart
      * @param CartItemsRequestBuilder $cartItemsRequestBuilder
+     * @param CartRepositoryInterface $cartRepository
+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      */
     public function __construct(
         WishlistResourceModel $wishlistResource,
         WishlistFactory $wishlistFactory,
         WishlistConfig $wishlistConfig,
-        AddProductsToWishlistModel $addProductsToWishlist,
         WishlistDataMapper $wishlistDataMapper,
-        LocaleQuantityProcessor $quantityProcessor,
         CreateEmptyCartForCustomer $createEmptyCartForCustomer,
         AddProductsToCartService $addProductsToCart,
-        CartItemsRequestBuilder $cartItemsRequestBuilder
+        CartItemsRequestBuilder $cartItemsRequestBuilder,
+        CartRepositoryInterface $cartRepository,
+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
     ) {
         $this->wishlistResource = $wishlistResource;
         $this->wishlistFactory = $wishlistFactory;
         $this->wishlistConfig = $wishlistConfig;
-        $this->addProductsToWishlist = $addProductsToWishlist;
         $this->wishlistDataMapper = $wishlistDataMapper;
-        $this->quantityProcessor = $quantityProcessor;
         $this->createEmptyCartForCustomer = $createEmptyCartForCustomer;
         $this->addProductsToCartService = $addProductsToCart;
         $this->cartItemsRequestBuilder = $cartItemsRequestBuilder;
+        $this->cartRepository = $cartRepository;
+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
     }
 
     /**
      * @inheritdoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function resolve(
         Field $field,
@@ -151,7 +156,9 @@ public function resolve(
         if (!empty($itemIds)) {
             $unknownItemIds = array_diff($itemIds, array_keys($collection->getItems()));
             if (!empty($unknownItemIds)) {
-                throw new GraphQlInputException(__('The wishlist item ids "'.implode(',', $unknownItemIds).'" were not found.'));
+                throw new GraphQlInputException(
+                    __('The wishlist item ids "'.implode(',', $unknownItemIds).'" were not found.')
+                );
             }
         }
         $maskedCartId = $this->createEmptyCartForCustomer->execute($customerId);
@@ -183,7 +190,10 @@ function (Error $error) use ($item, $wishlist) {
                 $item->delete();
                 $addedProducts[] = $item->getProductId();
             }
-            $cartErrors = array_merge($cartErrors, $errors);
+            if (!empty($errors)) {
+                $this->saveCart($maskedCartId);
+            }
+            $cartErrors = [...$cartErrors, ...$errors];
         }
         if (!empty($addedProducts)) {
             $wishlist->save();
@@ -219,9 +229,11 @@ private function getWishlist(?int $wishlistId, ?int $customerId): Wishlist
     /**
      * Get customer wishlist items
      *
+     * @param Wishlist $wishlist
      * @param array $itemIds
      *
      * @return WishlistItemsCollection
+     * @throws NoSuchEntityException
      */
     private function getWishlistItems(Wishlist $wishlist, array $itemIds): WishlistItemsCollection
     {
@@ -233,4 +245,22 @@ private function getWishlistItems(Wishlist $wishlist, array $itemIds): WishlistI
         }
         return $collection;
     }
+
+    /**
+     * Save cart on error while adding wishlist product to cart
+     *
+     * @param string $maskedCartId
+     * @return void
+     * @throws GraphQlInputException
+     */
+    private function saveCart(string $maskedCartId): void
+    {
+        try {
+            $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedCartId);
+            $cart = $this->cartRepository->get($cartId);
+            $this->cartRepository->save($cart);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlInputException(__('The wishlist could not be saved.'));
+        }
+    }
 }