ENGCOM-5498: [2.3] magento catalog:images:resize now Database Media Storage mode aware (Again!) #23913

 - Merge Pull Request #23913 from gwharton/magento2:2.3-develop-imagesresize
 - Merged commits:
   1. 7b2f66c

Author: magento-engcom-team

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

@@ -183,11 +183,11 @@ public function resizeFromThemes(array $themes = null): \Generator
             $mediastoragefilename = $this->imageConfig->getMediaPath($originalImageName);
             $originalImagePath = $this->mediaDirectory->getAbsolutePath($mediastoragefilename);
 
+            if ($this->fileStorageDatabase->checkDbUsage()) {
+                $this->fileStorageDatabase->saveFileToFilesystem($mediastoragefilename);
+            }
             if ($this->mediaDirectory->isFile($originalImagePath)) {
                 foreach ($viewImages as $viewImage) {
-                    if ($this->fileStorageDatabase->checkDbUsage()) {
-                        $this->fileStorageDatabase->saveFileToFilesystem($mediastoragefilename);
-                    }
                     $this->resize($viewImage, $originalImagePath, $originalImageName);
                 }
             } else {

dev/tests/integration/testsuite/Magento/Catalog/_files/product_image.php

@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var $mediaConfig \Magento\Catalog\Model\Product\Media\Config */
 $mediaConfig = $objectManager->get(\Magento\Catalog\Model\Product\Media\Config::class);
+/** @var $database \Magento\MediaStorage\Helper\File\Storage\Database */
+$database = $objectManager->get(\Magento\MediaStorage\Helper\File\Storage\Database::class);
 
 /** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
 $mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
@@ -28,4 +31,5 @@
 
     copy($sourceFilePath, $targetTmpFilePath);
     // Copying the image to target dir is not necessary because during product save, it will be moved there from tmp dir
+    $database->saveFile($targetTmpFilePath);
 }

dev/tests/integration/testsuite/Magento/Catalog/_files/product_image_rollback.php

@@ -3,12 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /** @var $config \Magento\Catalog\Model\Product\Media\Config */
 $config = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
     \Magento\Catalog\Model\Product\Media\Config::class
 );
+/** @var $database \Magento\MediaStorage\Helper\File\Storage\Database */
+$database = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\MediaStorage\Helper\File\Storage\Database::class
+);
 
 /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */
 $mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -19,3 +25,6 @@
 
 $mediaDirectory->delete($config->getBaseMediaPath());
 $mediaDirectory->delete($config->getBaseTmpMediaPath());
+
+$database->deleteFolder($config->getBaseMediaPath());
+$database->deleteFolder($config->getBaseTmpMediaPath());

dev/tests/integration/testsuite/Magento/MediaStorage/Console/Command/ImageResizeCommandTest.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\MediaStorage\Console\Command;
 
@@ -15,8 +15,6 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
 
 /**
  * Test for \Magento\MediaStorage\Console\Command\ImagesResizeCommand.
@@ -38,21 +36,6 @@ class ImageResizeCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
-    /**
-     * @var \Magento\MediaStorage\Console\Command\ImagesResizeCommand
-     */
-    private $imageResizeCommand;
-
-    /**
-     * @var ArgvInput
-     */
-    private $input;
-
-    /**
-     * @var ConsoleOutput
-     */
-    private $output;
-
     /**
      * @var WriteInterface
      */
@@ -76,12 +59,6 @@ protected function setUp()
         parent::setUp();
 
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->imageResizeCommand = $this->objectManager->create(
-            \Magento\MediaStorage\Console\Command\ImagesResizeCommand::class
-        );
-
-        $this->input = $this->objectManager->create(ArgvInput::class, ['argv' => ['catalog:image:resize']]);
-        $this->output = $this->objectManager->create(ConsoleOutput::class);
         $this->fileName = 'image.jpg';
         $this->command = $this->objectManager->get(ImagesResizeCommand::class);
         $this->tester = new CommandTester($this->command);
@@ -96,8 +73,8 @@ protected function setUp()
      */
     public function testRunResizeWithMissingFile()
     {
-        $resultCode = $this->imageResizeCommand->run($this->input, $this->output);
-        $this->assertSame($resultCode, 0);
+        $this->tester->execute([]);
+        $this->assertContains('original image not found', $this->tester->getDisplay());
     }
 
     /**
@@ -132,4 +109,17 @@ public function testExecuteWithZeroByteImage()
         $this->assertContains('Wrong file', $this->tester->getDisplay());
         $this->mediaDirectory->getDriver()->deleteFile($this->mediaDirectory->getAbsolutePath($this->fileName));
     }
+
+    /**
+     * Test that catalog:image:resize command executes successfully in database storage mode
+     * with file missing from local folder
+     *
+     * @magentoDataFixture Magento/MediaStorage/_files/database_mode.php
+     * @magentoDataFixture Magento/MediaStorage/_files/product_with_missed_image.php
+     */
+    public function testDatabaseStorageMissingFile()
+    {
+        $this->tester->execute([]);
+        $this->assertContains('Product images resized successfully', $this->tester->getDisplay());
+    }
 }

dev/tests/integration/testsuite/Magento/MediaStorage/_files/database_mode.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var $database \Magento\MediaStorage\Helper\File\Storage\Database */
+$database = $objectManager->get(\Magento\MediaStorage\Helper\File\Storage\Database::class);
+
+$database->getStorageDatabaseModel()->init();
+
+$config = $objectManager->get(Magento\Framework\App\Config\ConfigResource\ConfigInterface::class);
+$config->saveConfig('system/media_storage_configuration/media_storage', '1');
+$config->saveConfig('system/media_storage_configuration/media_database', 'default_setup');
+$objectManager->get(Magento\Framework\App\Config\ReinitableConfigInterface::class)->reinit();