Fixed integration tests

Author: sivaschenko

app/code/Magento/MediaContent/Model/ExtractAssetsFromContent.php

@@ -104,7 +104,7 @@ private function getAssetsByPaths(array $paths): array
     private function getPathStartingWithSlash(string $path): string
     {
         $normalizedPath = ltrim($path, '/');
-        if (strpos($normalizedPath, '/') === false) {
+        if (strpos($normalizedPath, '/') !== false) {
             return $normalizedPath;
         }
         return '/' . $normalizedPath;

app/code/Magento/MediaContent/Model/SaveContentAssetLinks.php

@@ -10,7 +10,6 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\MediaContentApi\Api\SaveContentAssetLinksInterface;
-use Magento\MediaContentApi\Api\Data\ContentIdentityInterface;
 use Magento\MediaContentApi\Api\Data\ContentAssetLinkInterface;
 use Psr\Log\LoggerInterface;
 

app/code/Magento/MediaContent/Plugin/MediaGalleryAssetDeleteByDirectoryPath.php

@@ -11,7 +11,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\MediaContentApi\Api\DeleteContentAssetLinksByAssetIdsInterface;
-use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByDirectoryPathInterface;
+use Magento\MediaGalleryApi\Api\DeleteDirectoriesByPathsInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -54,22 +54,27 @@ public function __construct(
     /**
      * Around plugin on execute method
      *
-     * @param DeleteByDirectoryPathInterface $subject
+     * @param DeleteDirectoriesByPathsInterface $subject
      * @param \Closure $proceed
-     * @param string $directoryPath
+     * @param array $paths
      * @throws CouldNotDeleteException
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundExecute(
-        DeleteByDirectoryPathInterface $subject,
+        DeleteDirectoriesByPathsInterface $subject,
         \Closure $proceed,
-        string $directoryPath
+        array $paths
     ) : void {
-        $assetIds = $this->getAssetIdsByDirectoryPath($directoryPath);
+        $assetIdsArrays =[];
+        foreach ($paths as $path) {
+            $assetIdsArrays[] = $this->getAssetIdsByDirectoryPath($path);
+        }
 
-        $proceed($directoryPath);
+        $assetIds = array_unique(array_merge([], ...$assetIdsArrays));
+
+        $proceed($paths);
 
         $this->deleteContentAssetLinksByAssetIds->execute($assetIds);
     }

app/code/Magento/MediaContent/Plugin/MediaGalleryAssetDeleteByPath.php

@@ -8,9 +8,11 @@
 namespace Magento\MediaContent\Plugin;
 
 use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\MediaContentApi\Api\DeleteContentAssetLinksByAssetIdsInterface;
-use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
-use Magento\MediaGalleryApi\Model\Asset\Command\GetByPathInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -19,9 +21,9 @@
 class MediaGalleryAssetDeleteByPath
 {
     /**
-     * @var GetByPathInterface
+     * @var GetAssetsByPathsInterface
      */
-    private $getByPath;
+    private $getByPaths;
 
     /**
      * @var LoggerInterface
@@ -35,39 +37,47 @@ class MediaGalleryAssetDeleteByPath
 
     /**
      * @param DeleteContentAssetLinksByAssetIdsInterface $deleteContentAssetLinksByAssetIds
-     * @param GetByPathInterface $getByPath
+     * @param GetAssetsByPathsInterface $getByPath
      * @param LoggerInterface $logger
      */
     public function __construct(
         DeleteContentAssetLinksByAssetIdsInterface $deleteContentAssetLinksByAssetIds,
-        GetByPathInterface $getByPath,
+        GetAssetsByPathsInterface $getByPath,
         LoggerInterface $logger
     ) {
         $this->deleteContentAssetLinksByAssetIds = $deleteContentAssetLinksByAssetIds;
-        $this->getByPath = $getByPath;
+        $this->getByPaths = $getByPath;
         $this->logger = $logger;
     }
 
     /**
      * Around plugin on execute method
      *
-     * @param DeleteByPathInterface $subject
+     * @param DeleteAssetsByPathsInterface $subject
      * @param \Closure $proceed
-     * @param string $mediaAssetPath
+     * @param array $paths
      * @throws CouldNotDeleteException
+     * @throws LocalizedException
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundExecute(
-        DeleteByPathInterface $subject,
+        DeleteAssetsByPathsInterface $subject,
         \Closure $proceed,
-        string $mediaAssetPath
+        array $paths
     ) : void {
-        $asset = $this->getByPath->execute($mediaAssetPath);
+        $assets = $this->getByPaths->execute($paths);
 
-        $proceed($mediaAssetPath);
+        $proceed($paths);
 
-        $this->deleteContentAssetLinksByAssetIds->execute([$asset->getId()]);
+        $assetIds = array_map(
+            function (AssetInterface $asset) {
+                return $asset->getId();
+            },
+            $assets
+        );
+
+        $this->deleteContentAssetLinksByAssetIds->execute($assetIds);
     }
 }

app/code/Magento/MediaContent/etc/di.xml

@@ -17,10 +17,10 @@
     <preference for="Magento\MediaContentApi\Api\Data\ContentAssetLinkInterface" type="Magento\MediaContent\Model\ContentAssetLink"/>
     <preference for="Magento\MediaContentApi\Model\SearchPatternConfigInterface" type="Magento\MediaContent\Model\Content\SearchPatternConfig"/>
     <preference for="Magento\MediaContent\Model\Content\ConfigInterface" type="Magento\MediaContent\Model\Content\Config"/>
-    <type name="Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface">
+    <type name="Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface">
         <plugin name="remove_media_content_after_asset_is_removed_by_path" type="Magento\MediaContent\Plugin\MediaGalleryAssetDeleteByPath" />
     </type>
-    <type name="Magento\MediaGalleryApi\Model\Asset\Command\DeleteByDirectoryPathInterface">
+    <type name="Magento\MediaGalleryApi\Api\DeleteDirectoriesByPathsInterface">
         <plugin name="remove_media_content_after_asset_is_removed_by_directory_path" type="Magento\MediaContent\Plugin\MediaGalleryAssetDeleteByDirectoryPath" />
     </type>
     <virtualType name="Magento\MediaContent\Model\Content\Config\Reader" type="Magento\Framework\Config\Reader\Filesystem">

dev/tests/integration/testsuite/Magento/MediaContent/Model/ExtractAssetsFromContentTest.php

@@ -74,13 +74,19 @@ public function contentProvider()
             'Relevant paths in content' => [
                 'content {{media url="testDirectory/path.jpg"}} content',
                 [
-                    55
+                    2020
+                ]
+            ],
+            'Relevant wysiwyg paths in content' => [
+                'content <img src="https://domain.com/media/testDirectory/path.jpg"}} content',
+                [
+                    2020
                 ]
             ],
             'Relevant path content' => [
                 '/media/testDirectory/path.jpg',
                 [
-                    55
+                    2020
                 ]
             ],
             'Irrelevant paths in content' => [

dev/tests/integration/testsuite/Magento/MediaContent/Model/SaveDeleteContentAssetLinksTest.php

@@ -60,7 +60,7 @@ public function setUp(): void
     public function testAssignRetrieveAndUnassign(): void
     {
         $entityType = 'catalog_product';
-        $entityId = '42';
+        $entityId = 42;
         $field = 'description';
         $assetIds = [56, 78];
 

dev/tests/integration/testsuite/Magento/MediaContent/Model/UpdateContentAssetLinksTest.php

@@ -47,7 +47,7 @@ public function setUp(): void
     public function testExecute(): void
     {
         $entityType = 'catalog_product';
-        $entityId = '42';
+        $entityId = 2020;
         $field = 'description';
         $contentWithoutAsset = '';
         $contentWithAsset = 'content {{media url="testDirectory/path.jpg"}} content';