ACP2E-3927: Dynamic image generation generate large number of images

Author: dhorytskyi

app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php

@@ -184,4 +184,22 @@ private function getUsedImagesSelect(): Select
 
         return $select;
     }
+
+    /**
+     * Get related website IDs for a given image file path.
+     *
+     * @param string $filepath
+     * @return array
+     */
+    public function getRelatedWebsiteIds(string $filepath): array
+    {
+        $select = $this->getUsedImagesSelect();
+        $select->where('images.value = ?', $filepath);
+        $result = array_map(
+            fn ($ids) => array_map('intval', explode(',', $ids)),
+            $this->connection->fetchPairs($select)
+        );
+
+        return $result[$filepath] ?? [];
+    }
 }

app/code/Magento/MediaStorage/App/Media.php

@@ -26,7 +26,6 @@
 use Magento\MediaStorage\Model\File\Storage\Response;
 use Magento\MediaStorage\Model\File\Storage\SynchronizationFactory;
 use Magento\MediaStorage\Service\ImageResize;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * The class resize original images
@@ -106,11 +105,6 @@ class Media implements AppInterface
      */
     private $mediaUrlFormat;
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
     /**
      * @param ConfigFactory $configFactory
      * @param SynchronizationFactory $syncFactory
@@ -125,7 +119,6 @@ class Media implements AppInterface
      * @param ImageResize $imageResize
      * @param File $file
      * @param CatalogMediaConfig $catalogMediaConfig
-     * @param StoreManagerInterface|null $storeManager
      * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -142,8 +135,7 @@ public function __construct(
         State $state,
         ImageResize $imageResize,
         File $file,
-        ?CatalogMediaConfig $catalogMediaConfig = null,
-        ?StoreManagerInterface $storeManager = null,
+        ?CatalogMediaConfig $catalogMediaConfig = null
     ) {
         $this->response = $response;
         $this->isAllowed = $isAllowed;
@@ -170,7 +162,6 @@ public function __construct(
 
         $catalogMediaConfig = $catalogMediaConfig ?: App\ObjectManager::getInstance()->get(CatalogMediaConfig::class);
         $this->mediaUrlFormat = $catalogMediaConfig->getMediaUrlFormat();
-        $this->storeManager = $storeManager ?? App\ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -228,10 +219,7 @@ private function createLocalCopy(): void
         }
 
         if ($this->mediaUrlFormat === CatalogMediaConfig::HASH) {
-            $this->imageResize->resizeFromImageName(
-                $this->getOriginalImage($this->relativeFileName),
-                [(int) $this->storeManager->getStore()->getWebsiteId()]
-            );
+            $this->imageResize->resizeFromImageName($this->getOriginalImage($this->relativeFileName), true);
             if (!$this->directoryPub->isReadable($this->relativeFileName)) {
                 $synchronizer->synchronize($this->relativeFileName);
             }

app/code/Magento/MediaStorage/Service/ImageResize.php

@@ -151,10 +151,10 @@ public function __construct(
      * Create resized images of different sizes from an original image.
      *
      * @param string $originalImageName
-     * @param array $websiteIds
+     * @param bool $skipHiddenImages
      * @throws NotFoundException
      */
-    public function resizeFromImageName(string $originalImageName, array $websiteIds = [])
+    public function resizeFromImageName(string $originalImageName, bool $skipHiddenImages = false)
     {
         $mediastoragefilename = $this->imageConfig->getMediaPath($originalImageName);
         $originalImagePath = $this->mediaDirectory->getAbsolutePath($mediastoragefilename);
@@ -170,7 +170,8 @@ public function resizeFromImageName(string $originalImageName, array $websiteIds
         }
 
         $viewImages = $this->getViewImages($this->getThemesInUse());
-        if ($websiteIds) {
+        if ($skipHiddenImages) {
+            $websiteIds = $this->productImage->getRelatedWebsiteIds($originalImageName);
             $viewImages = array_filter(
                 $viewImages,
                 fn (string $index) => array_intersect($websiteIds, $this->paramsWebsitesMap[$index]),

app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php

@@ -1,10 +1,11 @@
 <?php
 /**
- * Copyright 2013 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ *  See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
+
 namespace Magento\MediaStorage\Test\Unit\App;
 
 use Exception;
@@ -26,7 +27,6 @@
 use Magento\MediaStorage\Model\File\Storage\Synchronization;
 use Magento\MediaStorage\Model\File\Storage\SynchronizationFactory;
 use Magento\MediaStorage\Service\ImageResize;
-use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -81,11 +81,6 @@ class MediaTest extends TestCase
      */
     private $directoryMediaMock;
 
-    /**
-     * @var StoreManagerInterface|MockObject
-     */
-    private $storeManagerMock;
-
     /**
      * @var Read|MockObject
      */
@@ -98,13 +93,12 @@ protected function setUp(): void
     {
         $this->configMock = $this->createMock(Config::class);
         $this->sync = $this->createMock(Synchronization::class);
-        $this->configFactoryMock = $this->createMock(ConfigFactory::class);
+        $this->configFactoryMock = $this->createPartialMock(ConfigFactory::class, ['create']);
         $this->responseMock = $this->createMock(Response::class);
-        $this->syncFactoryMock = $this->createMock(SynchronizationFactory::class);
+        $this->syncFactoryMock = $this->createPartialMock(SynchronizationFactory::class, ['create']);
         $this->filesystemMock = $this->createMock(Filesystem::class);
-        $this->directoryPubMock = $this->createMock(WriteInterface::class);
-        $this->directoryMediaMock = $this->createMock(WriteInterface::class);
-        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
+        $this->directoryPubMock = $this->getMockForAbstractClass(WriteInterface::class);
+        $this->directoryMediaMock = $this->getMockForAbstractClass(WriteInterface::class);
 
         $this->configFactoryMock->method('create')
             ->willReturn($this->configMock);
@@ -294,8 +288,7 @@ protected function createMediaModel(bool $isAllowed = true): Media
             $this->createMock(State::class),
             $this->createMock(ImageResize::class),
             $driverFile,
-            $this->createMock(CatalogMediaConfig::class),
-            $this->storeManagerMock,
+            $this->createMock(CatalogMediaConfig::class)
         );
     }
 }

app/code/Magento/MediaStorage/Test/Unit/Service/ImageResizeTest.php

@@ -463,12 +463,13 @@ public function testResizeFromImageNameWithAssignedWebsite()
             ->willReturn(
                 ['0' => []]
             );
+        $this->productImageMock->expects($this->once())->method('getRelatedWebsiteIds')->willReturn([2]);
         $imageMock = $this->createMock(Image::class);
         $this->imageFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($imageMock);
 
-        $this->service->resizeFromImageName($this->testfilename, [2]);
+        $this->service->resizeFromImageName($this->testfilename, true);
     }
 
     public function testResizeFromImageNameWithNotAssignedWebsite()
@@ -490,10 +491,11 @@ public function testResizeFromImageNameWithNotAssignedWebsite()
             ->willReturn(
                 ['0' => []]
             );
+        $this->productImageMock->expects($this->once())->method('getRelatedWebsiteIds')->willReturn([3]);
         $this->imageFactoryMock->expects($this->never())
             ->method('create');
 
-        $this->service->resizeFromImageName($this->testfilename, [3]);
+        $this->service->resizeFromImageName($this->testfilename, true);
     }
 
     public function testSkipResizingAlreadyResizedImageOnDisk()