Merge pull request #9986 from magento-cia/cia-2.4.9-alpha3-develop-bugfix-08042025

Cia 2.4.9 alpha3 develop Bugfix Delivery 08042025

Author: mrprabhu92

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

@@ -9,6 +9,7 @@
 
 use Magento\Checkout\Api\Data\TotalsInformationInterface;
 use Magento\Checkout\Api\TotalsInformationManagementInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -20,12 +21,19 @@
 use Magento\QuoteGraphQl\Model\ErrorMapper;
 use Magento\QuoteGraphQl\Model\TotalsBuilder;
 use Psr\Log\LoggerInterface;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
 
 /**
  * Apply address and shipping method to totals estimate and return the quote
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EstimateTotals implements ResolverInterface
 {
+    /**
+     * @var GetCartForUser
+     */
+    private GetCartForUser $getCartForUser;
+
     /**
      * EstimateTotals Constructor
      *
@@ -36,6 +44,7 @@ class EstimateTotals implements ResolverInterface
      * @param AssignShippingMethodToCart $assignShippingMethodToCart
      * @param LoggerInterface $logger
      * @param TotalsBuilder $totalsBuilder
+     * @param GetCartForUser|null $getCartForUser
      */
     public function __construct(
         private readonly MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
@@ -44,8 +53,10 @@ public function __construct(
         private readonly ErrorMapper $errorMapper,
         private readonly AssignShippingMethodToCart $assignShippingMethodToCart,
         private readonly LoggerInterface $logger,
-        private readonly TotalsBuilder $totalsBuilder
+        private readonly TotalsBuilder $totalsBuilder,
+        ?GetCartForUser $getCartForUser = null
     ) {
+        $this->getCartForUser = $getCartForUser ?? ObjectManager::getInstance()->get(GetCartForUser::class);
     }
 
     /**
@@ -54,19 +65,20 @@ public function __construct(
     public function resolve(Field $field, $context, ResolveInfo $info, ?array $value = null, ?array $args = null)
     {
         $input = $args['input'] ?? [];
+        $maskedCartId = $input['cart_id'];
 
-        if (empty($input['cart_id'])) {
+        if (empty($maskedCartId)) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
 
         try {
-            $cartId = $this->maskedQuoteIdToQuoteId->execute($input['cart_id']);
+            $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedCartId);
         } catch (NoSuchEntityException $exception) {
             throw new GraphQlInputException(
                 __(
                     'Could not find a cart with ID "%masked_id"',
                     [
-                        'masked_id' => $input['cart_id']
+                        'masked_id' => $maskedCartId
                     ]
                 ),
                 $exception,
@@ -79,6 +91,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, ?array $value
             throw new GraphQlInputException(__('Required parameter "country_code" is missing'));
         }
 
+        $currentUserId = $context->getUserId();
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+        $this->getCartForUser->execute($maskedCartId, $currentUserId, $storeId);
+
         $totalsInfo = $this->totalsBuilder->execute($addressData, $input['shipping_method'] ?? []);
         $this->totalsInformationManagement->calculate($cartId, $totalsInfo);
         $this->updateShippingMethod($totalsInfo, $cartId);

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/EstimateTotalsTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote;
 
+use Exception;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Tax\Test\Fixture\ProductTaxClass;
 use Magento\Tax\Test\Fixture\TaxRate as TaxRateFixture;
@@ -262,4 +263,37 @@ public static function estimationsProvider(): array
             ]
         ];
     }
+
+    /**
+     * Test invalid cart ID error handling
+     */
+    public function testEstimateTotalsWithInvalidCartId(): void
+    {
+        $invalidCartId = 'abcxyz';
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Could not find a cart with ID "' . $invalidCartId . '"');
+
+        $query = <<<QUERY
+        mutation {
+            estimateTotals(input: {
+                cart_id: "{$invalidCartId}",
+                address: {
+                    country_code: US
+                }
+            }) {
+                cart {
+                    prices {
+                        grand_total {
+                            value
+                            currency
+                        }
+                    }
+                }
+            }
+        }
+    QUERY;
+
+        $this->graphQlMutation($query);
+    }
 }