#27948: Returned metadata pool

Author: sivaschenko

app/code/Magento/MediaContentCatalog/Observer/Category.php

@@ -7,7 +7,9 @@
 
 namespace Magento\MediaContentCatalog\Observer;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\Category as CatalogCategory;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
@@ -44,6 +46,11 @@ class Category implements ObserverInterface
      */
     private $getContent;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param GetContent $getContent
@@ -54,11 +61,13 @@ public function __construct(
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         GetContent $getContent,
         UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        MetadataPool $metadataPool,
         array $fields
     ) {
         $this->contentIdentityFactory = $contentIdentityFactory;
         $this->getContent = $getContent;
         $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->metadataPool = $metadataPool;
         $this->fields = $fields;
     }
 
@@ -73,6 +82,7 @@ public function execute(Observer $observer): void
         $model = $observer->getEvent()->getData('category');
 
         if ($model instanceof CatalogCategory) {
+            $id = (int) $model->getData($this->metadataPool->getMetadata(CategoryInterface::class)->getLinkField());
             foreach ($this->fields as $field) {
                 if (!$model->dataHasChangedFor($field)) {
                     continue;
@@ -85,7 +95,7 @@ public function execute(Observer $observer): void
                             self::ENTITY_ID => (string) $model->getId(),
                         ]
                     ),
-                    $this->getContent->execute((int) $model->getId(), $model->getAttributes()[$field])
+                    $this->getContent->execute($id, $model->getAttributes()[$field])
                 );
             }
         }

app/code/Magento/MediaContentCatalog/Observer/Product.php

@@ -7,7 +7,9 @@
 
 namespace Magento\MediaContentCatalog\Observer;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
@@ -44,6 +46,11 @@ class Product implements ObserverInterface
      */
     private $getContent;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param GetContent $getContent
@@ -54,11 +61,13 @@ public function __construct(
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         GetContent $getContent,
         UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        MetadataPool $metadataPool,
         array $fields
     ) {
         $this->contentIdentityFactory = $contentIdentityFactory;
         $this->getContent = $getContent;
         $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->metadataPool = $metadataPool;
         $this->fields = $fields;
     }
 
@@ -73,6 +82,7 @@ public function execute(Observer $observer): void
         $model = $observer->getEvent()->getData('product');
 
         if ($model instanceof CatalogProduct) {
+            $id = (int) $model->getData($this->metadataPool->getMetadata(ProductInterface::class)->getLinkField());
             foreach ($this->fields as $field) {
                 if (!$model->dataHasChangedFor($field)) {
                     continue;
@@ -85,7 +95,7 @@ public function execute(Observer $observer): void
                             self::ENTITY_ID => (string) $model->getId(),
                         ]
                     ),
-                    $this->getContent->execute((int) $model->getId(), $model->getAttributes()[$field])
+                    $this->getContent->execute($id, $model->getAttributes()[$field])
                 );
             }
         }

dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetContentTest.php

@@ -8,7 +8,9 @@
 
 namespace Magento\MediaContentCatalog\Model\ResourceModel;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -27,6 +29,11 @@ class GetContentTest extends TestCase
      */
     private $productRepository;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @inheritdoc
      */
@@ -35,6 +42,7 @@ public function setUp(): void
         $objectManager = Bootstrap::getObjectManager();
         $this->getContent = $objectManager->get(GetContent::class);
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->metadataPool = $objectManager->get(MetadataPool::class);
     }
 
     /**
@@ -45,9 +53,10 @@ public function setUp(): void
     public function testProduct(): void
     {
         $product = $this->productRepository->get('simple');
+        $id = (int) $product->getData($this->metadataPool->getMetadata(ProductInterface::class)->getLinkField());
         $this->assertEquals(
             'Description with <b>html tag</b>',
-            $this->getContent->execute((int) $product->getId(), $product->getAttributes()['description'])
+            $this->getContent->execute($id, $product->getAttributes()['description'])
         );
     }
 
@@ -59,9 +68,10 @@ public function testProduct(): void
     public function testProductTwoWebsites(): void
     {
         $product = $this->productRepository->get('simple-on-two-websites-different-description');
+        $id = (int) $product->getData($this->metadataPool->getMetadata(ProductInterface::class)->getLinkField());
         $this->assertEquals(
             '<p>Product base description</p>' . PHP_EOL . '<p>Product second description</p>',
-            $this->getContent->execute((int) $product->getId(), $product->getAttributes()['description'])
+            $this->getContent->execute($id, $product->getAttributes()['description'])
         );
     }
 }