Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3942' into PR_2025_06_12_muntianu

Author: katmoon

app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForCheckout.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -57,7 +57,7 @@ public function execute(string $cartHash, ?int $customerId, int $storeId): Quote
         try {
             $cart = $this->getCartForUser->execute($cartHash, $customerId, $storeId);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e, $e->getCode());
         }
         $this->checkoutAllowance->execute($cart);
 

app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/GetCartForCheckoutTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Test\Unit\Model\Cart;
+
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForCheckout;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\QuoteGraphQl\Model\Cart\CheckCartCheckoutAllowance;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use PHPUnit\Framework\MockObject\Exception;
+use PHPUnit\Framework\TestCase;
+
+class GetCartForCheckoutTest extends TestCase
+{
+    /**
+     * Verifies that when GetCartForUser::execute throws a NoSuchEntityException with a specific code,
+     * GetCartForCheckout::execute rethrows it as a GraphQlNoSuchEntityException, preserving the original
+     * exception message and code.
+     *
+     * @return void
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlInputException
+     * @throws Exception
+     */
+    public function testExecuteThrowsGraphQlNoSuchEntityExceptionWithOriginalCode()
+    {
+        $cartHash = 'test_hash';
+        $customerId = 1;
+        $storeId = 2;
+        $originalCode = 1234;
+        $originalMessage = 'Cart not found';
+
+        $getCartForUser = $this->createMock(GetCartForUser::class);
+        $getCartForUser->method('execute')
+            ->willThrowException(new NoSuchEntityException(__($originalMessage), null, $originalCode));
+
+        $checkoutAllowance = $this->createMock(CheckCartCheckoutAllowance::class);
+
+        $getCartForCheckout = new GetCartForCheckout($checkoutAllowance, $getCartForUser);
+
+        $this->expectException(GraphQlNoSuchEntityException::class);
+        $this->expectExceptionMessage($originalMessage);
+        $this->expectExceptionCode($originalCode);
+
+        $getCartForCheckout->execute($cartHash, $customerId, $storeId);
+    }
+}