Merge pull request #10020 from magento-lynx/graphql-api-enhancements

Author: svera

app/code/Magento/Checkout/Model/Config.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+class Config
+{
+    public const CART_PREFERENCE_CUSTOMER = "customer";
+    public const CART_PREFERENCE_GUEST = "guest";
+    private const XML_PATH_CART_MERGE_PREFERENCE = 'checkout/cart/cart_merge_preference';
+
+    /**
+     * Config Constructor
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        private readonly ScopeConfigInterface $scopeConfig
+    ) {
+    }
+
+    /**
+     * Get Cart Merge Preference config to update cart quantities
+     *
+     * @return string
+     */
+    public function getCartMergePreference(): string
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_CART_MERGE_PREFERENCE);
+    }
+}

app/code/Magento/Checkout/Model/Config/Source/CartMergePreference.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Model\Config\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+class CartMergePreference implements OptionSourceInterface
+{
+    /**
+     * Retrieve options for cart merge preference
+     *
+     * @return array[]
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            ['value' => 'guest', 'label' => __('Guest Priority – Override with guest cart quantity')],
+            ['value' => 'customer', 'label' => __('Customer Priority – Override with customer cart quantity')],
+            ['value' => 'merge', 'label' => __('Merge Quantities – Merge quantities of customer and guest cart')]
+        ];
+    }
+}

app/code/Magento/Checkout/etc/adminhtml/system.xml

@@ -57,6 +57,11 @@
                     <label>Enable Clear Shopping Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="cart_merge_preference" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Cart Merge Preference</label>
+                    <source_model>Magento\Checkout\Model\Config\Source\CartMergePreference</source_model>
+                    <comment>Select how cart item quantities should be merged</comment>
+                </field>
             </group>
             <group id="cart_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1">
                 <label>My Cart Link</label>

app/code/Magento/Checkout/etc/config.xml

@@ -21,6 +21,7 @@
                 <number_items_to_display_pager>20</number_items_to_display_pager>
                 <crosssell_enabled>1</crosssell_enabled>
                 <enable_clear_shopping_cart>0</enable_clear_shopping_cart>
+                <cart_merge_preference>merge</cart_merge_preference>
             </cart>
             <cart_link>
                 <use_qty>1</use_qty>

app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddressUid.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Query\Uid;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class CustomerAddressUid implements ResolverInterface
+{
+    /**
+     * CustomerAddressUid Constructor
+     *
+     * @param Uid $idEncoder
+     */
+    public function __construct(
+        private readonly Uid $idEncoder
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        ?array $value = null,
+        ?array $args = null
+    ): string {
+        if (!isset($value['id'])) {
+            throw new LocalizedException(__('Missing required address ID.'));
+        }
+
+        return $this->idEncoder->encode((string) $value['id']);
+    }
+}

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

