Skip to content

Commit

Permalink
Merge pull request #3972 from magento-engcom/graphql-develop-prs
Browse files Browse the repository at this point in the history
[EngCom] Public Pull Requests - GraphQL
  • Loading branch information
naydav authored Mar 30, 2019
2 parents b138617 + f13c1ba commit 19c196e
Show file tree
Hide file tree
Showing 6 changed files with 348 additions and 213 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function calculate(FieldNode $fieldNode) : int
$depth = count($selections) ? 1 : 0;
$childrenDepth = [0];
foreach ($selections as $node) {
if ($node->kind === 'InlineFragment') {
if ($node->kind === 'InlineFragment' || null !== $node->alias) {
continue;
}

Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/CatalogGraphQl/etc/schema.graphqls
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ input ProductFilterInput @doc(description: "ProductFilterInput defines the filte
description: FilterTypeInput @doc(description: "Detailed information about the product. The value can include simple HTML tags.")
short_description: FilterTypeInput @doc(description: "A short description of the product. Its use depends on the theme.")
price: FilterTypeInput @doc(description: "The price of an item")
special_price: FilterTypeInput @doc(description: "The discounted price of the product")
special_price: FilterTypeInput @doc(description: "The discounted price of the product. Do not include the currency code.")
special_from_date: FilterTypeInput @doc(description: "The beginning date that a product has a special price")
special_to_date: FilterTypeInput @doc(description: "The end date that a product has a special price")
weight: FilterTypeInput @doc(description: "The weight of the item, in units defined by the store")
Expand All @@ -477,7 +477,6 @@ input ProductFilterInput @doc(description: "ProductFilterInput defines the filte
custom_layout_update: FilterTypeInput @doc(description: "XML code that is applied as a layout update to the product page")
min_price: FilterTypeInput @doc(description:"The numeric minimal price of the product. Do not include the currency code.")
max_price: FilterTypeInput @doc(description:"The numeric maximal price of the product. Do not include the currency code.")
special_price: FilterTypeInput @doc(description:"The numeric special price of the product. Do not include the currency code.")
category_id: FilterTypeInput @doc(description: "Category ID the product belongs to")
options_container: FilterTypeInput @doc(description: "If the product has multiple options, determines where they appear on the product page")
required_options: FilterTypeInput @doc(description: "Indicates whether the product has required options")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace Magento\GraphQl\Catalog;

use Magento\Catalog\Api\Data\CategoryInterface;
use Magento\Catalog\Model\CategoryRepository;
use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
use Magento\Framework\DataObject;
use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
Expand All @@ -16,16 +17,25 @@
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\TestFramework\ObjectManager;

/**
* Test loading of category tree
*/
class CategoryTest extends GraphQlAbstract
{
/**
* @var \Magento\TestFramework\ObjectManager
*/
private $objectManager;

/**
* @var CategoryRepository
*/
private $categoryRepository;

protected function setUp()
{
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$this->categoryRepository = $this->objectManager->get(CategoryRepository::class);
}

/**
Expand Down Expand Up @@ -103,6 +113,42 @@ public function testCategoriesTree()
);
}

/**
* @magentoApiDataFixture Magento/Catalog/_files/categories.php
*/
public function testCategoriesTreeWithDisabledCategory()
{
$category = $this->categoryRepository->get(3);
$category->setIsActive(false);
$this->categoryRepository->save($category);

$rootCategoryId = 2;
$query = <<<QUERY
{
category(id: {$rootCategoryId}) {
id
name
level
description
children {
id
name
productImagePreview: products(pageSize: 1) {
items {
id
}
}
}
}
}
QUERY;
$response = $this->graphQlQuery($query);

$this->assertArrayHasKey('category', $response);
$this->assertArrayHasKey('children', $response['category']);
$this->assertSame(6, count($response['category']['children']));
}

/**
* @magentoApiDataFixture Magento/Catalog/_files/categories.php
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\GraphQl\Quote\Customer;

use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
use Magento\Integration\Api\CustomerTokenServiceInterface;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\TestCase\GraphQlAbstract;

/**
* Test for setting offline shipping methods on cart
*/
class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
{
/**
* @var GetMaskedQuoteIdByReservedOrderId
*/
private $getMaskedQuoteIdByReservedOrderId;

/**
* @var GetQuoteShippingAddressIdByReservedQuoteId
*/
private $getQuoteShippingAddressIdByReservedQuoteId;

/**
* @var CustomerTokenServiceInterface
*/
private $customerTokenService;

/**
* @inheritdoc
*/
protected function setUp()
{
$objectManager = Bootstrap::getObjectManager();
$this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
$this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(
GetQuoteShippingAddressIdByReservedQuoteId::class
);
$this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
}

/**
* @magentoApiDataFixture Magento/Customer/_files/customer.php
* @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
* @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
*
* @param string $carrierCode
* @param string $methodCode
* @param float $amount
* @param string $label
* @dataProvider offlineShippingMethodDataProvider
*/
public function testSetOfflineShippingMethod(string $carrierCode, string $methodCode, float $amount, string $label)
{
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
$quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');

$query = $this->getQuery(
$maskedQuoteId,
$methodCode,
$carrierCode,
$quoteAddressId
);
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());

self::assertArrayHasKey('setShippingMethodsOnCart', $response);
self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);

$shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
self::assertArrayHasKey('selected_shipping_method', $shippingAddress);

self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);

self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);

self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
self::assertEquals($amount, $shippingAddress['selected_shipping_method']['amount']);

self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
self::assertEquals($label, $shippingAddress['selected_shipping_method']['label']);
}

/**
* @return array
*/
public function offlineShippingMethodDataProvider(): array
{
return [
'flatrate_flatrate' => ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
'tablerate_bestway' => ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
'freeshipping_freeshipping' => ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free'],
];
}

/**
* @param string $maskedQuoteId
* @param string $shippingMethodCode
* @param string $shippingCarrierCode
* @param int $shippingAddressId
* @return string
*/
private function getQuery(
string $maskedQuoteId,
string $shippingMethodCode,
string $shippingCarrierCode,
int $shippingAddressId
): string {
return <<<QUERY
mutation {
setShippingMethodsOnCart(input:
{
cart_id: "$maskedQuoteId",
shipping_methods: [{
cart_address_id: $shippingAddressId
carrier_code: "$shippingCarrierCode"
method_code: "$shippingMethodCode"
}]
}) {
cart {
shipping_addresses {
selected_shipping_method {
carrier_code
method_code
amount
label
}
}
}
}
}
QUERY;
}

/**
* @param string $username
* @param string $password
* @return array
*/
private function getHeaderMap(string $username = '[email protected]', string $password = 'password'): array
{
$customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
$headerMap = ['Authorization' => 'Bearer ' . $customerToken];
return $headerMap;
}
}
Loading

0 comments on commit 19c196e

Please sign in to comment.