MC-26683: Added errors to the return model

Author: AleksLi

app/code/Magento/GraphQl/Controller/GraphQl.php

@@ -160,8 +160,6 @@ public function dispatch(RequestInterface $request) : ResponseInterface
         } catch (\Exception $error) {
             $result['errors'] = isset($result) && isset($result['errors']) ? $result['errors'] : [];
             $result['errors'][] = $this->graphQlError->create($error);
-            // here we should have data from GraphQlCartInputException
-            $result['data'] = $error->getData();
             $statusCode = ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS;
         }
 

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

@@ -13,7 +13,7 @@
 use Magento\Quote\Model\Quote;
 
 /**
- * Add products to cart
+ * Adding products to cart using GraphQL
  */
 class AddProductsToCart
 {
@@ -44,29 +44,16 @@ public function __construct(
      *
      * @param Quote $cart
      * @param array $cartItems
-     * @return \Magento\Framework\GraphQl\Exception\GraphQlCartInputException
      * @throws GraphQlInputException
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException
      */
-    public function execute(Quote $cart, array $cartItems): \Magento\Framework\GraphQl\Exception\GraphQlCartInputException
+    public function execute(Quote $cart, array $cartItems): void
     {
         foreach ($cartItems as $cartItemData) {
             $this->addProductToCart->execute($cart, $cartItemData);
         }
 
-        if ($cart->getData('has_error')) {
-            $e = new \Magento\Framework\GraphQl\Exception\GraphQlCartInputException(__('Shopping cart errors'));
-            $errors = $cart->getErrors();
-            foreach ($errors as $error) {
-                /** @var MessageInterface $error */
-                $e->addError(new GraphQlInputException(__($error->getText())));
-            }
-            $e->addData($cartItems);
-
-            throw $e;
-        }
-
         $this->cartRepository->save($cart);
     }
 }

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

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Model\Quote\Item as QuoteItem;
@@ -29,6 +30,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $value['model'];
 
         $itemsData = [];
+        if ($cart->getData('has_error')) {
+            $errors = $cart->getErrors();
+            foreach ($errors as $error) {
+                $itemsData[] = new GraphQlInputException(__($error->getText()));
+            }
+        }
         foreach ($cart->getAllVisibleItems() as $cartItem) {
             /**
              * @var QuoteItem $cartItem