Skip to content

Commit 0575217

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-5959: GraphQL-877 Rename order_id for Order type #962
- Merge Pull Request magento/graphql-ce#962 from sergiy-v/graphql-ce:877-rename-order-id-for-order-type - Merged commits: 1. 542395b
2 parents ea71192 + 542395b commit 0575217

24 files changed

+72
-67
lines changed

Diff for: ‎app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
8989

9090
return [
9191
'order' => [
92+
'order_number' => $order->getIncrementId(),
93+
// @deprecated The order_id field is deprecated, use order_number instead
9294
'order_id' => $order->getIncrementId(),
9395
],
9496
];

Diff for: ‎app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
9999

100100
return [
101101
'order' => [
102+
'order_number' => $order->getIncrementId(),
103+
// @deprecated The order_id field is deprecated, use order_number instead
102104
'order_id' => $order->getIncrementId(),
103105
],
104106
];

Diff for: ‎app/code/Magento/QuoteGraphQl/etc/schema.graphqls

+2-1
Original file line numberDiff line numberDiff line change
@@ -358,5 +358,6 @@ type CartItemSelectedOptionValuePrice {
358358
}
359359

360360
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.")
362363
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder
220220
{
221221
self::assertArrayHasKey('placeOrder', $response);
222222
self::assertArrayHasKey('order', $response['placeOrder']);
223-
self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
224-
self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
223+
self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
224+
self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
225225
}
226226

227227
private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
@@ -278,7 +278,7 @@ private function getPlaceOrderMutation(string $maskedQuoteId): string
278278
mutation {
279279
placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
280280
order {
281-
order_id
281+
order_number
282282
}
283283
}
284284
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Guest/SetPaymentMethodTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder
113113
{
114114
self::assertArrayHasKey('placeOrder', $response);
115115
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']);
118118
}
119119

120120
private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
@@ -171,7 +171,7 @@ private function getPlaceOrderMutation(string $maskedQuoteId): string
171171
mutation {
172172
placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
173173
order {
174-
order_id
174+
order_number
175175
}
176176
}
177177
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder
273273
{
274274
self::assertArrayHasKey('placeOrder', $response);
275275
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']);
278278
}
279279

280280
private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
@@ -407,7 +407,7 @@ private function getPlaceOrderQuery(string $maskedQuoteId): string
407407
mutation {
408408
placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
409409
order {
410-
order_id
410+
order_number
411411
}
412412
}
413413
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Guest/SetPaymentMethodTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ private function assertPlaceOrderResponse(array $response, string $reservedOrder
159159
{
160160
self::assertArrayHasKey('placeOrder', $response);
161161
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']);
164164
}
165165

166166
private function assertSetPaymentMethodResponse(array $response, string $methodCode): void
@@ -259,7 +259,7 @@ private function getPlaceOrderQuery(string $maskedQuoteId): string
259259
mutation {
260260
placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
261261
order {
262-
order_id
262+
order_number
263263
}
264264
}
265265
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -426,18 +426,18 @@ private function placeOrder(string $cartId): string
426426
}
427427
) {
428428
order {
429-
order_id
429+
order_number
430430
}
431431
}
432432
}
433433
QUERY;
434434
$response = $this->graphQlMutation($query, [], '', $this->headers);
435435
self::assertArrayHasKey('placeOrder', $response);
436436
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']);
439439

440-
return $response['placeOrder']['order']['order_id'];
440+
return $response['placeOrder']['order']['order_number'];
441441
}
442442

