Skip to content

Commit 1cf0178

Browse files
AleksLiAleksLi
committed
GraphQL-432: Replaced the places are using getMaskedQuoteId as method. Added new class to handle that.
1 parent 5e4adb8 commit 1cf0178

11 files changed

+137
-155
lines changed

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\GraphQl\Quote\Customer;
99

1010
use Magento\Integration\Api\CustomerTokenServiceInterface;
11+
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
1112
use Magento\Quote\Model\QuoteFactory;
1213
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
1314
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -24,6 +25,11 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
2425
*/
2526
private $customerTokenService;
2627

28+
/**
29+
* @var GetMaskedQuoteIdByReversedQuoteId
30+
*/
31+
private $getMaskedQuoteIdByReversedQuoteId;
32+
2733
/**
2834
* @var QuoteResource
2935
*/
@@ -45,6 +51,7 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
4551
protected function setUp()
4652
{
4753
$objectManager = Bootstrap::getObjectManager();
54+
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
4855
$this->quoteResource = $objectManager->get(QuoteResource::class);
4956
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
5057
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -53,10 +60,12 @@ protected function setUp()
5360

5461
/**
5562
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
63+
* @throws \Exception
64+
* @throws \Magento\Framework\Exception\NoSuchEntityException
5665
*/
5766
public function testGetCartWithPaymentMethods()
5867
{
59-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
68+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
6069

6170
$query = <<<QUERY
6271
{
@@ -86,16 +95,4 @@ private function getHeaderMap(string $username = 'customer@example.com', string
8695
$headerMap = ['Authorization' => 'Bearer ' . $customerToken];
8796
return $headerMap;
8897
}
89-
90-
/**
91-
* @param string $reversedQuoteId
92-
* @return string
93-
*/
94-
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
95-
{
96-
$quote = $this->quoteFactory->create();
97-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
98-
99-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
100-
}
10198
}

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\GraphQl\Quote\Customer;
99

1010
use Magento\Integration\Api\CustomerTokenServiceInterface;
11+
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
1112
use Magento\Quote\Model\QuoteFactory;
1213
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
1314
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -19,6 +20,11 @@
1920
*/
2021
class GetCartTest extends GraphQlAbstract
2122
{
23+
/**
24+
* @var GetMaskedQuoteIdByReversedQuoteId
25+
*/
26+
private $getMaskedQuoteIdByReversedQuoteId;
27+
2228
/**
2329
* @var QuoteResource
2430
*/
@@ -42,6 +48,7 @@ class GetCartTest extends GraphQlAbstract
4248
protected function setUp()
4349
{
4450
$objectManager = Bootstrap::getObjectManager();
51+
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
4552
$this->quoteResource = $objectManager->get(QuoteResource::class);
4653
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
4754
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -50,10 +57,12 @@ protected function setUp()
5057

5158
/**
5259
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
60+
* @throws \Exception
61+
* @throws \Magento\Framework\Exception\NoSuchEntityException
5362
*/
5463
public function testGetCart()
5564
{
56-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
65+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
5766
$query = $this->getCartQuery($maskedQuoteId);
5867

5968
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -74,10 +83,12 @@ public function testGetCart()
7483
/**
7584
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
7685
* @magentoApiDataFixture Magento/Customer/_files/customer.php
86+
* @throws \Exception
87+
* @throws \Magento\Framework\Exception\NoSuchEntityException
7788
*/
7889
public function testGetGuestCart()
7990
{
80-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
91+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
8192
$query = $this->getCartQuery($maskedQuoteId);
8293

8394
$this->expectExceptionMessage(
@@ -89,10 +100,12 @@ public function testGetGuestCart()
89100
/**
90101
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
91102
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
103+
* @throws \Exception
104+
* @throws \Magento\Framework\Exception\NoSuchEntityException
92105
*/
93106
public function testGetAnotherCustomerCart()
94107
{
95-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
108+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
96109
$query = $this->getCartQuery($maskedQuoteId);
97110

98111
$this->expectExceptionMessage(
@@ -136,18 +149,6 @@ private function getCartQuery(
136149
QUERY;
137150
}
138151

139-
/**
140-
* @param string $reversedQuoteId
141-
* @return string
142-
*/
143-
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
144-
{
145-
$quote = $this->quoteFactory->create();
146-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
147-
148-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
149-
}
150-
151152
/**
152153
* @param string $username
153154
* @param string $password

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\GraphQl\Quote\Customer;
99

1010
use Magento\Integration\Api\CustomerTokenServiceInterface;
11+
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
1112
use Magento\Quote\Model\QuoteFactory;
1213
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
1314
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -19,6 +20,11 @@
1920
*/
2021
class SetBillingAddressOnCartTest extends GraphQlAbstract
2122
{
23+
/**
24+
* @var GetMaskedQuoteIdByReversedQuoteId
25+
*/
26+
private $getMaskedQuoteIdByReversedQuoteId;
27+
2228
/**
2329
* @var QuoteResource
2430
*/
@@ -42,6 +48,7 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
4248
protected function setUp()
4349
{
4450
$objectManager = Bootstrap::getObjectManager();
51+
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
4552
$this->quoteResource = $objectManager->get(QuoteResource::class);
4653
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
4754
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -307,10 +314,12 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
307314
* @magentoApiDataFixture Magento/Customer/_files/customer.php
308315
* @magentoApiDataFixture Magento/Customer/_files/customer_address.php
309316
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
317+
* @throws \Exception
318+
* @throws \Magento\Framework\Exception\NoSuchEntityException
310319
*/
311320
public function testSetBillingAddressToGuestCart()
312321
{
313-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
322+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
314323

315324
$query = <<<QUERY
316325
mutation {
@@ -459,18 +468,6 @@ private function getHeaderMap(string $username = 'customer@example.com', string
459468
return $headerMap;
460469
}
461470

462-
/**
463-
* @param string $reversedQuoteId
464-
* @return string
465-
*/
466-
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
467-
{
468-
$quote = $this->quoteFactory->create();
469-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
470-
471-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
472-
}
473-
474471
/**
475472
* @param string $reversedQuoteId
476473
* @param int $customerId

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
use Magento\Integration\Api\CustomerTokenServiceInterface;
1111
use Magento\OfflinePayments\Model\Checkmo;
12+
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
1213
use Magento\Quote\Model\QuoteFactory;
1314
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
1415
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -25,6 +26,11 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
2526
*/
2627
private $customerTokenService;
2728

29+
/**
30+
* @var GetMaskedQuoteIdByReversedQuoteId
31+
*/
32+
private $getMaskedQuoteIdByReversedQuoteId;
33+
2834
/**
2935
* @var QuoteResource
3036
*/
@@ -46,6 +52,7 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
4652
protected function setUp()
4753
{
4854
$objectManager = Bootstrap::getObjectManager();
55+
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
4956
$this->quoteResource = $objectManager->get(QuoteResource::class);
5057
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
5158
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -54,11 +61,13 @@ protected function setUp()
5461

5562
/**
5663
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
64+
* @throws \Exception
65+
* @throws \Magento\Framework\Exception\NoSuchEntityException
5766
*/
5867
public function testSetPaymentWithVirtualProduct()
5968
{
6069
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
61-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
70+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_virtual_product');
6271

6372
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
6473
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -71,11 +80,13 @@ public function testSetPaymentWithVirtualProduct()
7180

7281
/**
7382
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
83+
* @throws \Exception
84+
* @throws \Magento\Framework\Exception\NoSuchEntityException
7485
*/
7586
public function testSetPaymentWithSimpleProduct()
7687
{
7788
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
78-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
89+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
7990

8091
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
8192
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -109,7 +120,7 @@ public function testSetPaymentWithSimpleProductWithoutAddress()
109120
public function testSetNonExistingPaymentMethod()
110121
{
111122
$methodCode = 'noway';
112-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
123+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
113124

114125
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
115126
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -118,11 +129,13 @@ public function testSetNonExistingPaymentMethod()
118129
/**
119130
* @magentoApiDataFixture Magento/Customer/_files/customer.php
120131
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
132+
* @throws \Exception
133+
* @throws \Magento\Framework\Exception\NoSuchEntityException
121134
*/
122135
public function testSetPaymentMethodToGuestCart()
123136
{
124137
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
125-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
138+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
126139

127140
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
128141

@@ -136,11 +149,13 @@ public function testSetPaymentMethodToGuestCart()
136149
/**
137150
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
138151
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
152+
* @throws \Exception
153+
* @throws \Magento\Framework\Exception\NoSuchEntityException
139154
*/
140155
public function testSetPaymentMethodToAnotherCustomerCart()
141156
{
142157
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
143-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
158+
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
144159

145160
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
146161

@@ -178,18 +193,6 @@ private function prepareMutationQuery(
178193
QUERY;
179194
}
180195

181-
/**
182-
* @param string $reversedQuoteId
183-
* @return string
184-
*/
185-
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
186-
{
187-
$quote = $this->quoteFactory->create();
188-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
189-
190-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
191-
}
192-
193196
/**
194197
* @param string $reversedQuoteId
195198
* @param int $customerId

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\GraphQl\Quote\Customer;
99

1010
use Magento\Integration\Api\CustomerTokenServiceInterface;
11+
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
1112
use Magento\Quote\Model\QuoteFactory;
1213
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
1314
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -19,6 +20,11 @@
1920
*/
2021
class SetShippingMethodsOnCartTest extends GraphQlAbstract
2122
{
23+
/**
24+
* @var GetMaskedQuoteIdByReversedQuoteId
25+
*/
26+
private $getMaskedQuoteIdByReversedQuoteId;
27+
2228
/**
2329
* @var CustomerTokenServiceInterface
2430
*/
@@ -45,6 +51,7 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
4551
protected function setUp()
4652
{
4753
$objectManager = Bootstrap::getObjectManager();
54+
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
4855
$this->quoteResource = $objectManager->get(QuoteResource::class);
4956
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
5057
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -161,19 +168,6 @@ private function prepareMutationQuery(
161168
QUERY;
162169
}
163170

164-
/**
165-
* @param string $reversedQuoteId
166-
* @return string
167-
* @SuppressWarnings(PHPMD.UnusedPrivateMethod)
168-
*/
169-
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
170-
{
171-
$quote = $this->quoteFactory->create();
172-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
173-
174-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
175-
}
176-
177171
/**
178172
* @param string $reversedQuoteId
179173
* @param int $customerId

0 commit comments

Comments
 (0)