Merge branch 'ENGCOM-2948-magento-graphql-ce-132' into graphql-develop-prs

Author: Valeriy Nayda

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Image.php

@@ -7,10 +7,9 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Product;
 
-use Magento\Catalog\Helper\ImageFactory as CatalogImageHelperFactory;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\ImageFactory;
 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;
 
@@ -20,17 +19,19 @@
 class Image implements ResolverInterface
 {
     /**
-     * @var CatalogImageHelperFactory
+     * Product image factory
+     *
+     * @var ImageFactory
      */
-    private $catalogImageHelperFactory;
+    private $productImageFactory;
 
     /**
-     * @param CatalogImageHelperFactory $catalogImageHelperFactory
+     * @param ImageFactory $productImageFactory
      */
     public function __construct(
-        CatalogImageHelperFactory $catalogImageHelperFactory
+        ImageFactory $productImageFactory
     ) {
-        $this->catalogImageHelperFactory = $catalogImageHelperFactory;
+        $this->productImageFactory = $productImageFactory;
     }
 
     /**
@@ -44,22 +45,21 @@ public function resolve(
         array $args = null
     ): array {
         if (!isset($value['model'])) {
-            throw new GraphQlInputException(__('"model" value should be specified'));
+            throw new \LogicException(__('"model" value should be specified'));
         }
         /** @var Product $product */
         $product = $value['model'];
         $imageType = $field->getName();
+        $path = $product->getData($imageType);
 
-        $catalogImageHelper = $this->catalogImageHelperFactory->create();
-        $imageUrl = $catalogImageHelper->init(
-            $product,
-            'product_' . $imageType,
-            ['type' => $imageType]
-        )->getUrl();
+        $image = $this->productImageFactory->create();
+        $image->setDestinationSubdir($imageType)
+            ->setBaseFile($path);
+        $imageUrl = $image->getUrl();
 
         return [
             'url' => $imageUrl,
-            'path' => $product->getData($imageType)
+            'path' => $path,
         ];
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/MediaGalleryTest.php

@@ -31,9 +31,9 @@ public function testProductSmallImageUrlWithExistingImage()
 {
   products(filter: {sku: {eq: "{$productSku}"}}) {
     items {
-   		small_image {
-   		    url
-   		}
+        small_image {
+            url
+        }
     }
   }    
 }