LYNX-359: Added email field to CustomerOrder and fixed orderV2 error handling

Author: sivaschenko

app/code/Magento/QuoteGraphQl/etc/schema.graphqls

@@ -260,7 +260,7 @@ type ApplyCouponToCartOutput @doc(description: "Contains details about the cart
 
 type PlaceOrderOutput @doc(description: "Contains the results of the request to place an order.") {
     order: Order @deprecated(reason: "Use `orderV2` instead.") @doc(description: "The ID of the order.")
-    orderV2: CustomerOrder! @doc(description: "Full order information.")
+    orderV2: CustomerOrder @doc(description: "Full order information.")
     errors: [PlaceOrderError!]! @doc(description:"An array of place order errors.")
 }
 

app/code/Magento/SalesGraphQl/Model/Formatter/Order.php

@@ -17,26 +17,14 @@
  */
 class Order
 {
-    /**
-     * @var OrderAddress
-     */
-    private $orderAddress;
-
-    /**
-     * @var OrderPayments
-     */
-    private $orderPayments;
-
     /**
      * @param OrderAddress $orderAddress
      * @param OrderPayments $orderPayments
      */
     public function __construct(
-        OrderAddress $orderAddress,
-        OrderPayments $orderPayments
+        private readonly OrderAddress $orderAddress,
+        private readonly OrderPayments $orderPayments
     ) {
-        $this->orderAddress = $orderAddress;
-        $this->orderPayments = $orderPayments;
     }
 
     /**
@@ -57,6 +45,7 @@ public function format(OrderInterface $orderModel): array
             'order_date' => $orderModel->getCreatedAt(),
             'order_number' => $orderModel->getIncrementId(),
             'status' => $orderModel->getStatusLabel(),
+            'email' => $orderModel->getCustomerEmail(),
             'shipping_method' => $orderModel->getShippingDescription(),
             'shipping_address' => $this->orderAddress->getOrderShippingAddress($orderModel),
             'billing_address' => $this->orderAddress->getOrderBillingAddress($orderModel),

app/code/Magento/SalesGraphQl/etc/schema.graphqls

@@ -74,6 +74,7 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     grand_total: Float  @deprecated(reason: "Use the `totals.grand_total` field instead.")
     token: String! @doc(description: "The token that can be used to retrieve the order using order query.") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Token")
     applied_coupons: [AppliedCoupon!]! @doc(description: "Coupons applied to the order.")
+    email: String @doc(description: "Order customer email.")
 }
 
 type OrderAddress @doc(description: "Contains detailed information about an order's billing and shipping addresses."){

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

@@ -109,7 +109,9 @@ public function testPlaceOrder()
 
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertArrayHasKey('number', $response['placeOrder']['orderV2']);
         self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['orderV2']['number']);
         self::assertEmpty(count($response['placeOrder']['errors']));
         $orderIncrementId = $response['placeOrder']['order']['order_number'];
         $order = $this->orderFactory->create();
@@ -147,7 +149,9 @@ public function testPlaceOrderWithAutoGroup()
 
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertArrayHasKey('number', $response['placeOrder']['orderV2']);
         self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['orderV2']['number']);
         self::assertEmpty(count($response['placeOrder']['errors']));
         $orderIncrementId = $response['placeOrder']['order']['order_number'];
         $order = $this->orderFactory->create();
@@ -458,7 +462,9 @@ public function testPlaceOrderWithGiftMessage()
 
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertArrayHasKey('number', $response['placeOrder']['orderV2']);
         self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['orderV2']['number']);
         $orderIncrementId = $response['placeOrder']['order']['order_number'];
         $order = $this->orderFactory->create();
         $order->loadByIncrementId($orderIncrementId);
@@ -477,6 +483,9 @@ private function getQuery(string $maskedQuoteId): string
     order {
       order_number
     }
+    orderV2 {
+      number
+    }
     errors {
       message
       code

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/GuestOrderByTokenTest.php

@@ -48,6 +48,7 @@ class GuestOrderByTokenTest extends GraphQlAbstract
       token: "%token"
   }) {
     number
+    email
     billing_address {
       firstname
       lastname
@@ -63,6 +64,7 @@ class GuestOrderByTokenTest extends GraphQlAbstract
   }) {
     orderV2 {
       number
+      email
       billing_address {
         firstname
         lastname
@@ -97,6 +99,7 @@ public function testGuestOrder(): void
 
         $this->assertNotEmpty($placeOrderResponse['placeOrder']['orderV2']['number']);
         $this->assertNotEmpty($placeOrderResponse['placeOrder']['orderV2']['token']);
+        $this->assertNotEmpty($placeOrderResponse['placeOrder']['orderV2']['email']);
         $this->assertNotEmpty($placeOrderResponse['placeOrder']['orderV2']['billing_address']['firstname']);
         $this->assertNotEmpty($placeOrderResponse['placeOrder']['orderV2']['billing_address']['lastname']);
 
@@ -111,6 +114,7 @@ public function testGuestOrder(): void
             [
                 'guestOrderByToken' => [
                     'number' => $placeOrderResponse['placeOrder']['orderV2']['number'],
+                    'email' => $placeOrderResponse['placeOrder']['orderV2']['email'],
                     'billing_address' => [
                         'firstname' => $placeOrderResponse['placeOrder']['orderV2']['billing_address']['firstname'],
                         'lastname' => $placeOrderResponse['placeOrder']['orderV2']['billing_address']['lastname']

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/GuestOrderTest.php

@@ -47,6 +47,7 @@ class GuestOrderTest extends GraphQlAbstract
       postcode: "%postcode"
   }) {
     number
+    email
     billing_address {
       firstname
       lastname
@@ -83,6 +84,7 @@ public function testGuestOrder(): void
             [
                 'guestOrder' => [
                     'number' => $order->getIncrementId(),
+                    'email' => $order->getBillingAddress()->getEmail(),
                     'billing_address' => [
                         'firstname' => $order->getBillingAddress()->getFirstname(),
                         'lastname' => $order->getBillingAddress()->getLastname()