Skip to content

Commit

Permalink
GraphQL-432: Replaced the places are using getMaskedQuoteId as method…
Browse files Browse the repository at this point in the history 
…. Added new class to handle that.
  • Loading branch information
@AleksLi
AleksLi committed Mar 13, 2019
1 parent 5e4adb8 commit 1cf0178
Show file tree
Hide file tree
Showing 11 changed files with 137 additions and 155 deletions.
23 changes: 10 additions & 13 deletions ...pi-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace Magento\GraphQl\Quote\Customer;

use Magento\Integration\Api\CustomerTokenServiceInterface;
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
use Magento\Quote\Model\QuoteFactory;
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
Expand All @@ -24,6 +25,11 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
*/
private $customerTokenService;

/**
* @var GetMaskedQuoteIdByReversedQuoteId
*/
private $getMaskedQuoteIdByReversedQuoteId;

/**
* @var QuoteResource
*/
Expand All @@ -45,6 +51,7 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
protected function setUp()
{
$objectManager = Bootstrap::getObjectManager();
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
$this->quoteResource = $objectManager->get(QuoteResource::class);
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
Expand All @@ -53,10 +60,12 @@ protected function setUp()

/**
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testGetCartWithPaymentMethods()
{
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');

$query = <<<QUERY
{
Expand Down Expand Up @@ -86,16 +95,4 @@ private function getHeaderMap(string $username = 'customer@example.com', string
$headerMap = ['Authorization' => 'Bearer ' . $customerToken];
return $headerMap;
}

/**
* @param string $reversedQuoteId
* @return string
*/
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
{
$quote = $this->quoteFactory->create();
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');

return $this->quoteIdToMaskedId->execute((int)$quote->getId());
}
}
31 changes: 16 additions & 15 deletions dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace Magento\GraphQl\Quote\Customer;

