#27536: Moved xsd to api module, removed unit tests, updated comments

Author: sivaschenko

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

@@ -65,7 +65,8 @@ public function execute(ContentIdentityInterface $contentIdentity, array $assetI
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             throw new CouldNotSaveException(
-                __('An error occurred while saving relation between media asset and media content.')
+                __('An error occurred while saving relation between media asset and media content.'),
+                $exception
             );
         }
     }

app/code/Magento/MediaContent/Model/Content/Config.php

@@ -10,7 +10,7 @@
 use Magento\Framework\Config\DataInterface;
 
 /**
- * Media content config
+ * Media content configuration
  */
 class Config
 {

app/code/Magento/MediaContent/Model/Content/Config/Converter.php

@@ -10,23 +10,12 @@
 use Magento\Framework\Config\ConverterInterface;
 
 /**
- * Class Converter
+ * Media Content configuration Converter
  */
 class Converter implements ConverterInterface
 {
-    /**
-     * Search tag name
-     */
     private const SEARCH_TAG_NAME = 'search';
-
-    /**
-     * Patterns tag name
-     */
     private const PATTERNS_TAG_NAME = 'patterns';
-
-    /**
-     * Pattern tag name
-     */
     private const PATTERN_TAG_NAME = 'pattern';
 
     /**
@@ -43,9 +32,9 @@ public function convert($source) : array
             return $result;
         }
 
-        foreach ($source->getElementsByTagName(self::SEARCH_TAG_NAME) as $blacklist) {
+        foreach ($source->getElementsByTagName(self::SEARCH_TAG_NAME) as $search) {
             $result[self::SEARCH_TAG_NAME] = [];
-            foreach ($blacklist->getElementsByTagName(self::PATTERNS_TAG_NAME) as $patterns) {
+            foreach ($search->getElementsByTagName(self::PATTERNS_TAG_NAME) as $patterns) {
                 $result[self::SEARCH_TAG_NAME][self::PATTERNS_TAG_NAME] = [];
                 foreach ($patterns->getElementsByTagName(self::PATTERN_TAG_NAME) as $pattern) {
                     $result[self::SEARCH_TAG_NAME][self::PATTERNS_TAG_NAME]
@@ -56,4 +45,4 @@ public function convert($source) : array
 
         return $result;
     }
-}
+}

app/code/Magento/MediaContent/Model/Content/Config/SchemaLocator.php

@@ -11,6 +11,9 @@
 use Magento\Framework\Module\Dir;
 use Magento\Framework\Module\Dir\Reader;
 
+/**
+ * Media Content configuration schema locator
+ */
 class SchemaLocator implements SchemaLocatorInterface
 {
     /**
@@ -25,7 +28,8 @@ class SchemaLocator implements SchemaLocatorInterface
      */
     public function __construct(Reader $moduleReader)
     {
-        $this->schema = $moduleReader->getModuleDir(Dir::MODULE_ETC_DIR, 'Magento_MediaContent') . '/media_content.xsd';
+        $this->schema = $moduleReader->getModuleDir(Dir::MODULE_ETC_DIR, 'Magento_MediaContentApi')
+            . '/media_content.xsd';
     }
 
     /**
@@ -47,4 +51,4 @@ public function getPerFileSchema()
     {
         return $this->schema;
     }
-}
+}

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

@@ -18,6 +18,8 @@
  */
 class ExtractAssetsFromContent implements ExtractAssetsFromContentInterface
 {
+    private const XML_PATH_SEARCH_PATTERNS = 'search/patterns';
+
     /**
      * @var Config
      */
@@ -49,16 +51,13 @@ public function __construct(
     }
 
     /**
-     * Search for the media asset in content and extract it providing a list of media assets.
-     *
-     * @param string $content
-     * @return AssetInterface[]
+     * @inheritdoc
      */
     public function execute(string $content): array
     {
         $paths = [];
 
-        foreach ($this->config->get('search/patterns') as $pattern) {
+        foreach ($this->config->get(self::XML_PATH_SEARCH_PATTERNS) as $pattern) {
             if (empty($pattern)) {
                 continue;
             }
@@ -86,7 +85,7 @@ private function getAssetsByPaths(array $paths): array
         foreach ($paths as $path) {
             try {
                 /** @var AssetInterface $asset */
-                $asset = $this->getMediaAssetByPath->execute('/' . $path);
+                $asset = $this->getMediaAssetByPath->execute($this->getPathStartingWithSlash($path));
                 $assets[$asset->getId()] = $asset;
             } catch (\Exception $exception) {
                 $this->logger->critical($exception);
@@ -95,4 +94,15 @@ private function getAssetsByPaths(array $paths): array
 
         return $assets;
     }
+
+    /**
+     * Ensure the extracted paths matches the standard format
+     *
+     * @param string $path
+     * @return string
+     */
+    private function getPathStartingWithSlash(string $path): string
+    {
+        return '/' . ltrim($path, '/');
+    }
 }

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

@@ -55,7 +55,7 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function execute(array $assetIds): array
     {

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

@@ -35,8 +35,6 @@ class UnassignAssets implements UnassignAssetsInterface
     private $logger;
 
     /**
-     * GetAssetsUsedInContent constructor.
-     *
      * @param ResourceConnection $resourceConnection
      * @param LoggerInterface $logger
      */
@@ -66,7 +64,8 @@ public function execute(ContentIdentityInterface $contentIdentity, array $assetI
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             throw new CouldNotDeleteException(
-                __('An error occurred at unassign relation between the media asset and media content.')
+                __('An error occurred at unassign relation between the media asset and media content.'),
+                $exception
             );
         }
     }

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

@@ -71,10 +71,7 @@ public function __construct(
     }
 
     /**
-     * Create new relation between media asset and content or updated existing
-     *
-     * @param ContentIdentityInterface $contentIdentity
-     * @param string $data
+     * @inheritdoc
      */
     public function execute(ContentIdentityInterface $contentIdentity, string $data): void
     {
@@ -86,7 +83,7 @@ public function execute(ContentIdentityInterface $contentIdentity, string $data)
     }
 
     /**
-     * Records a relation for the newly added asset
+     * Find out which relations are obsolete and which are new and update them
      *
      * @param ContentIdentityInterface $contentIdentity
      * @param string $data