443443
/**

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public function testPlaceOrder()
8686
$response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
8787

8888
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']);
9191
}
9292

9393
/**
@@ -114,7 +114,7 @@ public function testPlaceOrderIfCartIdIsMissed()
114114
mutation {
115115
placeOrder(input: {}) {
116116
order {
117-
order_id
117+
order_number
118118
}
119119
}
120120
}
@@ -313,7 +313,7 @@ private function getQuery(string $maskedQuoteId): string
313313
mutation {
314314
placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
315315
order {
316-
order_id
316+
order_number
317317
}
318318
}
319319
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
8585
self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
8686

8787
self::assertArrayHasKey('order', $response['placeOrder']);
88-
self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
88+
self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
8989
}
9090

9191
/**
@@ -128,7 +128,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
128128
self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
129129

130130
self::assertArrayHasKey('order', $response['placeOrder']);
131-
self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
131+
self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
132132
}
133133

134134
/**
@@ -254,7 +254,7 @@ private function getQuery(
254254
}
255255
) {
256256
order {
257-
order_id
257+
order_number
258258
}
259259
}
260260
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ private function getQuery(string $maskedQuoteId): string
318318
mutation {
319319
placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
320320
order {
321-
order_id
321+
order_number
322322
}
323323
}
324324
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -386,16 +386,16 @@ private function placeOrder(string $cartId): void
386386
}
387387
) {
388388
order {
389-
order_id
389+
order_number
390390
}
391391
}
392392
}
393393
QUERY;
394394
$response = $this->graphQlMutation($query);
395395
self::assertArrayHasKey('placeOrder', $response);
396396
self::assertArrayHasKey('order', $response['placeOrder']);
397-
self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
398-
self::assertNotEmpty($response['placeOrder']['order']['order_id']);
397+
self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
398+
self::assertNotEmpty($response['placeOrder']['order']['order_number']);
399399
}
400400

401401
public function tearDown()

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public function testPlaceOrder()
7979
$response = $this->graphQlMutation($query);
8080

8181
self::assertArrayHasKey('placeOrder', $response);
82-
self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
83-
self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
82+
self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
83+
self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
8484
}
8585

8686
/**
@@ -105,7 +105,7 @@ public function testPlaceOrderIfCartIdIsMissed()
105105
mutation {
106106
placeOrder(input: {}) {
107107
order {
108-
order_id
108+
order_number
109109
}
110110
}
111111
}
@@ -304,7 +304,7 @@ private function getQuery(string $maskedQuoteId): string
304304
mutation {
305305
placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
306306
order {
307-
order_id
307+
order_number
308308
}
309309
}
310310
}

Diff for: ‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
7373

7474
self::assertArrayHasKey('setPaymentMethodAndPlaceOrder', $response);
7575
self::assertArrayHasKey('order', $response['setPaymentMethodAndPlaceOrder']);
76-
self::assertArrayHasKey('order_id', $response['setPaymentMethodAndPlaceOrder']['order']);
76+
self::assertArrayHasKey('order_number', $response['setPaymentMethodAndPlaceOrder']['order']);
7777
}
7878

7979
/**
@@ -111,7 +111,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
111111

112112
self::assertArrayHasKey('setPaymentMethodAndPlaceOrder', $response);
113113
self::assertArrayHasKey('order', $response['setPaymentMethodAndPlaceOrder']);
114-
self::assertArrayHasKey('order_id', $response['setPaymentMethodAndPlaceOrder']['order']);
114+
self::assertArrayHasKey('order_number', $response['setPaymentMethodAndPlaceOrder']['order']);
115115
}
116116

117117
/**
@@ -232,7 +232,7 @@ private function getQuery(
232232
}
233233
}) {
234234
order {
235-
order_id
235+
order_number
236236
}
237237
}
238238
}

Diff for: ‎dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function testDispatchToPlaceOrderWithRegisteredCustomer(): void
108108
}
109109
placeOrder(input: {cart_id: "$cartId"}) {
110110
order {
111-
order_id
111+
order_number
112112
}
113113
}
114114
}
@@ -142,12 +142,12 @@ public function testDispatchToPlaceOrderWithRegisteredCustomer(): void
142142
);
143143

144144
$this->assertTrue(
145-
isset($responseData['data']['placeOrder']['order']['order_id'])
145+
isset($responseData['data']['placeOrder']['order']['order_number'])
146146
);
147147

148148
$this->assertEquals(
149149
'test_quote',
150-
$responseData['data']['placeOrder']['order']['order_id']
150+
$responseData['data']['placeOrder']['order']['order_number']
151151
);
152152
}
153153

Diff for: ‎dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function testDispatchToPlaceAnOrderWithAuthorizenet(): void
108108
}
109109
placeOrder(input: {cart_id: "$cartId"}) {
110110
order {
111-
order_id
111+
order_number
112112
}
113113
}
114114
}
@@ -137,12 +137,12 @@ public function testDispatchToPlaceAnOrderWithAuthorizenet(): void
137137
);
138138

139139
$this->assertTrue(
140-
isset($responseData['data']['placeOrder']['order']['order_id'])
140+
isset($responseData['data']['placeOrder']['order']['order_number'])
141141
);
142142

143143
$this->assertEquals(
144144
'test_quote',
145-
$responseData['data']['placeOrder']['order']['order_id']
145+
$responseData['data']['placeOrder']['order']['order_number']
146146
);
147147
}
148148
}

Diff for: ‎dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function testResolve(string $paymentMethod): void
113113
}
114114
placeOrder(input: {cart_id: "{$maskedCartId}"}) {
115115
order {
116-
order_id
116+
order_number
117117
}
118118
}
119119
}
@@ -205,11 +205,11 @@ public function testResolve(string $paymentMethod): void
205205
);
206206

207207
$this->assertTrue(
208-
isset($responseData['data']['placeOrder']['order']['order_id'])
208+
isset($responseData['data']['placeOrder']['order']['order_number'])
209209
);
210210
$this->assertEquals(
211211
'test_quote',
212-
$responseData['data']['placeOrder']['order']['order_id']
212+
$responseData['data']['placeOrder']['order']['order_number']
213213
);
214214
}
215215

Diff for: ‎dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
134134
}
135135
placeOrder(input: {cart_id: "$cartId"}) {
136136
order {
137-
order_id
137+
order_number
138138
}
139139
}
140140
}
@@ -190,11 +190,11 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
190190
$responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
191191
);
192192
$this->assertTrue(
193-
isset($responseData['data']['placeOrder']['order']['order_id'])
193+
isset($responseData['data']['placeOrder']['order']['order_number'])
194194
);
195195
$this->assertEquals(
196196
'test_quote',
197-
$responseData['data']['placeOrder']['order']['order_id']
197+
$responseData['data']['placeOrder']['order']['order_number']
198198
);
199199
}
200200
}

Diff for: ‎dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function testResolveCustomer(): void
122122
}
123123
placeOrder(input: {cart_id: "{$cartId}"}) {
124124
order {
125-
order_id
125+
order_number
126126
}
127127
}
128128
}
@@ -207,11 +207,11 @@ public function testResolveCustomer(): void
207207
);
208208

209209
$this->assertTrue(
210-
isset($responseData['data']['placeOrder']['order']['order_id'])
210+
isset($responseData['data']['placeOrder']['order']['order_number'])
211211
);
212212
$this->assertEquals(
213213
'test_quote',
214-
$responseData['data']['placeOrder']['order']['order_id']
214+
$responseData['data']['placeOrder']['order']['order_number']
215215
);
216216
}
217217
}

0 commit comments

Comments
 (0)