Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.

Small image URL added to the product data #132

Merged
merged 19 commits into from
Sep 26, 2018
Merged

Small image URL added to the product data #132

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1288659
Small image URL added to the product data
rogyar Jul 19, 2018
ca13aa8
API-functional tests added
rogyar Jul 26, 2018
f41eb3e
Use current store id instead of admin store id
rogyar Jul 31, 2018
fe6d7f8
API-functional test improvements
rogyar Sep 5, 2018
a60e55d
Added parameter type in DocBlock
rogyar Sep 5, 2018
6877798
Removed area simulation. Resolver improvements
rogyar Sep 12, 2018
646f248
Declared new type for product images
rogyar Sep 12, 2018
f8b59e7
DocBlock comment adjustments
rogyar Sep 12, 2018
a027ae7
Removed debug parts
rogyar Sep 13, 2018
c53bb4f
Removed placeholder test
rogyar Sep 13, 2018
5a674c7
Making the resolver universal
rogyar Sep 14, 2018
4de3a9e
Merge branch '2.3-develop' into 88-small-image-url
rogyar Sep 14, 2018
0ea7d50
Return scalar type instead of deferred
rogyar Sep 14, 2018
a4c941e
GraphQL-88: Small image URL added to the product data
Sep 17, 2018
a6d7d45
GraphQL-88: Small image URL added to the product data
Sep 17, 2018
ca8c7fc
Fixed failing tests
rogyar Sep 17, 2018
d860874
Merge branch '88-small-image-url' of github.com:magento/graphql-ce in…
rogyar Sep 17, 2018
45cc658
Merge remote-tracking branch 'origin/2.3-develop' into 88-small-image…
Sep 20, 2018
dad6575
GraphQL-88: 'small_image' in 'ProductInterface' does not have enough …
Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Magento\Catalog\Helper\ImageFactory as CatalogImageHelperFactory;
use Magento\Catalog\Model\Product;
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;

Expand Down Expand Up @@ -43,7 +44,7 @@ public function resolve(
array $args = null
): array {
if (!isset($value['model'])) {
throw new \LogicException(__("Cannot resolve entity model"));
throw new GraphQlInputException(__('"model" value should be specified'));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? Client knows nothing about the model. It must be passed from the parent resolver. I think before the change we had correct exception, the only change I would made is remove translation:
throw new \LogicException("Cannot resolve entity model");

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#189
Has been created

}
/** @var Product $product */
$product = $value['model'];
Expand Down
4 changes: 3 additions & 1 deletion dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,9 @@ public function testCategoryProducts()
}
short_description
sku
small_image
small_image {
path
}
small_image_label
special_from_date
special_price
Expand Down
6 changes: 4 additions & 2 deletions dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ public function testQueryAllFieldsSimpleProduct()
}
short_description
sku
small_image
small_image {
path
}
small_image_label
special_from_date
special_price
Expand Down Expand Up @@ -484,7 +486,7 @@ public function testQueryMediaGalleryEntryFieldsSimpleProduct()
QUERY;

$response = $this->graphQlQuery($query);

/**
* @var ProductRepositoryInterface $productRepository
*/
Expand Down