Merge remote-tracking branch 'magento-l3/ACP2E-2128' into AUG102023_PR_pradeep

Author: pradeep1819

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

@@ -51,6 +51,9 @@ public function resolve(
         $mediaGalleryEntries = [];
         foreach ($product->getMediaGalleryEntries() ?? [] as $key => $entry) {
             $mediaGalleryEntries[$key] = $entry->getData();
+            if ($mediaGalleryEntries[$key]['label'] === null) {
+                $mediaGalleryEntries[$key]['label'] = $product->getName();
+            }
             $mediaGalleryEntries[$key]['model'] = $product;
             if ($entry->getExtensionAttributes() && $entry->getExtensionAttributes()->getVideoContent()) {
                 $mediaGalleryEntries[$key]['video_content']

app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/MediaGalleryTest.php

@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Test\Unit\Model\Resolver\Product;
+
+use Exception;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Gallery\Entry;
+use Magento\CatalogGraphQl\Model\Resolver\Product\MediaGallery;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\GraphQl\Config\Element\Field;
+
+class MediaGalleryTest extends TestCase
+{
+    /**
+     * @var Field|MockObject
+     */
+    private Field|MockObject $fieldMock;
+
+    /**
+     * @var ContextInterface|MockObject
+     */
+    private ContextInterface|MockObject $contextMock;
+
+    /**
+     * @var ResolveInfo|MockObject
+     */
+    private ResolveInfo|MockObject $infoMock;
+
+    /**
+     * @var Product|MockObject
+     */
+    private Product|MockObject $productMock;
+
+    /**
+     * @var MediaGallery
+     */
+    private MediaGallery $mediaGallery;
+
+    protected function setUp(): void
+    {
+        $this->fieldMock = $this->createMock(Field::class);
+        $this->contextMock = $this->getMockForAbstractClass(ContextInterface::class);
+        $this->infoMock = $this->createMock(ResolveInfo::class);
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->mediaGallery = new MediaGallery();
+    }
+
+    /**
+     * @dataProvider dataProviderForResolve
+     * @param $expected
+     * @param $productName
+     * @return void
+     * @throws Exception
+     */
+    public function testResolve($expected, $productName): void
+    {
+        $existingEntryMock = $this->getMockBuilder(Entry::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getName', 'getData', 'getExtensionAttributes'])
+            ->getMock();
+        $existingEntryMock->expects($this->any())->method('getData')->willReturn($expected);
+        $existingEntryMock->expects($this->any())->method(
+            'getExtensionAttributes'
+        )->willReturn(false);
+        $this->productMock->expects($this->any())->method('getName')->willReturn($productName);
+        $this->productMock->expects($this->any())->method('getMediaGalleryEntries')
+            ->willReturn([$existingEntryMock]);
+        $result = $this->mediaGallery->resolve(
+            $this->fieldMock,
+            $this->contextMock,
+            $this->infoMock,
+            [
+                'model' => $this->productMock
+            ],
+            []
+        );
+        $this->assertNotEmpty($result);
+        $this->assertEquals($productName, $result[0]['label']);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderForResolve(): array
+    {
+        return [
+            [
+                [
+                    "file" => "/w/b/wb01-black-0.jpg",
+                    "media_type" => "image",
+                    "label" => null,
+                    "position" => "1",
+                    "disabled" => "0",
+                    "types" => [
+                        "image",
+                        "small_image"
+                    ],
+                    "id" => "11"
+                ],
+                "TestImage"
+            ],
+            [
+                [
+                    "file" => "/w/b/wb01-black-0.jpg",
+                    "media_type" => "image",
+                    "label" => "HelloWorld",
+                    "position" => "1",
+                    "disabled" => "0",
+                    "types" => [
+                        "image",
+                        "small_image"
+                    ],
+                    "id" => "11"
+                ],
+                "HelloWorld"
+            ]
+        ];
+    }
+}

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

@@ -237,8 +237,10 @@ public function testResolverCacheRecordIsCreatedForEachStoreView()
             )
         );
 
-        // The entry's label in second store view is null by default; assert the cache record has the same value
-        $this->assertNull(json_decode($cacheEntryInSecondStoreView, true)[0]['label']);
+        // The entry's label in second store view is not null by default and has product name;
+        // assert the cache record has the same value
+        $this->assertNotNull(json_decode($cacheEntryInSecondStoreView, true)[0]['label']);
+        $this->assertEquals($product->getName(), json_decode($cacheEntryInSecondStoreView, true)[0]['label']);
 
         // Assert cache keys are different
         $this->assertNotEquals(