Merge remote-tracking branch 'origin/ACP2E-3927' into PR_2025_07_10_chittima

Author: chittima

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\MediaStorage\App;
@@ -24,7 +24,6 @@
 use Magento\MediaStorage\Model\File\Storage\Config;
 use Magento\MediaStorage\Model\File\Storage\ConfigFactory;
 use Magento\MediaStorage\Model\File\Storage\Response;
-use Magento\MediaStorage\Model\File\Storage\Synchronization;
 use Magento\MediaStorage\Model\File\Storage\SynchronizationFactory;
 use Magento\MediaStorage\Service\ImageResize;
 
@@ -220,7 +219,7 @@ private function createLocalCopy(): void
         }
 
         if ($this->mediaUrlFormat === CatalogMediaConfig::HASH) {
-            $this->imageResize->resizeFromImageName($this->getOriginalImage($this->relativeFileName));
+            $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,9 +151,10 @@ public function __construct(
      * Create resized images of different sizes from an original image.
      *
      * @param string $originalImageName
+     * @param bool $skipHiddenImages
      * @throws NotFoundException
      */
-    public function resizeFromImageName(string $originalImageName)
+    public function resizeFromImageName(string $originalImageName, bool $skipHiddenImages = false)
     {
         $mediastoragefilename = $this->imageConfig->getMediaPath($originalImageName);
         $originalImagePath = $this->mediaDirectory->getAbsolutePath($mediastoragefilename);
@@ -167,7 +168,17 @@ public function resizeFromImageName(string $originalImageName)
         if (!$this->mediaDirectory->isFile($originalImagePath)) {
             throw new NotFoundException(__('Cannot resize image "%1" - original image not found', $originalImagePath));
         }
-        foreach ($this->getViewImages($this->getThemesInUse()) as $viewImage) {
+
+        $viewImages = $this->getViewImages($this->getThemesInUse());
+        if ($skipHiddenImages) {
+            $websiteIds = $this->productImage->getRelatedWebsiteIds($originalImageName);
+            $viewImages = array_filter(
+                $viewImages,
+                fn (string $index) => array_intersect($websiteIds, $this->paramsWebsitesMap[$index]),
+                ARRAY_FILTER_USE_KEY
+            );
+        }
+        foreach ($viewImages as $viewImage) {
             $this->resize($viewImage, $originalImagePath, $originalImageName);
         }
     }

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

@@ -444,6 +444,60 @@ public function testResizeFromImageNameMediaStorageDatabase()
         $this->service->resizeFromImageName($this->testfilename);
     }
 
+    public function testResizeFromImageNameWithAssignedWebsite()
+    {
+        $this->databaseMock->expects($this->atLeastOnce())
+            ->method('checkDbUsage')
+            ->willReturn(false);
+        $this->mediaDirectoryMock->expects($this->exactly(2))
+            ->method('isFile')
+            ->with($this->testfilepath)
+            ->willReturnOnConsecutiveCalls(true, false);
+        $this->themeCollectionMock->expects($this->once())
+            ->method('loadRegisteredThemes')
+            ->willReturn(
+                [ new DataObject(['id' => '0']) ]
+            );
+        $this->themeCustomizationConfigMock->expects($this->once())
+            ->method('getStoresByThemes')
+            ->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, true);
+    }
+
+    public function testResizeFromImageNameWithNotAssignedWebsite()
+    {
+        $this->databaseMock->expects($this->atLeastOnce())
+            ->method('checkDbUsage')
+            ->willReturn(false);
+        $this->mediaDirectoryMock->expects($this->once())
+            ->method('isFile')
+            ->with($this->testfilepath)
+            ->willReturn(true);
+        $this->themeCollectionMock->expects($this->once())
+            ->method('loadRegisteredThemes')
+            ->willReturn(
+                [ new DataObject(['id' => '0']) ]
+            );
+        $this->themeCustomizationConfigMock->expects($this->once())
+            ->method('getStoresByThemes')
+            ->willReturn(
+                ['0' => []]
+            );
+        $this->productImageMock->expects($this->once())->method('getRelatedWebsiteIds')->willReturn([3]);
+        $this->imageFactoryMock->expects($this->never())
+            ->method('create');
+
+        $this->service->resizeFromImageName($this->testfilename, true);
+    }
+
     public function testSkipResizingAlreadyResizedImageOnDisk()
     {
         $this->databaseMock->expects($this->atLeastOnce())