ACP2E-2053: Unable to save products with different attribute sets in Async bulk REST API

Author: bubasuma

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php

@@ -10,57 +10,15 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel;
 
-use Magento\Catalog\Model\Factory;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\AbstractResource;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Eav\Model\Entity\Attribute\Set;
-use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
-use Magento\Eav\Model\Entity\Context;
 use Magento\Framework\DataObject;
-use Magento\Store\Model\StoreManagerInterface;
-use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
 class AbstractTest extends TestCase
 {
-    /**
-     * @var Context|MockObject
-     */
-    private $context;
-
-    /**
-     * @var StoreManagerInterface|MockObject
-     */
-    private $storeManager;
-
-    /**
-     * @var Factory|MockObject
-     */
-    private $modelFactory;
-
-    /**
-     * @var UniqueValidationInterface|MockObject
-     */
-    private $uniqueValidator;
-
-    /**
-     * @var AbstractResource|MockObject
-     */
-    private $model;
-
-    /**
-     * @inheritDoc
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->context = $this->createMock(Context::class);
-        $this->storeManager = $this->createMock(StoreManagerInterface::class);
-        $this->modelFactory = $this->createMock(Factory::class);
-        $this->uniqueValidator = $this->createMock(UniqueValidationInterface::class);
-    }
-
     /**
      * Get attribute list
      *
@@ -89,6 +47,8 @@ protected function _getAttributes()
 
     public function testWalkAttributes()
     {
+        $objectManager = new ObjectManager($this);
+
         $code = 'test_attr';
         $set = 10;
         $storeId = 100;
@@ -125,33 +85,17 @@ public function testWalkAttributes()
 
         $attributes[$code] = $attribute;
 
-        $attrSetEntity = $this->createMock(Set::class);
-        $this->context->method('getAttributeSetEntity')
-            ->willReturn($attrSetEntity);
-        $attrSetEntity->expects($this->once())
-            ->method('addSetInfo')
-            ->with($entityType, $attributes, $set);
-
-        $this->model = $this->getMockBuilder(AbstractResource::class)
-            ->setConstructorArgs(
-                [
-                    $this->context,
-                    $this->storeManager,
-                    $this->modelFactory,
-                    [],
-                    $this->uniqueValidator
-                ]
-            )
-            ->onlyMethods(['getAttributesByCode', 'getEntityType'])
-            ->getMockForAbstractClass();
-
-        $this->model->expects($this->once())
-            ->method('getAttributesByCode')
-            ->willReturn($attributes);
-        $this->model->expects($this->once())
-            ->method('getEntityType')
-            ->willReturn($entityType);
-
-        $this->model->walkAttributes('backend/afterSave', [$object]);
+        /** @var AbstractResource $model */
+        $arguments = $objectManager->getConstructArguments(
+            AbstractResource::class
+        );
+        $model = $this->getMockBuilder(AbstractResource::class)
+            ->setMethods(['getAttributesByCode'])
+            ->setConstructorArgs($arguments)
+            ->getMock();
+
+        $model->expects($this->once())->method('getAttributesByCode')->willReturn($attributes);
+
+        $model->walkAttributes('backend/afterSave', [$object]);
     }
 }

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

@@ -553,7 +553,16 @@ public function isPartialSave($flag = null)
      */
     public function loadAllAttributes($object = null)
     {
-        return $this->attributeLoader->loadAllAttributes($this, $object);
+        $result = $this->attributeLoader->loadAllAttributes($this, $object);
+        if ($object instanceof DataObject && $object->getAttributeSetId()) {
+            $suffix = $this->getAttributesCacheSuffix($object);
+            $this->_attrSetEntity->addSetInfo(
+                $this->getEntityType(),
+                $this->getAttributesByScope($suffix),
+                $object->getAttributeSetId()
+            );
+        }
+        return $result;
     }
 
     /**
@@ -650,14 +659,8 @@ public function walkAttributes($partMethod, array $args = [], $collectExceptionM
         }
         $results = [];
         $suffix = $this->getAttributesCacheSuffix($args[0]);
-        $attributes = $this->getAttributesByScope($suffix);
-        foreach ($args as $arg) {
-            if ($arg instanceof DataObject && $arg->getAttributeSetId()) {
-                $this->_attrSetEntity->addSetInfo($this->getEntityType(), $attributes, $arg->getAttributeSetId());
-            }
-        }
         $instance = null;
-        foreach ($attributes as $attrCode => $attribute) {
+        foreach ($this->getAttributesByScope($suffix) as $attrCode => $attribute) {
             if (isset($args[0]) && is_object($args[0]) && !$this->_isApplicableAttribute($args[0], $attribute)) {
                 continue;
             }