Merge pull request #1737 from Nazar65/ASI-fix-license-images

fix Used in entity is removed after and Image Preview has been Licensed

Author: sivaschenko

AdobeStockImage/Model/SaveImageFile.php

@@ -7,7 +7,6 @@
 
 namespace Magento\AdobeStockImage\Model;
 
-use Magento\AdobeStockImage\Model\Storage\Delete as StorageDelete;
 use Magento\AdobeStockImage\Model\Storage\Save as StorageSave;
 use Magento\Framework\Api\Search\Document;
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -23,23 +22,15 @@ class SaveImageFile
      */
     private $storageSave;
 
-    /**
-     * @var StorageDelete
-     */
-    private $storageDelete;
-
     /**
      * SaveImageFile constructor.
      *
      * @param StorageSave $storageSave
-     * @param StorageDelete $storageDelete
      */
     public function __construct(
-        StorageSave $storageSave,
-        StorageDelete $storageDelete
+        StorageSave $storageSave
     ) {
         $this->storageSave = $storageSave;
-        $this->storageDelete = $storageDelete;
     }
 
     /**
@@ -55,12 +46,15 @@ public function __construct(
     public function execute(Document $document, string $url, string $destinationPath): void
     {
         try {
+            $allowOverwrite = false;
             $pathAttribute = $document->getCustomAttribute('path');
             $pathValue = $pathAttribute->getValue();
-            if (null !== $pathAttribute && $pathValue) {
-                $this->storageDelete->execute($pathValue);
+
+            if (null !== $pathAttribute && $pathValue && $pathValue === $destinationPath) {
+                $allowOverwrite = true;
             }
-            $this->storageSave->execute($url, $destinationPath);
+
+            $this->storageSave->execute($url, $destinationPath, $allowOverwrite);
         } catch (LocalizedException $localizedException) {
             throw $localizedException;
         } catch (\Exception $exception) {

AdobeStockImage/Model/Storage/Save.php

@@ -59,11 +59,12 @@ public function __construct(
      *
      * @param string $imageUrl
      * @param string $destinationPath
+     * @param bool $allowOverwrite
      * @throws AlreadyExistsException
      * @throws FileSystemException
      * @throws LocalizedException
      */
-    public function execute(string $imageUrl, string $destinationPath): void
+    public function execute(string $imageUrl, string $destinationPath, bool $allowOverwrite = false): void
     {
         $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
 
@@ -75,7 +76,7 @@ public function execute(string $imageUrl, string $destinationPath): void
             throw new LocalizedException(__('Could not save image: unsupported file type.'));
         }
 
-        if ($mediaDirectory->isExist($destinationPath)) {
+        if (!$allowOverwrite && $mediaDirectory->isExist($destinationPath)) {
             throw new AlreadyExistsException(__('Image with the same file name already exits.'));
         }
 

AdobeStockImage/Test/Unit/Model/SaveImageFileTest.php

@@ -8,7 +8,6 @@
 namespace Magento\AdobeStockImage\Test\Unit\Model;
 
 use Magento\AdobeStockImage\Model\SaveImageFile;
-use Magento\AdobeStockImage\Model\Storage\Delete as StorageDelete;
 use Magento\AdobeStockImage\Model\Storage\Save as StorageSave;
 use Magento\Framework\Api\AttributeInterface;
 use Magento\Framework\Api\Search\Document;
@@ -27,11 +26,6 @@ class SaveImageFileTest extends TestCase
      */
     private $storageSave;
 
-    /**
-     * @var MockObject|StorageDelete
-     */
-    private $storageDelete;
-
     /**
      * @var SaveImageFile
      */
@@ -43,13 +37,11 @@ class SaveImageFileTest extends TestCase
     protected function setUp(): void
     {
         $this->storageSave = $this->createMock(StorageSave::class);
-        $this->storageDelete = $this->createMock(StorageDelete::class);
 
         $this->saveImageFile = (new ObjectManager($this))->getObject(
             SaveImageFile::class,
             [
-                'storageSave' => $this->storageSave,
-                'storageDelete' => $this->storageDelete
+                'storageSave' => $this->storageSave
             ]
         );
     }
@@ -60,18 +52,12 @@ protected function setUp(): void
      * @param Document $document
      * @param string $url
      * @param string $destinationPath
-     * @param bool $delete
      * @dataProvider assetProvider
      */
-    public function testExecute(Document $document, string $url, string $destinationPath, bool $delete): void
+    public function testExecute(Document $document, string $url, string $destinationPath): void
     {
-        if ($delete) {
-            $this->storageDelete->expects($this->once())
-                ->method('execute');
-        } else {
-            $this->storageSave->expects($this->once())
-                ->method('execute');
-        }
+        $this->storageSave->expects($this->once())
+            ->method('execute');
 
         $this->storageSave->expects($this->once())
             ->method('execute')
@@ -86,24 +72,16 @@ public function testExecute(Document $document, string $url, string $destination
      * @param Document $document
      * @param string $url
      * @param string $destinationPath
-     * @param bool $delete
      * @dataProvider assetProvider
      */
     public function testExecuteWithException(
         Document $document,
         string $url,
-        string $destinationPath,
-        bool $delete
+        string $destinationPath
     ): void {
-        if ($delete) {
-            $this->storageDelete->expects($this->once())
-                ->method('execute')
-                ->willThrowException(new \Exception('Some Exception'));
-        } else {
-            $this->storageSave->expects($this->once())
-                ->method('execute')
-                ->willThrowException(new \Exception('Some Exception'));
-        }
+        $this->storageSave->expects($this->once())
+            ->method('execute')
+            ->willThrowException(new \Exception('Some Exception'));
 
         $this->expectException(CouldNotSaveException::class);
 
@@ -121,14 +99,12 @@ public function assetProvider(): array
             [
                 'document' => $this->getDocument(),
                 'url' => 'https://as2.ftcdn.net/jpg/500_FemVonDcttCeKiOXFk.jpg',
-                'destinationPath' => 'path',
-                'delete' => false
+                'destinationPath' => 'path'
             ],
             [
                 'document' => $this->getDocument('filepath.jpg'),
                 'url' => 'https://as2.ftcdn.net/jpg/500_FemVonDcttCeKiOXFk.jpg',
                 'destinationPath' => 'path',
-                'delete' => true
             ],
         ];
     }