@@ -166,6 +166,7 @@ type CustomerAddresses {
 
 type CustomerAddress @doc(description: "Contains detailed information about a customer's billing or shipping address."){
     id: Int @doc(description: "The ID of a `CustomerAddress` object.")
+    uid: ID! @doc(description: "The unique ID for a `CustomerAddress` object.")  @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CustomerAddressUid")
     customer_id: Int @doc(description: "The customer ID") @deprecated(reason: "`customer_id` is not needed as part of `CustomerAddress`. The `id` is a unique identifier for the addresses.")
     region: CustomerAddressRegion @doc(description: "An object containing the region name, region code, and region ID.")
     region_id: Int @doc(description: "The unique ID for a pre-defined region.")

app/code/Magento/QuoteGraphQl/Model/Cart/MergeCarts/CartQuantityValidator.php

@@ -15,33 +15,38 @@
 use Magento\Quote\Api\CartItemRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Checkout\Model\Config;
+use Psr\Log\LoggerInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
 
 class CartQuantityValidator implements CartQuantityValidatorInterface
 {
     /**
-     * @var CartItemRepositoryInterface
-     */
-    private $cartItemRepository;
-
-    /**
-     * @var StockRegistryInterface
+     * Array to hold cumulative quantities for each SKU
+     *
+     * @var array
      */
-    private $stockRegistry;
+    private array $cumulativeQty = [];
 
     /**
+     * CartQuantityValidator Constructor
+     *
      * @param CartItemRepositoryInterface $cartItemRepository
      * @param StockRegistryInterface $stockRegistry
+     * @param Config $config
+     * @param LoggerInterface $logger
      */
     public function __construct(
-        CartItemRepositoryInterface $cartItemRepository,
-        StockRegistryInterface $stockRegistry
+        private readonly CartItemRepositoryInterface $cartItemRepository,
+        private readonly StockRegistryInterface $stockRegistry,
+        private readonly Config $config,
+        private readonly LoggerInterface $logger
     ) {
-        $this->cartItemRepository = $cartItemRepository;
-        $this->stockRegistry = $stockRegistry;
     }
 
     /**
-     * Validate combined cart quantities to make sure they are within available stock
+     * Validate combined cart quantities to ensure they are within available stock
      *
      * @param CartInterface $customerCart
      * @param CartInterface $guestCart
@@ -50,33 +55,174 @@ public function __construct(
     public function validateFinalCartQuantities(CartInterface $customerCart, CartInterface $guestCart): bool
     {
         $modified = false;
-        /** @var CartItemInterface $guestCartItem */
+        $this->cumulativeQty = [];
+
+        /** @var \Magento\Quote\Model\Quote $guestCart */
+        /** @var \Magento\Quote\Model\Quote $customerCart */
+        /** @var \Magento\Quote\Model\Quote\Item $guestCartItem */
         foreach ($guestCart->getAllVisibleItems() as $guestCartItem) {
             foreach ($customerCart->getAllItems() as $customerCartItem) {
-                if ($customerCartItem->compare($guestCartItem)) {
-                    $product = $customerCartItem->getProduct();
-                    $stockCurrentQty = $this->stockRegistry->getStockStatus(
-                        $product->getId(),
-                        $product->getStore()->getWebsiteId()
-                    )->getQty();
-
-                    if (($stockCurrentQty < $guestCartItem->getQty() + $customerCartItem->getQty())
-                        && !$this->isBackordersEnabled($product)) {
-                        try {
-                            $this->cartItemRepository->deleteById($guestCart->getId(), $guestCartItem->getItemId());
-                            $modified = true;
-                        } catch (NoSuchEntityException $e) {
-                            continue;
-                        } catch (CouldNotSaveException $e) {
-                            continue;
-                        }
-                    }
+                if (!$customerCartItem->compare($guestCartItem)) {
+                    continue;
+                }
+
+                $mergePreference = $this->config->getCartMergePreference();
+
+                if ($mergePreference === Config::CART_PREFERENCE_CUSTOMER) {
+                    $this->safeDeleteCartItem((int)$guestCart->getId(), (int)$guestCartItem->getItemId());
+                    $modified = true;
+                    break;
                 }
+
+                $product = $customerCartItem->getProduct();
+                $sku = $product->getSku();
+                $websiteId = (int) $product->getStore()->getWebsiteId();
+
+                $isQtyValid = $customerCartItem->getChildren()
+                    ? $this->validateCompositeProductQty($guestCartItem, $customerCartItem)
+                    : $this->validateProductQty(
+                        $product,
+                        $sku,
+                        $guestCartItem->getQty(),
+                        $customerCartItem->getQty(),
+                        $websiteId
+                    );
+
+                if ($mergePreference === Config::CART_PREFERENCE_GUEST) {
+                    $this->safeDeleteCartItem((int)$customerCart->getId(), (int)$customerCartItem->getItemId());
+                    $modified = true;
+                }
+
+                if (!$isQtyValid) {
+                    $this->safeDeleteCartItem((int)$guestCart->getId(), (int)$guestCartItem->getItemId());
+                    $modified = true;
+                }
+
+                break;
             }
         }
+
+        $this->cumulativeQty = [];
+
         return $modified;
     }
 
+    /**
+     * Validate product quantity against available stock
+     *
+     * @param ProductInterface $product
+     * @param string $sku
+     * @param float $guestItemQty
+     * @param float $customerItemQty
+     * @param int $websiteId
+     * @return bool
+     */
+    private function validateProductQty(
+        ProductInterface $product,
+        string $sku,
+        float $guestItemQty,
+        float $customerItemQty,
+        int $websiteId
+    ): bool {
+        $salableQty = $this->stockRegistry->getStockStatus($product->getId(), $websiteId)->getQty();
+
+        $this->cumulativeQty[$sku] ??= 0;
+        $this->cumulativeQty[$sku] += $this->getCurrentCartItemQty($guestItemQty, $customerItemQty);
+
+        // If backorders are enabled, allow quantities beyond available stock
+        if ($this->isBackordersEnabled($product)) {
+            return true;
+        }
+
+        return $salableQty >= $this->cumulativeQty[$sku];
+    }
+
+    /**
+     * Validate composite product quantities against available stock
+     *
+     * @param Item $guestItem
+     * @param Item $customerItem
+     * @return bool
+     */
+    private function validateCompositeProductQty(Item $guestItem, Item $customerItem): bool
+    {
+        $guestChildren = $guestItem->getChildren();
+        $customerChildren = $customerItem->getChildren();
+
+        foreach ($customerChildren as $customerChild) {
+            $sku = $customerChild->getProduct()->getSku();
+            $guestChild = $this->retrieveChildItem($guestChildren, $sku);
+
+            $guestQty = $guestChild ? $guestItem->getQty() * $guestChild->getQty() : 0;
+            $customerQty = $customerItem->getQty() * $customerChild->getQty();
+
+            $product = $customerChild->getProduct();
+            $websiteId = (int) $product->getStore()->getWebsiteId();
+
+            // If backorders are enabled for this product, skip quantity validation
+            if ($this->isBackordersEnabled($product)) {
+                continue;
+            }
+
+            if (!$this->validateProductQty($product, $sku, $guestQty, $customerQty, $websiteId)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Find a child item by SKU in the list of children
+     *
+     * @param CartItemInterface[] $children
+     * @param string $sku
+     * @return CartItemInterface|null
+     */
+    private function retrieveChildItem(array $children, string $sku): ?CartItemInterface
+    {
+        foreach ($children as $child) {
+            /** @var \Magento\Quote\Model\Quote\Item $child */
+            if ($child->getProduct()->getSku() === $sku) {
+                return $child;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the current cart item quantity based on the merge preference
+     *
+     * @param float $guestCartItemQty
+     * @param float $customerCartItemQty
+     * @return float
+     */
+    private function getCurrentCartItemQty(float $guestCartItemQty, float $customerCartItemQty): float
+    {
+        return match ($this->config->getCartMergePreference()) {
+            Config::CART_PREFERENCE_CUSTOMER => $customerCartItemQty,
+            Config::CART_PREFERENCE_GUEST => $guestCartItemQty,
+            default => $guestCartItemQty + $customerCartItemQty
+        };
+    }
+
+    /**
+     * Safely delete a cart item by ID, logging any exceptions
+     *
+     * @param int $cartId
+     * @param int $itemId
+     * @return void
+     */
+    private function safeDeleteCartItem(int $cartId, int $itemId): void
+    {
+        try {
+            $this->cartItemRepository->deleteById($cartId, $itemId);
+        } catch (NoSuchEntityException | CouldNotSaveException $e) {
+            $this->logger->error($e->getMessage());
+        }
+    }
+
     /**
      * Check if backorders are enabled for the stock item
      *