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

Author: aplapana

app/code/Magento/GraphQl/Helper/Error/AggregateExceptionMessageFormatter.php

@@ -59,7 +59,10 @@ public function getFormatted(
             }
         }
 
-        $message = $e->getCode() ? __($e->getMessage()) : $defaultMessage;
-        return new GraphQlInputException($message, $e, $e->getCode());
+        $messageText = $e->getCode() ? __($e->getMessage()) : $defaultMessage;
+        $messageWithPrefix = empty($messagePrefix)
+            ? $messageText
+            : __("$messagePrefix: %message", ['message' => $messageText]);
+        return new GraphQlInputException($messageWithPrefix, $e, $e->getCode());
     }
 }

app/code/Magento/GraphQl/Test/Unit/Helper/Error/AggregateExceptionMessageFormatterTest.php

@@ -118,7 +118,7 @@ public function testGetFormattedExceptionMessage(): void
         );
         $this->assertInstanceOf(GraphQlInputException::class, $exception);
         $this->assertSame($exceptionCode, $exception->getCode());
-        $this->assertSame($exceptionMessage, $exception->getMessage());
+        $this->assertSame($messagePrefix . ": " . $exceptionMessage, $exception->getMessage());
     }
 
     /**
@@ -127,7 +127,7 @@ public function testGetFormattedExceptionMessage(): void
     public function testGetFormattedDefaultMessage(): void
     {
         $exceptionMessage = 'exception message';
-        $messagePrefix = 'prefix';
+        $messagePrefix = '';
         $this->formatter->expects($this->once())
             ->method('getFormatted')
             ->willReturn(null);

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

@@ -43,6 +43,7 @@ class ErrorMapper
         'Please check the billing address information' => self::ERROR_UNABLE_TO_PLACE_ORDER_ID,
         'Enter a valid payment method and try again' => self::ERROR_UNABLE_TO_PLACE_ORDER_ID,
         'Some of the products are out of stock' => self::ERROR_UNABLE_TO_PLACE_ORDER_ID,
+        'Unable to place order' => self::ERROR_UNABLE_TO_PLACE_ORDER_ID,
     ];
 
     /**

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

@@ -31,23 +31,23 @@ public function __construct(
      * @param Field $field
      * @param $context
      * @param ResolveInfo $info
-     * @return array
      * @throws GraphQlAuthorizationException
      * @throws QuoteException
      */
     public function execute(
         LocalizedException $exception,
-        Field $field, $context,
+        Field $field,
+        $context,
         ResolveInfo $info
-    ): array {
+    ): void {
         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. ' .
+            __('A server error stopped your order from being placed. ' .
                 'Please try to place your order again'),
             'Unable to place order',
             $field,
@@ -58,6 +58,7 @@ public function execute(
         if (!$exceptionCode) {
             $exceptionCode = $this->errorMapper->getErrorMessageId($exception->getRawMessage());
         }
+
         throw new QuoteException(__($exception->getMessage()), $exception, $exceptionCode);
     }
 }

dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php

@@ -248,7 +248,7 @@ public function testResolveWithPayflowLinkDeclined(): void
         $resultCode = Payflowlink::RESPONSE_CODE_DECLINED_BY_FILTER;
         $exception = new RuntimeException(__('Declined response message from PayPal gateway')->render());
         //Exception message is transformed into more controlled message
-        $expectedErrorCode = 'UNDEFINED';
+        $expectedErrorCode = 'UNABLE_TO_PLACE_ORDER';
 
         $this->payflowRequest->method('setData')
             ->with(

dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php

@@ -208,7 +208,7 @@ public function testResolveWithPaymentAdvancedDeclined(): void
         $resultCode = Payflowlink::RESPONSE_CODE_DECLINED_BY_FILTER;
         $exception = new RuntimeException(__('Declined response message from PayPal gateway')->render());
         //Exception message is transformed into more controlled message
-        $expectedErrorCode = 'UNDEFINED';
+        $expectedErrorCode = 'UNABLE_TO_PLACE_ORDER';
 
         $this->paymentRequest->method('setData')
             ->with(