Merge branch 'ACP2E-2785' of https://github.com/adobe-commerce-tier-4/magento2ce into T4-PR-04-08-2024

Author: chittima

app/code/Magento/Catalog/Model/ResourceModel/MediaImageDeleteProcessor.php

@@ -101,7 +101,7 @@ public function execute(DataObject $product): void
      */
     private function canDeleteImage(string $file): bool
     {
-        return $this->productGallery->countImageUses($file) <= 1;
+        return $this->productGallery->countImageUses($file) < 1;
     }
 
     /**

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/MediaImageDeleteProcessorTest.php

@@ -0,0 +1,95 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Media\Config;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class MediaImageDeleteProcessorTest extends TestCase
+{
+    /**
+     * @var MediaImageDeleteProcessor|null
+     */
+    private ?MediaImageDeleteProcessor $mediaImageDeleteProcessor;
+
+    /**
+     * @var ProductRepositoryInterface|null
+     */
+    private ?ProductRepositoryInterface $productRepository;
+
+    /**
+     * @var ReadInterface|null
+     */
+    private ?ReadInterface $mediaDirectory;
+
+    /**
+     * @var Config|null
+     */
+    private ?Config $config;
+
+    /**
+     * @return void
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $om = Bootstrap::getObjectManager();
+
+        $this->mediaImageDeleteProcessor = $om->get(MediaImageDeleteProcessor::class);
+        $this->productRepository = $om->get(ProductRepositoryInterface::class);
+
+        $this->mediaDirectory = $om->get(Filesystem::class)->getDirectoryRead(DirectoryList::MEDIA);
+        $this->config = $om->get(Config::class);
+    }
+
+    #[
+        DataFixture(
+            ProductFixture::class,
+            [
+                'sku' => 'simple',
+                'media_gallery_entries' => [
+                    []
+                ]
+            ]
+        ),
+    ]
+    public function testOnlyImageFileDeleted()
+    {
+        $product = $this->productRepository->get('simple');
+        $image = $product->getMediaGalleryEntries()[0];
+        $imageFilePath = $this->config->getBaseMediaPath() . $image['file'];
+
+        $this->assertTrue(
+            $this->mediaDirectory->isExist($imageFilePath),
+            'The image file not existed.'
+        );
+        $this->mediaImageDeleteProcessor->execute($product);
+        $this->assertFalse(
+            $this->mediaDirectory->isExist($imageFilePath),
+            'The image file must be deleted.'
+        );
+    }
+}