ENGCOM-5959: GraphQL-877 Rename order_id for Order type #962

lenaorobei · web-flow · commit 8659e38e0773 · 2019-10-01T15:42:35.000+03:00
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
@@ -89,6 +89,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
             return [
                 'order' => [
+                    'order_number' => $order->getIncrementId(),
+                    // @deprecated The order_id field is deprecated, use order_number instead
                     'order_id' => $order->getIncrementId(),
                 ],
             ];
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
@@ -99,6 +99,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
             return [
                 'order' => [
+                    'order_number' => $order->getIncrementId(),
+                    // @deprecated The order_id field is deprecated, use order_number instead
                     'order_id' => $order->getIncrementId(),
                 ],
             ];
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -358,5 +358,6 @@ type CartItemSelectedOptionValuePrice {
 }
 
 type Order {
-    order_id: String
+    order_number: String!
+    order_id: String @deprecated(reason: "The order_id field is deprecated, use order_number instead.")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php
@@ -296,8 +296,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder
     {
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order', $response['placeOrder']);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
     }
 
     private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
@@ -354,7 +354,7 @@ private function getPlaceOrderMutation(string $maskedQuoteId): string
 mutation {
   placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Guest/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Guest/SetPaymentMethodTest.php
@@ -113,8 +113,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder
     {
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order', $response['placeOrder']);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
     }
 
     private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
@@ -171,7 +171,7 @@ private function getPlaceOrderMutation(string $maskedQuoteId): string
 mutation {
   placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php
@@ -273,8 +273,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder
     {
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order', $response['placeOrder']);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
     }
 
     private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
@@ -407,7 +407,7 @@ private function getPlaceOrderQuery(string $maskedQuoteId): string
 mutation {
   placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Guest/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Guest/SetPaymentMethodTest.php
@@ -159,8 +159,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder
     {
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order', $response['placeOrder']);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
     }
 
     private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
@@ -259,7 +259,7 @@ private function getPlaceOrderQuery(string $maskedQuoteId): string
 mutation {
   placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
@@ -426,18 +426,18 @@ private function placeOrder(string $cartId): string
     }
   ) {
     order {
-      order_id
+      order_number
     }
   }
 }
 QUERY;
         $response = $this->graphQlMutation($query, [], '', $this->headers);
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order', $response['placeOrder']);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertNotEmpty($response['placeOrder']['order']['order_id']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertNotEmpty($response['placeOrder']['order']['order_number']);
 
-        return $response['placeOrder']['order']['order_id'];
+        return $response['placeOrder']['order']['order_number'];
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
@@ -86,8 +86,8 @@ public function testPlaceOrder()
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('placeOrder', $response);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
     }
 
     /**
@@ -114,7 +114,7 @@ public function testPlaceOrderIfCartIdIsMissed()
 mutation {
   placeOrder(input: {}) {
     order {
-      order_id
+      order_number
     }
   }
 }
@@ -313,7 +313,7 @@ private function getQuery(string $maskedQuoteId): string
 mutation {
   placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
@@ -85,7 +85,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
         self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
 
         self::assertArrayHasKey('order', $response['placeOrder']);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
     }
 
     /**
@@ -128,7 +128,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
         self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
 
         self::assertArrayHasKey('order', $response['placeOrder']);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
     }
 
     /**
@@ -254,7 +254,7 @@ private function getQuery(
     }
   ) {
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
@@ -318,7 +318,7 @@ private function getQuery(string $maskedQuoteId): string
 mutation {
   placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php
@@ -386,16 +386,16 @@ private function placeOrder(string $cartId): void
     }
   ) {
     order {
-      order_id
+      order_number
     }
   }
 }
 QUERY;
         $response = $this->graphQlMutation($query);
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order', $response['placeOrder']);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertNotEmpty($response['placeOrder']['order']['order_id']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertNotEmpty($response['placeOrder']['order']['order_number']);
     }
 
     public function tearDown()
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -79,8 +79,8 @@ public function testPlaceOrder()
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('placeOrder', $response);
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
     }
 
     /**
@@ -105,7 +105,7 @@ public function testPlaceOrderIfCartIdIsMissed()
 mutation {
   placeOrder(input: {}) {
     order {
-      order_id
+      order_number
     }
   }
 }
@@ -304,7 +304,7 @@ private function getQuery(string $maskedQuoteId): string
 mutation {
   placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
@@ -73,7 +73,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
 
         self::assertArrayHasKey('setPaymentMethodAndPlaceOrder', $response);
         self::assertArrayHasKey('order', $response['setPaymentMethodAndPlaceOrder']);
-        self::assertArrayHasKey('order_id', $response['setPaymentMethodAndPlaceOrder']['order']);
+        self::assertArrayHasKey('order_number', $response['setPaymentMethodAndPlaceOrder']['order']);
     }
 
     /**
@@ -111,7 +111,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
 
         self::assertArrayHasKey('setPaymentMethodAndPlaceOrder', $response);
         self::assertArrayHasKey('order', $response['setPaymentMethodAndPlaceOrder']);
-        self::assertArrayHasKey('order_id', $response['setPaymentMethodAndPlaceOrder']['order']);
+        self::assertArrayHasKey('order_number', $response['setPaymentMethodAndPlaceOrder']['order']);
     }
 
     /**
@@ -232,7 +232,7 @@ private function getQuery(
       }
   }) {    
     order {
-      order_id
+      order_number
     }
   }
 }
diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php
@@ -108,7 +108,7 @@ public function testDispatchToPlaceOrderWithRegisteredCustomer(): void
   }
     placeOrder(input: {cart_id: "$cartId"}) {
       order {
-        order_id
+        order_number
       }
     }
 }
@@ -142,12 +142,12 @@ public function testDispatchToPlaceOrderWithRegisteredCustomer(): void
         );
 
         $this->assertTrue(
-            isset($responseData['data']['placeOrder']['order']['order_id'])
+            isset($responseData['data']['placeOrder']['order']['order_number'])
         );
 
         $this->assertEquals(
             'test_quote',
-            $responseData['data']['placeOrder']['order']['order_id']
+            $responseData['data']['placeOrder']['order']['order_number']
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php
@@ -108,7 +108,7 @@ public function testDispatchToPlaceAnOrderWithAuthorizenet(): void
   }
     placeOrder(input: {cart_id: "$cartId"}) {
       order {
-        order_id
+        order_number
       }
     }
 }
@@ -137,12 +137,12 @@ public function testDispatchToPlaceAnOrderWithAuthorizenet(): void
         );
 
         $this->assertTrue(
-            isset($responseData['data']['placeOrder']['order']['order_id'])
+            isset($responseData['data']['placeOrder']['order']['order_number'])
         );
 
         $this->assertEquals(
             'test_quote',
-            $responseData['data']['placeOrder']['order']['order_id']
+            $responseData['data']['placeOrder']['order']['order_number']
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php
@@ -113,7 +113,7 @@ public function testResolve(string $paymentMethod): void
       }
       placeOrder(input: {cart_id: "{$maskedCartId}"}) {
         order {
-          order_id
+          order_number
         }
       }
 }
@@ -205,11 +205,11 @@ public function testResolve(string $paymentMethod): void
         );
 
         $this->assertTrue(
-            isset($responseData['data']['placeOrder']['order']['order_id'])
+            isset($responseData['data']['placeOrder']['order']['order_number'])
         );
         $this->assertEquals(
             'test_quote',
-            $responseData['data']['placeOrder']['order']['order_id']
+            $responseData['data']['placeOrder']['order']['order_number']
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
@@ -134,7 +134,7 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
   }
     placeOrder(input: {cart_id: "$cartId"}) {
       order {
-        order_id
+        order_number
       }
     }
 }
@@ -190,11 +190,11 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
             $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
         );
         $this->assertTrue(
-            isset($responseData['data']['placeOrder']['order']['order_id'])
+            isset($responseData['data']['placeOrder']['order']['order_number'])
         );
         $this->assertEquals(
             'test_quote',
-            $responseData['data']['placeOrder']['order']['order_id']
+            $responseData['data']['placeOrder']['order']['order_number']
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
@@ -122,7 +122,7 @@ public function testResolveCustomer(): void
       }
       placeOrder(input: {cart_id: "{$cartId}"}) {
         order {
-          order_id
+          order_number
         }
       }
 }
@@ -207,11 +207,11 @@ public function testResolveCustomer(): void
         );
 
         $this->assertTrue(
-            isset($responseData['data']['placeOrder']['order']['order_id'])
+            isset($responseData['data']['placeOrder']['order']['order_number'])
         );
         $this->assertEquals(
             'test_quote',
-            $responseData['data']['placeOrder']['order']['order_id']
+            $responseData['data']['placeOrder']['order']['order_number']
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressSetPaymentMethodTest.php
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProSetPaymentMethodTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProSetPaymentMethodTest.php
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithHostedProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithHostedProTest.php
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php

Original file line number	Diff line number	Diff line change
`@@ -358,5 +358,6 @@ type CartItemSelectedOptionValuePrice {`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`type Order {`
`361`		`- order_id: String`
	`361`	`+ order_number: String!`
	`362`	`+ order_id: String @deprecated(reason: "The order_id field is deprecated, use order_number instead.")`
`362`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder`
`296`	`296`	`{`
`297`	`297`	`self::assertArrayHasKey('placeOrder', $response);`
`298`	`298`	`self::assertArrayHasKey('order', $response['placeOrder']);`
`299`		`- self::assertArrayHasKey('order_id', $response['placeOrder']['order']);`
`300`		`- self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);`
	`299`	`+ self::assertArrayHasKey('order_number', $response['placeOrder']['order']);`
	`300`	`+ self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`private function assertSetPaymentMethodResponse(array $response, string $methodCode): void`
`@@ -354,7 +354,7 @@ private function getPlaceOrderMutation(string $maskedQuoteId): string`
`354`	`354`	`mutation {`
`355`	`355`	`placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {`
`356`	`356`	`order {`
`357`		`- order_id`
	`357`	`+ order_number`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder`
`113`	`113`	`{`
`114`	`114`	`self::assertArrayHasKey('placeOrder', $response);`
`115`	`115`	`self::assertArrayHasKey('order', $response['placeOrder']);`
`116`		`- self::assertArrayHasKey('order_id', $response['placeOrder']['order']);`
`117`		`- self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);`
	`116`	`+ self::assertArrayHasKey('order_number', $response['placeOrder']['order']);`
	`117`	`+ self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`private function assertSetPaymentMethodResponse(array $response, string $methodCode): void`
`@@ -171,7 +171,7 @@ private function getPlaceOrderMutation(string $maskedQuoteId): string`
`171`	`171`	`mutation {`
`172`	`172`	`placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {`
`173`	`173`	`order {`
`174`		`- order_id`
	`174`	`+ order_number`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -273,8 +273,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder`
`273`	`273`	`{`
`274`	`274`	`self::assertArrayHasKey('placeOrder', $response);`
`275`	`275`	`self::assertArrayHasKey('order', $response['placeOrder']);`
`276`		`- self::assertArrayHasKey('order_id', $response['placeOrder']['order']);`
`277`		`- self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);`
	`276`	`+ self::assertArrayHasKey('order_number', $response['placeOrder']['order']);`
	`277`	`+ self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`private function assertSetPaymentMethodResponse(array $response, string $methodCode): void`
`@@ -407,7 +407,7 @@ private function getPlaceOrderQuery(string $maskedQuoteId): string`
`407`	`407`	`mutation {`
`408`	`408`	`placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {`
`409`	`409`	`order {`
`410`		`- order_id`
	`410`	`+ order_number`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder`
`159`	`159`	`{`
`160`	`160`	`self::assertArrayHasKey('placeOrder', $response);`
`161`	`161`	`self::assertArrayHasKey('order', $response['placeOrder']);`
`162`		`- self::assertArrayHasKey('order_id', $response['placeOrder']['order']);`
`163`		`- self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);`
	`162`	`+ self::assertArrayHasKey('order_number', $response['placeOrder']['order']);`
	`163`	`+ self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`private function assertSetPaymentMethodResponse(array $response, string $methodCode): void`
`@@ -259,7 +259,7 @@ private function getPlaceOrderQuery(string $maskedQuoteId): string`
`259`	`259`	`mutation {`
`260`	`260`	`placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {`
`261`	`261`	`order {`
`262`		`- order_id`
	`262`	`+ order_number`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -426,18 +426,18 @@ private function placeOrder(string $cartId): string`
`426`	`426`	`}`
`427`	`427`	`) {`
`428`	`428`	`order {`
`429`		`- order_id`
	`429`	`+ order_number`
`430`	`430`	`}`
`431`	`431`	`}`
`432`	`432`	`}`
`433`	`433`	`QUERY;`
`434`	`434`	`$response = $this->graphQlMutation($query, [], '', $this->headers);`
`435`	`435`	`self::assertArrayHasKey('placeOrder', $response);`
`436`	`436`	`self::assertArrayHasKey('order', $response['placeOrder']);`
`437`		`- self::assertArrayHasKey('order_id', $response['placeOrder']['order']);`
`438`		`- self::assertNotEmpty($response['placeOrder']['order']['order_id']);`
	`437`	`+ self::assertArrayHasKey('order_number', $response['placeOrder']['order']);`
	`438`	`+ self::assertNotEmpty($response['placeOrder']['order']['order_number']);`
`439`	`439`
`440`		`- return $response['placeOrder']['order']['order_id'];`
	`440`	`+ return $response['placeOrder']['order']['order_number'];`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,8 @@ public function testPlaceOrder()`
`86`	`86`	`$response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());`
`87`	`87`
`88`	`88`	`self::assertArrayHasKey('placeOrder', $response);`
`89`		`- self::assertArrayHasKey('order_id', $response['placeOrder']['order']);`
`90`		`- self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);`
	`89`	`+ self::assertArrayHasKey('order_number', $response['placeOrder']['order']);`
	`90`	`+ self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`@@ -114,7 +114,7 @@ public function testPlaceOrderIfCartIdIsMissed()`
`114`	`114`	`mutation {`
`115`	`115`	`placeOrder(input: {}) {`
`116`	`116`	`order {`
`117`		`- order_id`
	`117`	`+ order_number`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`}`
`@@ -313,7 +313,7 @@ private function getQuery(string $maskedQuoteId): string`
`313`	`313`	`mutation {`
`314`	`314`	`placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {`
`315`	`315`	`order {`
`316`		`- order_id`
	`316`	`+ order_number`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function testSetPaymentOnCartWithSimpleProduct()`
`85`	`85`	`self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);`
`86`	`86`
`87`	`87`	`self::assertArrayHasKey('order', $response['placeOrder']);`
`88`		`- self::assertArrayHasKey('order_id', $response['placeOrder']['order']);`
	`88`	`+ self::assertArrayHasKey('order_number', $response['placeOrder']['order']);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`
`@@ -128,7 +128,7 @@ public function testSetPaymentOnCartWithVirtualProduct()`
`128`	`128`	`self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);`
`129`	`129`
`130`	`130`	`self::assertArrayHasKey('order', $response['placeOrder']);`
`131`		`- self::assertArrayHasKey('order_id', $response['placeOrder']['order']);`
	`131`	`+ self::assertArrayHasKey('order_number', $response['placeOrder']['order']);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`/**`
`@@ -254,7 +254,7 @@ private function getQuery(`
`254`	`254`	`}`
`255`	`255`	`) {`
`256`	`256`	`order {`
`257`		`- order_id`
	`257`	`+ order_number`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`	`}`