Move getCustomAttributeCodes from product model to resource model

Author: schmengler

app/code/Magento/Catalog/Model/Product.php

@@ -117,6 +117,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_urlModel = null;
 
+    /**
+     * @var ResourceModel\Product
+     */
+    protected $_resource;
+
     /**
      * @var string
      */
@@ -269,6 +274,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
     protected $imageCacheFactory;
 
     /**
+     * @deprecated not used anymore, related functionality has been moved to resource model
      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
      */
     protected $metadataService;
@@ -468,11 +474,7 @@ protected function _construct()
      */
     protected function getCustomAttributesCodes()
     {
-        if ($this->customAttributesCodes === null) {
-            $this->customAttributesCodes = $this->getEavAttributesCodes($this->metadataService);
-            $this->customAttributesCodes = array_diff($this->customAttributesCodes, ProductInterface::ATTRIBUTES);
-        }
-        return $this->customAttributesCodes;
+        return $this->_resource->getCustomAttributesCodes();
     }
 
     /**

app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

@@ -577,4 +577,5 @@ public function getAttributeRawValue($entityId, $attribute, $store)
 
         return $attributesData === false ? false : $attributesData;
     }
+
 }

app/code/Magento/Catalog/Model/ResourceModel/Product.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 use Magento\Framework\App\ObjectManager;
 
@@ -83,6 +85,16 @@ class Product extends AbstractResource
      */
     private $productCategoryLink;
 
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    protected $metadataService;
+
+    /**
+     * @var string[]
+     */
+    private $customAttributesCodes;
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -94,6 +106,7 @@ class Product extends AbstractResource
      * @param \Magento\Eav\Model\Entity\TypeFactory $typeFactory
      * @param \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes
      * @param array $data
+     * @param ProductAttributeRepositoryInterface|null $metadataService
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -107,14 +120,18 @@ public function __construct(
         \Magento\Eav\Model\Entity\Attribute\SetFactory $setFactory,
         \Magento\Eav\Model\Entity\TypeFactory $typeFactory,
         \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes,
-        $data = []
+        $data = [],
+        ProductAttributeRepositoryInterface $metadataService = null
     ) {
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_catalogCategory = $catalogCategory;
         $this->eventManager = $eventManager;
         $this->setFactory = $setFactory;
         $this->typeFactory = $typeFactory;
         $this->defaultAttributes = $defaultAttributes;
+        $this->metadataService = $metadataService ?? ObjectManager::getInstance(
+            ProductAttributeRepositoryInterface::class
+        );
         parent::__construct(
             $context,
             $storeManager,
@@ -232,6 +249,14 @@ public function getCategoryIds($product)
         return array_column($result, 'category_id');
     }
 
+    public function getCustomAttributesCodes()
+    {
+        if ($this->customAttributesCodes === null) {
+            $this->customAttributesCodes = $this->getEavAttributesCodes($this->metadataService);
+            $this->customAttributesCodes = array_diff($this->customAttributesCodes, ProductInterface::ATTRIBUTES);
+        }
+    }
+
     /**
      * Get product identifier by sku
      *

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -10,6 +10,7 @@
 use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
 use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+use Magento\Framework\Api\MetadataServiceInterface;
 use Magento\Framework\App\Config\Element;
 use Magento\Framework\DB\Adapter\DuplicateException;
 use Magento\Framework\Exception\AlreadyExistsException;
@@ -1958,4 +1959,25 @@ protected function loadAttributesForObject($attributes, $object = null)
             }
         }
     }
+
+    /**
+     * Receive a list of EAV attributes using provided metadata service.
+     *
+     * @param MetadataServiceInterface $metadataService
+     * @return string[]
+     */
+    protected function getEavAttributesCodes(MetadataServiceInterface $metadataService)
+    {
+        $attributeCodes = [];
+        $customAttributesMetadata = $metadataService->getCustomAttributesMetadata(
+            $this->getEntityType()->getEntityModel()
+        );
+        if (is_array($customAttributesMetadata)) {
+            /** @var $attribute \Magento\Framework\Api\MetadataObjectInterface */
+            foreach ($customAttributesMetadata as $attribute) {
+                $attributeCodes[] = $attribute->getAttributeCode();
+            }
+        }
+        return $attributeCodes;
+    }
 }