ACP2E-1526 : changed logic based on build failures

Author: lakshmana

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media/ImageEntryConverter.php

@@ -10,13 +10,7 @@
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Api\Data\ImageContentInterface;
-use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
 use Magento\Framework\Api\DataObjectHelper;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Driver\File\Mime;
 
 /**
  * Converter for Image media gallery type
@@ -38,42 +32,16 @@ class ImageEntryConverter implements EntryConverterInterface
      */
     protected $dataObjectHelper;
 
-    /**
-     * @var ImageContentInterfaceFactory
-     */
-    protected $imageContentInterface;
-
-    /**
-     * Filesystem facade
-     *
-     * @var Filesystem
-     */
-    protected $filesystem;
-
-    /**
-     * @var Mime
-     */
-    protected $imageMime;
-
     /**
      * @param ProductAttributeMediaGalleryEntryInterfaceFactory $mediaGalleryEntryFactory
      * @param DataObjectHelper $dataObjectHelper
-     * @param ImageContentInterfaceFactory|null $imageContentInterface
-     * @param Filesystem|null $filesystem
-     * @param Mime|null $imageMime
      */
     public function __construct(
         \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $mediaGalleryEntryFactory,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-        ImageContentInterfaceFactory $imageContentInterface = null,
-        Filesystem $filesystem = null,
-        Mime $imageMime = null
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
     ) {
         $this->mediaGalleryEntryFactory = $mediaGalleryEntryFactory;
         $this->dataObjectHelper = $dataObjectHelper;
-        $this->imageContentInterface = $imageContentInterface ?? ObjectManager::getInstance()->get(ImageContentInterfaceFactory::class);
-        $this->filesystem =  $filesystem ?? ObjectManager::getInstance()->get(Filesystem::class);
-        $this->imageMime = $imageMime ?? ObjectManager::getInstance()->get(Mime::class);
     }
 
     /**
@@ -88,7 +56,6 @@ public function getMediaEntryType()
      * @param Product $product
      * @param array $rowData
      * @return ProductAttributeMediaGalleryEntryInterface $entry
-     * @throws FileSystemException
      */
     public function convertTo(Product $product, array $rowData)
     {
@@ -106,14 +73,6 @@ public function convertTo(Product $product, array $rowData)
         if (isset($image['value_id'])) {
             $entry->setId($image['value_id']);
         }
-        $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-        $path = $mediaDirectory->getAbsolutePath($product->getMediaConfig()->getMediaPath($entry->getFile()));
-        $imageFileContent = $mediaDirectory->getDriver()->fileGetContents($path);
-        $entryContent = $this->imageContentInterface->create()
-            ->setName(basename($entry->getFile()))
-            ->setBase64EncodedData(base64_encode($imageFileContent))
-            ->setType($this->imageMime->getMimeType($path));
-        $entry->setContent($entryContent);
         return $entry;
     }
 

app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php

@@ -9,11 +9,16 @@
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\Data\ImageContentInterface;
+use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Api\ImageContentValidatorInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Driver\File\Mime;
 
 /**
  * Class GalleryManagement
@@ -44,25 +49,54 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
      */
     private $deleteValidator;
 
+    /**
+     * @var ImageContentInterfaceFactory
+     */
+    protected $imageContentInterface;
+
+    /**
+     * Filesystem facade
+     *
+     * @var Filesystem
+     */
+    protected $filesystem;
+
+    /**
+     * @var Mime
+     */
+    protected $imageMime;
+
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param ImageContentValidatorInterface $contentValidator
      * @param ProductInterfaceFactory|null $productInterfaceFactory
      * @param DeleteValidator|null $deleteValidator
+     * @param ImageContentInterfaceFactory|null $imageContentInterface
+     * @param Filesystem|null $filesystem
+     * @param Mime|null $imageMime
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
         ImageContentValidatorInterface $contentValidator,
         ?ProductInterfaceFactory $productInterfaceFactory = null,
-        ?DeleteValidator $deleteValidator = null
+        ?DeleteValidator $deleteValidator = null,
+        ?ImageContentInterfaceFactory $imageContentInterface = null,
+        ?Filesystem $filesystem = null,
+        ?Mime $imageMime = null
     ) {
         $this->productRepository = $productRepository;
         $this->contentValidator = $contentValidator;
         $this->productInterfaceFactory = $productInterfaceFactory
             ?? ObjectManager::getInstance()->get(ProductInterfaceFactory::class);
         $this->deleteValidator = $deleteValidator
             ?? ObjectManager::getInstance()->get(DeleteValidator::class);
+        $this->imageContentInterface = $imageContentInterface
+            ?? ObjectManager::getInstance()->get(ImageContentInterfaceFactory::class);
+        $this->filesystem =  $filesystem
+            ?? ObjectManager::getInstance()->get(Filesystem::class);
+        $this->imageMime = $imageMime
+            ?? ObjectManager::getInstance()->get(Mime::class);
     }
 
     /**
@@ -217,7 +251,21 @@ public function getList($sku)
     {
         /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productRepository->get($sku);
+        $mediaGalleryEntries = $product->getMediaGalleryEntries();
+        foreach ($mediaGalleryEntries as $entry) {
+          $entry->setContent($this->getImageContent($product, $entry));
+        }
+        return $mediaGalleryEntries;
+    }
 
-        return $product->getMediaGalleryEntries();
+    private function getImageContent($product, $entry): ImageContentInterface
+    {
+        $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $path = $mediaDirectory->getAbsolutePath($product->getMediaConfig()->getMediaPath($entry->getFile()));
+        $imageFileContent = $mediaDirectory->getDriver()->fileGetContents($path);
+        return $this->imageContentInterface->create()
+            ->setName(basename($entry->getFile()))
+            ->setBase64EncodedData(base64_encode($imageFileContent))
+            ->setType($this->imageMime->getMimeType($path));
     }
 }