use Magento\Integration\Api\CustomerTokenServiceInterface;
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
use Magento\Quote\Model\QuoteFactory;
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
Expand All @@ -19,6 +20,11 @@
*/
class GetCartTest extends GraphQlAbstract
{
/**
* @var GetMaskedQuoteIdByReversedQuoteId
*/
private $getMaskedQuoteIdByReversedQuoteId;

/**
* @var QuoteResource
*/
Expand All @@ -42,6 +48,7 @@ class GetCartTest extends GraphQlAbstract
protected function setUp()
{
$objectManager = Bootstrap::getObjectManager();
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
$this->quoteResource = $objectManager->get(QuoteResource::class);
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
Expand All @@ -50,10 +57,12 @@ protected function setUp()

/**
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testGetCart()
{
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
$query = $this->getCartQuery($maskedQuoteId);

$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
Expand All @@ -74,10 +83,12 @@ public function testGetCart()
/**
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testGetGuestCart()
{
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
$query = $this->getCartQuery($maskedQuoteId);

$this->expectExceptionMessage(
Expand All @@ -89,10 +100,12 @@ public function testGetGuestCart()
/**
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testGetAnotherCustomerCart()
{
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
$query = $this->getCartQuery($maskedQuoteId);

$this->expectExceptionMessage(
Expand Down Expand Up @@ -136,18 +149,6 @@ private function getCartQuery(
QUERY;
}

/**
* @param string $reversedQuoteId
* @return string
*/
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
{
$quote = $this->quoteFactory->create();
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');

return $this->quoteIdToMaskedId->execute((int)$quote->getId());
}

/**
* @param string $username
* @param string $password
Expand Down
23 changes: 10 additions & 13 deletions ...s/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace Magento\GraphQl\Quote\Customer;

use Magento\Integration\Api\CustomerTokenServiceInterface;
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
use Magento\Quote\Model\QuoteFactory;
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
Expand All @@ -19,6 +20,11 @@
*/
class SetBillingAddressOnCartTest extends GraphQlAbstract
{
/**
* @var GetMaskedQuoteIdByReversedQuoteId
*/
private $getMaskedQuoteIdByReversedQuoteId;

/**
* @var QuoteResource
*/
Expand All @@ -42,6 +48,7 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
protected function setUp()
{
$objectManager = Bootstrap::getObjectManager();
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
$this->quoteResource = $objectManager->get(QuoteResource::class);
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
Expand Down Expand Up @@ -307,10 +314,12 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/Customer/_files/customer_address.php
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testSetBillingAddressToGuestCart()
{
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');

$query = <<<QUERY
mutation {
Expand Down Expand Up @@ -459,18 +468,6 @@ private function getHeaderMap(string $username = 'customer@example.com', string
return $headerMap;
}

/**
* @param string $reversedQuoteId
* @return string
*/
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
{
$quote = $this->quoteFactory->create();
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');

return $this->quoteIdToMaskedId->execute((int)$quote->getId());
}

/**
* @param string $reversedQuoteId
* @param int $customerId
Expand Down
37 changes: 20 additions & 17 deletions ...ts/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

use Magento\Integration\Api\CustomerTokenServiceInterface;
use Magento\OfflinePayments\Model\Checkmo;
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
use Magento\Quote\Model\QuoteFactory;
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
Expand All @@ -25,6 +26,11 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
*/
private $customerTokenService;

/**
* @var GetMaskedQuoteIdByReversedQuoteId
*/
private $getMaskedQuoteIdByReversedQuoteId;

/**
* @var QuoteResource
*/
Expand All @@ -46,6 +52,7 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
protected function setUp()
{
$objectManager = Bootstrap::getObjectManager();
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
$this->quoteResource = $objectManager->get(QuoteResource::class);
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
Expand All @@ -54,11 +61,13 @@ protected function setUp()

/**
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testSetPaymentWithVirtualProduct()
{
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_virtual_product');

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

/**
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testSetPaymentWithSimpleProduct()
{
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');

$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
Expand Down Expand Up @@ -109,7 +120,7 @@ public function testSetPaymentWithSimpleProductWithoutAddress()
public function testSetNonExistingPaymentMethod()
{
$methodCode = 'noway';
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');

$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
Expand All @@ -118,11 +129,13 @@ public function testSetNonExistingPaymentMethod()
/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testSetPaymentMethodToGuestCart()
{
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');

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

Expand All @@ -136,11 +149,13 @@ public function testSetPaymentMethodToGuestCart()
/**
* @magentoApiDataFixture Magento/Customer/_files/three_customers.php
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
* @throws \Exception
* @throws \Magento\Framework\Exception\NoSuchEntityException
*/
public function testSetPaymentMethodToAnotherCustomerCart()
{
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');

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

Expand Down Expand Up @@ -178,18 +193,6 @@ private function prepareMutationQuery(
QUERY;
}

/**
* @param string $reversedQuoteId
* @return string
*/
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
{
$quote = $this->quoteFactory->create();
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');

return $this->quoteIdToMaskedId->execute((int)$quote->getId());
}

/**
* @param string $reversedQuoteId
* @param int $customerId
Expand Down
20 changes: 7 additions & 13 deletions .../api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace Magento\GraphQl\Quote\Customer;

use Magento\Integration\Api\CustomerTokenServiceInterface;
use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
use Magento\Quote\Model\QuoteFactory;
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
Expand All @@ -19,6 +20,11 @@
*/
class SetShippingMethodsOnCartTest extends GraphQlAbstract
{
/**
* @var GetMaskedQuoteIdByReversedQuoteId
*/
private $getMaskedQuoteIdByReversedQuoteId;

/**
* @var CustomerTokenServiceInterface
*/
Expand All @@ -45,6 +51,7 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
protected function setUp()
{
$objectManager = Bootstrap::getObjectManager();
$this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
$this->quoteResource = $objectManager->get(QuoteResource::class);
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
Expand Down Expand Up @@ -161,19 +168,6 @@ private function prepareMutationQuery(
QUERY;
}

/**
* @param string $reversedQuoteId
* @return string
* @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*/
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
{
$quote = $this->quoteFactory->create();
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');

return $this->quoteIdToMaskedId->execute((int)$quote->getId());
}

/**
* @param string $reversedQuoteId
* @param int $customerId
Expand Down
Loading

0 comments on commit 1cf0178

Please sign in to comment.