Implemented suggestions

magento · Jul 10, 2020 · 8955147 · 8955147
1 parent e0a777b
commit 8955147
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 51 deletions.
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
@@ -7,12 +7,15 @@
 
 namespace Magento\MediaContent\Model;
 
+use Magento\Framework\Exception\InvalidArgumentException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface as GetAssetIdByContentFieldApiInterface;
 use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
 
 /**
  * Class responsible to return Asset ids by content field
  */
-class GetAssetIdByContentFieldComposite implements GetAssetIdByContentFieldInterface
+class GetAssetIdByContentFieldComposite implements GetAssetIdByContentFieldApiInterface
 {
     /**
      * @var GetAssetIdByContentFieldInterface[]
@@ -32,10 +35,13 @@ public function __construct($getAssetIdByContentFieldArray = [])
     /**
      * @inheritDoc
      */
-    public function execute(string $value): array
+    public function execute(string $field, string $value): array
     {
+        if (!array_key_exists($field, $this->getAssetIdByContentFieldArray)) {
+            throw new InvalidArgumentException(__('The field argument is invalid.'));
+        }
         $ids = [];
-        foreach ($this->getAssetIdByContentFieldArray as $getAssetIdByContentField) {
+        foreach ($this->getAssetIdByContentFieldArray[$field] as $getAssetIdByContentField) {
             // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $ids = array_merge($ids, $getAssetIdByContentField->execute($value));
         }

diff --git a/app/code/Magento/MediaContent/etc/di.xml b/app/code/Magento/MediaContent/etc/di.xml
@@ -16,6 +16,7 @@
     <preference for="Magento\MediaContentApi\Api\Data\ContentIdentityInterface" type="Magento\MediaContent\Model\ContentIdentity"/>
     <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\MediaContentApi\Api\GetAssetIdByContentFieldInterface" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
     <type name="Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface">
         <plugin name="remove_media_content_after_asset_is_removed_by_path" type="Magento\MediaContent\Plugin\MediaGalleryAssetDeleteByPath" />
     </type>
@@ -43,6 +44,4 @@
             <argument name="data" xsi:type="object">Magento\MediaContent\Model\Content\Config\Data</argument>
         </arguments>
     </type>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
 </config>
diff --git a/app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php b/app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentApi\Api;
+
+use Magento\Framework\Exception\InvalidArgumentException;
+
+/**
+ * @api
+ * Interface used to return Asset id by content field.
+ */
+interface GetAssetIdByContentFieldInterface
+{
+    /**
+     * This function returns asset ids by content field
+     *
+     * @param string $field
+     * @param string $value
+     * @throws InvalidArgumentException
+     * @return int[]
+     */
+    public function execute(string $field, string $value): array;
+}
diff --git a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
@@ -7,6 +7,9 @@
 
 namespace Magento\MediaContentApi\Model;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
 /**
  * Interface used to return Asset id by content field.
  */
@@ -17,6 +20,8 @@ interface GetAssetIdByContentFieldInterface
      *
      * @param string $value
      * @return int[]
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function execute(string $value): array;
 }
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
@@ -57,8 +57,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @throws LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute(string $value): array
     {
@@ -76,11 +74,7 @@ public function execute(string $value): array
             $categoryIds
         );
 
-        $result = $this->connection->getConnection()->fetchAll($sql);
-
-        return array_map(function ($item) {
-            return $item['asset_id'];
-        }, $result);
+        return $this->connection->getConnection()->fetchCol($sql);
     }
 
     /**

diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
@@ -68,7 +68,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute(string $value): array
     {
@@ -91,11 +90,7 @@ public function execute(string $value): array
             $this->getValueFromMap($value)
         );
 
-        $result = $this->connection->getConnection()->fetchAll($sql);
-
-        return array_map(function ($item) {
-            return $item['asset_id'];
-        }, $result);
+        return $this->connection->getConnection()->fetchCol($sql);
     }
 
     /**

diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
@@ -49,8 +49,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @throws LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute(string $value): array
     {
@@ -70,10 +68,6 @@ public function execute(string $value): array
             $store->getWebsiteId()
         );
 
-        $result = $this->connection->getConnection()->fetchAll($sql);
-
-        return array_map(function ($item) {
-            return $item['asset_id'];
-        }, $result);
+        return $this->connection->getConnection()->fetchCol($sql);
     }
 }
diff --git a/app/code/Magento/MediaContentCatalog/composer.json b/app/code/Magento/MediaContentCatalog/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/module-media-content-api": "*",
-        "magento/module-media-content": "*",
         "magento/module-catalog": "*",
         "magento/module-eav": "*",
         "magento/module-store": "*",

diff --git a/app/code/Magento/MediaContentCatalog/etc/di.xml b/app/code/Magento/MediaContentCatalog/etc/di.xml
@@ -62,20 +62,24 @@
             <argument name="entityType" xsi:type="string">catalog_category</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite">
+    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
         <arguments>
             <argument name="getAssetIdByContentFieldArray" xsi:type="array">
-                <item name="getAssetIdByProductStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStatus</item>
-                <item name="getAssetIdByCategoryStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStatus</item>
+                <item name="content_status" xsi:type="array">
+                    <item name="getAssetIdByProductStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStatus</item>
+                    <item name="getAssetIdByCategoryStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStatus</item>
+                </item>
             </argument>
         </arguments>
-    </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite">
+    </type>
+    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
         <arguments>
             <argument name="getAssetIdByContentFieldArray" xsi:type="array">
-                <item name="getAssetIdByProductStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStore</item>
-                <item name="getAssetIdByCategoryStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStore</item>
+                <item name="store_id" xsi:type="array">
+                    <item name="getAssetIdByProductStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStore</item>
+                    <item name="getAssetIdByCategoryStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStore</item>
+                </item>
             </argument>
         </arguments>
-    </virtualType>
+    </type>
 </config>
diff --git a/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php b/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
@@ -8,9 +8,7 @@
 namespace Magento\MediaContentCms\Model;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
-use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
  * Class responsible to return Asset id by content field
@@ -44,7 +42,6 @@ class GetAssetIdByContentField implements GetAssetIdByContentFieldInterface
      */
     private $idColumn;
 
-
     /**
      * GetAssetIdByContentField constructor.
      *
@@ -88,10 +85,6 @@ public function execute(string $value): array
             $value
         );
 
-        $result = $this->connection->getConnection()->fetchAll($sql);
-
-        return array_map(function ($item) {
-            return $item['asset_id'];
-        }, $result);
+        return $this->connection->getConnection()->fetchCol($sql);
     }
 }
diff --git a/app/code/Magento/MediaContentCms/composer.json b/app/code/Magento/MediaContentCms/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/module-media-content-api": "*",
-        "magento/module-media-content": "*",
         "magento/module-cms": "*",
         "magento/framework": "*"
     },

diff --git a/app/code/Magento/MediaContentCms/etc/di.xml b/app/code/Magento/MediaContentCms/etc/di.xml
@@ -66,20 +66,24 @@
             <argument name="fieldColumn" xsi:type="string">is_active</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite">
+    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
         <arguments>
             <argument name="getAssetIdByContentFieldArray" xsi:type="array">
-                <item name="getAssetIdByPageStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStatus</item>
-                <item name="getAssetIdByBlockStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStatus</item>
+                <item name="content_status" xsi:type="array">
+                    <item name="getAssetIdByPageStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStatus</item>
+                    <item name="getAssetIdByBlockStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStatus</item>
+                </item>
             </argument>
         </arguments>
-    </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite">
+    </type>
+    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
         <arguments>
             <argument name="getAssetIdByContentFieldArray" xsi:type="array">
-                <item name="getAssetIdByPageStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStore</item>
-                <item name="getAssetIdByBlockStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStore</item>
+                <item name="store_id" xsi:type="array">
+                    <item name="getAssetIdByPageStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStore</item>
+                    <item name="getAssetIdByBlockStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStore</item>
+                </item>
             </argument>
         </arguments>
-    </virtualType>
+    </type>
 </config>