Improved attribute fetching

Author: Gabriel Galvao da Gama

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

@@ -90,7 +90,7 @@ public function execute(string $value): array
             []
         )->where(
             'content_table.' . $this->statusColumn . ' = ?',
-            $this->getValueFromMap($value)
+            $value
         );
 
         $result = $this->connection->getConnection()->fetchAll($sql);
@@ -99,16 +99,4 @@ public function execute(string $value): array
             return $item['asset_id'];
         }, $result);
     }
-
-    /**
-     * @param string $value
-     * @return string
-     */
-    private function getValueFromMap(string $value): string
-    {
-        if (count($this->valueMap) > 0 && array_key_exists($value, $this->valueMap)) {
-            return $this->valueMap[$value];
-        }
-        return $value;
-    }
 }

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

@@ -7,6 +7,8 @@
 
 namespace Magento\MediaContent\Model;
 
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
 use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
 
@@ -16,17 +18,16 @@
 class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
-    private const TABLE_EAV_ATTRIBUTE = 'eav_attribute';
 
     /**
      * @var ResourceConnection
      */
     private $connection;
 
     /**
-     * @var string
+     * @var Config
      */
-    private $entityEavTypeTable;
+    private $config;
 
     /**
      * @var string
@@ -38,58 +39,53 @@ class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
      */
     private $entityType;
 
-    /**
-     * @var int
-     */
-    private $entityTypeId;
-
     /**
      * @var array
      */
     private $valueMap;
 
     /**
-     * GetEavContentIdByStatus constructor.
+     * GetAssetIdByEavContentStatus constructor.
      * @param ResourceConnection $resource
-     * @param string $entityEavTypeTable
+     * @param Config $config
      * @param string $attributeCode
      * @param string $entityType
-     * @param int $entityTypeId
      * @param array $valueMap
      */
     public function __construct(
         ResourceConnection $resource,
-        string $entityEavTypeTable,
+        Config $config,
         string $attributeCode,
         string $entityType,
-        int $entityTypeId,
         array $valueMap = []
     ) {
         $this->connection = $resource;
-        $this->entityEavTypeTable = $entityEavTypeTable;
+        $this->config = $config;
         $this->attributeCode = $attributeCode;
         $this->entityType = $entityType;
-        $this->entityTypeId = $entityTypeId;
         $this->valueMap = $valueMap;
     }
 
     /**
      * @param string $value
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute(string $value): array
     {
-        $statusAttributeId = $this->getAttributeId();
+        $statusAttribute = $this->config->getAttribute($this->entityType, $this->attributeCode);
+
         $sql = $this->connection->getConnection()->select()->from(
             ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
             ['asset_id']
         )->where(
             'entity_type = ?',
             $this->entityType
         )->joinInner(
-            ['entity_eav_type' => $this->connection->getTableName($this->entityEavTypeTable)],
-            'asset_content_table.entity_id = entity_eav_type.entity_id AND entity_eav_type.attribute_id = ' .
-            $statusAttributeId,
+            ['entity_eav_type' => $statusAttribute->getBackendTable()],
+            'asset_content_table.entity_id = entity_eav_type.' . $statusAttribute->getEntityIdField() .
+            ' AND entity_eav_type.attribute_id = ' .
+            $statusAttribute->getAttributeId(),
             []
         )->where(
             'entity_eav_type.value = ?',
@@ -103,25 +99,6 @@ public function execute(string $value): array
         }, $result);
     }
 
-    /**
-     * @return string
-     */
-    private function getAttributeId(): string
-    {
-        $sql = $this->connection->getConnection()->select()->from(
-            ['eav' => $this->connection->getTableName(self::TABLE_EAV_ATTRIBUTE)],
-            ['attribute_id']
-        )->where(
-            'entity_type_id = ?',
-            $this->entityTypeId
-        )->where(
-            'attribute_code = ?',
-            $this->attributeCode
-        );
-
-        return $this->connection->getConnection()->fetchOne($sql);
-    }
-
     /**
      * @param string $value
      * @return string

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

@@ -18,10 +18,8 @@
     </type>
     <virtualType name="Magento\MediaContent\Model\GetAssetIdByProductStatus" type="Magento\MediaContent\Model\GetAssetIdByEavContentStatus">
         <arguments>
-            <argument name="entityEavTypeTable" xsi:type="string">catalog_product_entity_int</argument>
             <argument name="attributeCode" xsi:type="string">status</argument>
             <argument name="entityType" xsi:type="string">catalog_product</argument>
-            <argument name="entityTypeId" xsi:type="string">4</argument>
             <argument name="valueMap" xsi:type="array">
                 <item name="1" xsi:type="string">1</item>
                 <item name="0" xsi:type="string">2</item>
@@ -30,10 +28,8 @@
     </virtualType>
     <virtualType name="Magento\MediaContent\Model\GetAssetIdByCategoryStatus" type="Magento\MediaContent\Model\GetAssetIdByEavContentStatus">
         <arguments>
-            <argument name="entityEavTypeTable" xsi:type="string">catalog_category_entity_int</argument>
             <argument name="attributeCode" xsi:type="string">is_active</argument>
             <argument name="entityType" xsi:type="string">catalog_category</argument>
-            <argument name="entityTypeId" xsi:type="string">3</argument>
         </arguments>
     </virtualType>
     <virtualType name="Magento\MediaContent\Model\GetAssetIdByPageStatus" type="Magento\MediaContent\Model\GetAssetIdByContentStatus">