ACP2E-4031: [QUANS] Confirm GQL order placement exception handling behaviour reversion

Author: aplapana

app/code/Magento/QuoteGraphQl/Model/OrderErrorProcessor.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model;
+
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\GraphQl\Helper\Error\AggregateExceptionMessageFormatter;
+
+class OrderErrorProcessor
+{
+    /**
+     * @param AggregateExceptionMessageFormatter $errorMessageFormatter
+     * @param ErrorMapper $errorMapper
+     */
+    public function __construct(
+        private readonly AggregateExceptionMessageFormatter $errorMessageFormatter,
+        private readonly ErrorMapper $errorMapper
+    ) {
+    }
+
+    /**
+     * @param LocalizedException $exception
+     * @param Field $field
+     * @param $context
+     * @param ResolveInfo $info
+     * @return array
+     * @throws GraphQlAuthorizationException
+     * @throws QuoteException
+     */
+    public function execute(
+        LocalizedException $exception,
+        Field $field, $context,
+        ResolveInfo $info
+    ): array {
+        if ($exception instanceof AuthorizationException) {
+            throw new GraphQlAuthorizationException(
+                __($exception->getMessage())
+            );
+        }
+        $exception = $this->errorMessageFormatter->getFormatted(
+            $exception,
+            __('Unable to place order: A server error stopped your order from being placed. ' .
+                'Please try to place your order again'),
+            'Unable to place order',
+            $field,
+            $context,
+            $info
+        );
+        $exceptionCode = $exception->getCode();
+        if (!$exceptionCode) {
+            $exceptionCode = $this->errorMapper->getErrorMessageId($exception->getRawMessage());
+        }
+        throw new QuoteException(__($exception->getMessage()), $exception, $exceptionCode);
+    }
+}

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

@@ -10,22 +10,17 @@
 use Magento\Framework\Exception\AuthorizationException;
 use Magento\Framework\Exception\LocalizedException;
 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\GraphQl\Helper\Error\AggregateExceptionMessageFormatter;
 use Magento\QuoteGraphQl\Model\Cart\GetCartForCheckout;
 use Magento\QuoteGraphQl\Model\Cart\PlaceOrder as PlaceOrderModel;
-use Magento\QuoteGraphQl\Model\ErrorMapper;
-use Magento\QuoteGraphQl\Model\QuoteException;
+use Magento\QuoteGraphQl\Model\OrderErrorProcessor;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\SalesGraphQl\Model\Formatter\Order as OrderFormatter;
 
 /**
  * Resolver for placing order after payment method has already been set
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PlaceOrder implements ResolverInterface
 {
@@ -34,16 +29,14 @@ class PlaceOrder implements ResolverInterface
      * @param PlaceOrderModel $placeOrder
      * @param OrderRepositoryInterface $orderRepository
      * @param OrderFormatter $orderFormatter
-     * @param AggregateExceptionMessageFormatter $errorMessageFormatter
-     * @param ErrorMapper $errorMapper
+     * @param OrderErrorProcessor $orderErrorProcessor
      */
     public function __construct(
         private readonly GetCartForCheckout $getCartForCheckout,
         private readonly PlaceOrderModel $placeOrder,
         private readonly OrderRepositoryInterface $orderRepository,
         private readonly OrderFormatter $orderFormatter,
-        private readonly AggregateExceptionMessageFormatter $errorMessageFormatter,
-        private readonly ErrorMapper $errorMapper
+        private readonly OrderErrorProcessor $orderErrorProcessor
     ) {
     }
 
@@ -63,26 +56,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, ?array $value
             $cart = $this->getCartForCheckout->execute($maskedCartId, $userId, $storeId);
             $orderId = $this->placeOrder->execute($cart, $maskedCartId, $userId);
             $order = $this->orderRepository->get($orderId);
-        } catch (AuthorizationException $exception) {
-            throw new GraphQlAuthorizationException(
-                __($exception->getMessage())
-            );
-        } catch (LocalizedException $exception) {
-            $exception = $this->errorMessageFormatter->getFormatted(
-                $exception,
-                __('Unable to place order: A server error stopped your order from being placed. ' .
-                    'Please try to place your order again'),
-                'Unable to place order',
-                $field,
-                $context,
-                $info
-            );
-            $exceptionCode = $exception->getCode();
-            if (!$exceptionCode) {
-                $exceptionCode = $this->errorMapper->getErrorMessageId($exception->getMessage());
-            }
-
-            throw new QuoteException(__($exception->getMessage()), $exception, $exceptionCode);
+        } catch (AuthorizationException|LocalizedException $exception) {
+            return $this->orderErrorProcessor->execute($exception, $field, $context, $info);
         }
 
         return [
@@ -91,7 +66,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, ?array $value
                 // @deprecated The order_id field is deprecated, use order_number instead
                 'order_id' => $order?->getIncrementId(),
             ],
-            'orderV2' => $order ? $this->orderFormatter->format($order) : null
+            'orderV2' => $order ? $this->orderFormatter->format($order) : null,
         ];
     }
 }

app/code/Magento/QuoteGraphQl/etc/graphql/di.xml

@@ -44,7 +44,7 @@
             </argument>
         </arguments>
     </virtualType>
-    <type name="Magento\QuoteGraphQl\Model\Resolver\PlaceOrder">
+    <type name="Magento\QuoteGraphQl\Model\OrderErrorProcessor">
         <arguments>
             <argument name="errorMessageFormatter" xsi:type="object">Magento\QuoteGraphQl\Helper\Error\PlaceOrderMessageFormatter</argument>
         </arguments>

lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php

@@ -88,7 +88,7 @@ public function process(
         }
 
         $rootValue = null;
-        return GraphQL::executeQuery(
+        $executionResult = GraphQL::executeQuery(
             $schema,
             $source,
             $rootValue,
@@ -100,5 +100,16 @@ public function process(
         )->toArray(
             (int) ($this->exceptionFormatter->shouldShowDetail() ? DebugFlag::INCLUDE_DEBUG_MESSAGE : false)
         );
+        if (!empty($executionResult['errors'])) {
+            foreach ($executionResult['errors'] as $error) {
+                if (isset($error['extensions']['error_code'])) {
+                    $executionResult['data']['errors'][] = [
+                        'message' => $error['message'],
+                        'code' => $error['extensions']['error_code']
+                    ];
+                }
+            }
+        }
+        return $executionResult;
     }
 }