Merge remote-tracking branch '37862/37607-REST-Configurable-Products-sku-childrenendpoint-missing-media_gallery_entries' into comm_247beta3

Author: Indraniks

app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php

@@ -9,16 +9,16 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
- * Class Thumbnail
+ * Class prepares Thumbnail
  *
  * @api
  * @since 100.0.2
  */
 class Thumbnail extends \Magento\Ui\Component\Listing\Columns\Column
 {
-    const NAME = 'thumbnail';
+    public const NAME = 'thumbnail';
 
-    const ALT_FIELD = 'name';
+    public const ALT_FIELD = 'name';
 
     /**
      * @var \Magento\Catalog\Helper\Image
@@ -77,7 +77,6 @@ public function prepareDataSource(array $dataSource)
 
         return $dataSource;
     }
-
     /**
      * Get Alt
      *
@@ -88,6 +87,7 @@ public function prepareDataSource(array $dataSource)
     protected function getAlt($row)
     {
         $altField = $this->getData('config/altField') ?: self::ALT_FIELD;
-        return $row[$altField] ?? null;
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        return html_entity_decode($row[$altField], ENT_QUOTES, "UTF-8") ?? null;
     }
 }

app/code/Magento/ConfigurableProduct/Model/LinkManagement.php

@@ -6,6 +6,8 @@
 
 namespace Magento\ConfigurableProduct\Model;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
@@ -47,6 +49,16 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
      */
     private $attributeFactory;
 
+    /**
+     * @var ProductRepository|mixed
+     */
+    public \Magento\Catalog\Model\ProductRepository $mediaGallery;
+
+    /**
+     * @var ProductAttributeMediaGalleryEntryInterfaceFactory|mixed
+     */
+    public \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $myModelFactory;
+
     /**
      * Constructor
      *
@@ -55,20 +67,28 @@ class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementI
      * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurableType
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory
+     * @param \Magento\Catalog\Model\ProductRepository $mediaGalleryProcessor
+     * @param \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $myModelFactory
      */
     public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\Data\ProductInterfaceFactory $productFactory,
         \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurableType,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-        \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory = null
+        \Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory $attributeFactory = null,
+        \Magento\Catalog\Model\ProductRepository $mediaGalleryProcessor = null,
+        \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $myModelFactory = null
     ) {
         $this->productRepository = $productRepository;
         $this->productFactory = $productFactory;
         $this->configurableType = $configurableType;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->attributeFactory = $attributeFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory::class);
+        $this->mediaGallery = $mediaGalleryProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Model\ProductRepository::class);
+        $this->myModelFactory = $myModelFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory::class);
     }
 
     /**
@@ -81,11 +101,9 @@ public function getChildren($sku)
         if ($product->getTypeId() != \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
             return [];
         }
-
         /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $productTypeInstance */
         $productTypeInstance = $product->getTypeInstance();
         $productTypeInstance->setStoreFilter($product->getStoreId(), $product);
-
         $childrenList = [];
         /** @var \Magento\Catalog\Model\Product $child */
         foreach ($productTypeInstance->getUsedProducts($product) as $child) {
@@ -97,7 +115,9 @@ public function getChildren($sku)
                     $attributes[$attrCode] = $value;
                 }
             }
+            $images= (array)$child->getMediaGallery('images');
             $attributes['store_id'] = $child->getStoreId();
+            $attributes['media_gallery_entries'] = $this->getMediaEntries($images);
             /** @var \Magento\Catalog\Api\Data\ProductInterface $productDataObject */
             $productDataObject = $this->productFactory->create();
             $this->dataObjectHelper->populateWithArray(
@@ -110,6 +130,28 @@ public function getChildren($sku)
         return $childrenList;
     }
 
+    /**
+     * Get media entries
+     *
+     * @param array $images
+     * @return array
+     */
+    public function getMediaEntries($images)
+    {
+        $media = $this->myModelFactory->create();
+        $mediaGalleryEntries=[];
+        foreach ($images as $image) {
+            $media->setId($image["value_id"]);
+            $media->setMediaType($image["media_type"]);
+            $media->setLabel($image["label"]);
+            $media->setPosition($image["position"]);
+            $media->setDisabled($image["disabled"]);
+            $media->setFile($image["file"]);
+            $mediaGalleryEntries[]=$media->getData();
+        }
+        return $mediaGalleryEntries;
+    }
+
     /**
      * @inheritdoc
      * @throws InputException
@@ -200,12 +242,13 @@ public function removeChild($sku, $childSku)
      * @return \Magento\ConfigurableProduct\Helper\Product\Options\Factory
      *
      * @deprecated 100.2.0
+     * @see Nothing
      */
     private function getOptionsFactory()
     {
         if (!$this->optionsFactory) {
             $this->optionsFactory = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\ConfigurableProduct\Helper\Product\Options\Factory::class);
+                ->get(\Magento\ConfigurableProduct\Helper\Product\Options\Factory::class);// phpcs:ignore
         }
         return $this->optionsFactory;
     }

app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php

@@ -135,8 +135,11 @@ public function testGetChildren(): void
 
         $this->dataObjectHelperMock->expects($this->once())
             ->method('populateWithArray')
-            ->with($productMock, ['store_id' => 1, 'code' => 10], ProductInterface::class)
-            ->willReturnSelf();
+            ->with(
+                $productMock,
+                ['store_id' => 1, 'code' => 10, 'media_gallery_entries' => []],
+                ProductInterface::class
+            )->willReturnSelf();
 
         $this->productFactory->expects($this->once())
             ->method('create')