#28573:GraphQL ConfigurableCartItem added to Cart returns wrong thumbnail image - improved perfomance and test coverage

Author: sasha19957099

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ProductResolver.php

@@ -7,28 +7,28 @@
 
 namespace Magento\ConfigurableProductGraphQl\Model\Resolver;
 
+use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
  * Fetches the Product data according to the GraphQL schema
  */
 class ProductResolver implements ResolverInterface
 {
     /**
-     * @var ProductRepositoryInterface
+     * @var ItemResolverInterface
      */
-    private $productRepository;
+    private $configurableItemResolver;
 
     /**
-     * @param ProductRepositoryInterface $productRepository
+     * @param ItemResolverInterface $configurableItemResolver
      */
-    public function __construct(ProductRepositoryInterface $productRepository)
+    public function __construct(ItemResolverInterface $configurableItemResolver)
     {
-        $this->productRepository = $productRepository;
+        $this->configurableItemResolver = $configurableItemResolver;
     }
 
     /**
@@ -45,8 +45,7 @@ public function resolve(
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        $cartItem = $value['model'];
-        $product = $this->productRepository->get($cartItem->getSku());
+        $product = $this->configurableItemResolver->getFinalProduct($value['model']);
         $productData = $product->toArray();
         $productData['model'] = $product;
         return $productData;

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php

@@ -417,39 +417,78 @@ public function testAddConfigurableProductToCartWithCustomOption()
     }
 
     /**
+     * @magentoConfigFixture default_store checkout/cart/configurable_product_image itself
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_child_products_with_images.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      */
-    public function testAddConfigurableProductWithImageToCart()
+    public function testAddConfigurableProductWithImageToCartItselfImage(): void
     {
         $searchResponse = $this->graphQlQuery($this->getFetchProductQuery('configurable'));
         $product = current($searchResponse['products']['items']);
-        
+
         $quantity = 1;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
         $parentSku = $product['sku'];
         $sku = 'simple_20';
-        $attributeId = (int) $product['configurable_options'][0]['attribute_id'];
-        $optionId = $product['configurable_options'][0]['values'][1]['value_index'];
 
         $query = $this->graphQlQueryForVariant(
-            $maskedQuoteId,
+            $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1'),
             $parentSku,
             $sku,
             $quantity
         );
-       
+
         $response = $this->graphQlMutation($query);
-        
+
         $cartItem = current($response['addConfigurableProductsToCart']['cart']['items']);
         self::assertEquals($quantity, $cartItem['quantity']);
         self::assertEquals($parentSku, $cartItem['product']['sku']);
         self::assertArrayHasKey('configured_variant', $cartItem);
 
         $variant = $cartItem['configured_variant'];
-        $expectedThumbnailUrl = "magento_thumbnail.jpg";
+        $expectedThumbnailUrl = 'magento_thumbnail.jpg';
+        $expectedThumbnailLabel = 'Thumbnail Image';
         $variantImage = basename($variant['thumbnail']['url']);
-        $this->assertEquals($expectedThumbnailUrl, $variantImage);
+
+        self::assertEquals($expectedThumbnailUrl, $variantImage);
+        self::assertEquals($expectedThumbnailLabel, $variant['thumbnail']['label']);
+        self::assertEquals($sku, $variant['sku']);
+    }
+
+    /**
+     * @magentoConfigFixture default_store checkout/cart/configurable_product_image parent
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_child_products_with_images.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddConfigurableProductWithImageToCartParentImage(): void
+    {
+        $searchResponse = $this->graphQlQuery($this->getFetchProductQuery('configurable'));
+        $product = current($searchResponse['products']['items']);
+
+        $quantity = 1;
+        $parentSku = $product['sku'];
+
+        $query = $this->graphQlQueryForVariant(
+            $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1'),
+            $parentSku,
+            'simple_20',
+            $quantity
+        );
+
+        $response = $this->graphQlMutation($query);
+
+        $cartItem = current($response['addConfigurableProductsToCart']['cart']['items']);
+        self::assertEquals($quantity, $cartItem['quantity']);
+        self::assertEquals($parentSku, $cartItem['product']['sku']);
+        self::assertArrayHasKey('configured_variant', $cartItem);
+
+        $variant = $cartItem['configured_variant'];
+        $expectedThumbnailUrl = 'thumbnail.jpg';
+        $expectedThumbnailLabel = 'Configurable Product';
+        $variantImage = basename($variant['thumbnail']['url']);
+
+        self::assertEquals($expectedThumbnailUrl, $variantImage);
+        self::assertEquals($expectedThumbnailLabel, $variant['thumbnail']['label']);
+        self::assertEquals($parentSku, $variant['sku']);
     }
 
     /**
@@ -497,12 +536,12 @@ private function getQuery(string $maskedQuoteId, string $parentSku, string $sku,
 QUERY;
     }
 
-/**
+    /**
      * @param string $maskedQuoteId
      * @param string $parentSku
      * @param string $sku
      * @param int $quantity
-     * @return cart items with variants details
+     * @return string
      */
     private function graphQlQueryForVariant(string $maskedQuoteId, string $parentSku, string $sku, int $quantity): string
     {
@@ -582,6 +621,7 @@ private function getFetchProductQuery(string $term): string
      *
      * @param string $productSku
      * @return array
+     * @throws Exception
      */
     private function getAvailableProductCustomOption(string $productSku): array
     {