Merge remote-tracking branch 'shikha/28573_wrong_thumbnail' into 28573_wrong_thumbnail

Author: sasha19957099

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

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver;
+
+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
+     */
+    private $productRepository;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(ProductRepositoryInterface $productRepository)
+    {
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        $cartItem = $value['model'];
+        $product = $this->productRepository->get($cartItem->getSku());
+        $productData = $product->toArray();
+        $productData['model'] = $product;
+        return $productData;
+    }
+}

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

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ConfigurableProductGraphQl\Model\Resolver;
 
 use Magento\Framework\GraphQl\Config\Element\Field;

app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls

@@ -64,6 +64,7 @@ input ConfigurableProductCartItemInput {
 type ConfigurableCartItem implements CartItemInterface {
     customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
     configurable_options: [SelectedConfigurableOption!]! @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ConfigurableCartItemOptions")
+    configured_variant: ProductInterface @doc(description: "Product details of the cart item") @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ProductResolver")
 }
 
 type SelectedConfigurableOption {

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

@@ -416,6 +416,42 @@ public function testAddConfigurableProductToCartWithCustomOption()
         $this->assertResponseFields($item['customizable_options'], $expectedOptions['customizable_options']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_child_products_with_images.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddConfigurableProductWithImageToCart()
+    {
+        $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,
+            $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";
+        $variantImage = basename($variant['thumbnail']['url']);
+        $this->assertEquals($expectedThumbnailUrl, $variantImage);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $parentSku
@@ -458,6 +494,52 @@ 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
+     */
+    private function graphQlQueryForVariant(string $maskedQuoteId, string $parentSku, string $sku, int $quantity): string
+    {
+        return <<<QUERY
+mutation {
+  addConfigurableProductsToCart(
+    input:{
+      cart_id:"{$maskedQuoteId}"
+      cart_items:{
+        parent_sku: "{$parentSku}"
+        data:{
+          sku:"{$sku}"
+          quantity:{$quantity}
+        }
+      }
+    }
+  ) {
+    cart {
+      items {
+        id
+        quantity
+        product {
+          sku
+        }
+        ... on ConfigurableCartItem {
+          configured_variant {
+            sku
+            thumbnail {
+              label
+              url
+            }
+          }
+        }
+      }
+    }
+  }
+}
 QUERY;
     }