Merge remote-tracking branch 'magento-l3/ACP2E-1522' into FEB132023_PR_arul

Author: devarul

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

@@ -24,14 +24,14 @@
 abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
 {
     /**
-     * Store manager
+     * Store manager to get the store information
      *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Model factory
+     * Model factory to create a model object
      *
      * @var \Magento\Catalog\Model\Factory
      */
@@ -325,7 +325,25 @@ protected function _insertAttribute($object, $attribute, $value)
      */
     protected function _updateAttribute($object, $attribute, $valueId, $value)
     {
-        return $this->_saveAttributeValue($object, $attribute, $value);
+        $entity = $attribute->getEntity();
+        $row = $this->getAttributeRow($entity, $object, $attribute);
+        $hasSingleStore = $this->_storeManager->hasSingleStore();
+        $storeId = $hasSingleStore
+            ? $this->getDefaultStoreId()
+            : (int) $this->_storeManager->getStore($object->getStoreId())->getId();
+        if ($valueId > 0 && array_key_exists('store_id', $row) && $storeId === $row['store_id']) {
+            $table = $attribute->getBackend()->getTable();
+            $connection = $this->getConnection();
+            $connection->update(
+                $table,
+                ['value' => $this->_prepareValueForSave($value, $attribute)],
+                sprintf('%s=%d', $connection->quoteIdentifier('value_id'), $valueId)
+            );
+
+            return $this;
+        } else {
+            return $this->_saveAttributeValue($object, $attribute, $value);
+        }
     }
 
     /**

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php

@@ -9,6 +9,7 @@
 use Magento\Catalog\Test\Fixture\Attribute as AttributeFixture;
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
 use Magento\TestFramework\Fixture\AppArea;
 use Magento\TestFramework\Fixture\AppIsolation;
@@ -44,6 +45,11 @@ class ProductTest extends TestCase
      */
     private $objectManager;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @inheritdoc
      */
@@ -53,6 +59,8 @@ protected function setUp(): void
 
         $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $this->model = $this->objectManager->create(Product::class);
+
+        $this->storeManager = $this->objectManager->create(StoreManagerInterface::class);
     }
 
     /**
@@ -213,4 +221,57 @@ public function testChangeAttributeSet()
         $attribute = $this->model->getAttributeRawValue($product->getId(), $attributeCode, 1);
         $this->assertEmpty($attribute);
     }
+
+    /**
+     * Test update product custom attributes
+     *
+     * @return void
+     */
+    #[
+        DataFixture(AttributeFixture::class, ['attribute_code' => 'first_custom_attribute']),
+        DataFixture(AttributeFixture::class, ['attribute_code' => 'second_custom_attribute']),
+        DataFixture(AttributeFixture::class, ['attribute_code' => 'third_custom_attribute']),
+        DataFixture(ProductFixture::class, ['sku' => 'simple','media_gallery_entries' => [[], []]], as: 'product')
+    ]
+
+    public function testUpdateCustomerAttributesAutoIncrement()
+    {
+        $resource = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+        $connection = $resource->getConnection();
+        $currentTableStatus = $connection->showTableStatus('catalog_product_entity_varchar');
+        $this->storeManager->setCurrentStore('admin');
+        $product = $this->productRepository->get('simple');
+        $product->setCustomAttribute(
+            'first_custom_attribute',
+            'first attribute'
+        );
+        $firstAttributeSavedProduct = $this->productRepository->save($product);
+        $currentTableStatusAfterFirstAttrSave = $connection->showTableStatus('catalog_product_entity_varchar');
+        $this->assertSame(
+            ((int) ($currentTableStatus['Auto_increment']) + 1),
+            (int) $currentTableStatusAfterFirstAttrSave['Auto_increment']
+        );
+
+        $firstAttributeSavedProduct->setCustomAttribute(
+            'second_custom_attribute',
+            'second attribute'
+        );
+        $secondAttributeSavedProduct = $this->productRepository->save($firstAttributeSavedProduct);
+        $currentTableStatusAfterSecondAttrSave = $connection->showTableStatus('catalog_product_entity_varchar');
+        $this->assertSame(
+            (((int) $currentTableStatusAfterFirstAttrSave['Auto_increment']) + 1),
+            (int) $currentTableStatusAfterSecondAttrSave['Auto_increment']
+        );
+
+        $secondAttributeSavedProduct->setCustomAttribute(
+            'third_custom_attribute',
+            'third attribute'
+        );
+        $this->productRepository->save($secondAttributeSavedProduct);
+        $currentTableStatusAfterThirdAttrSave = $connection->showTableStatus('catalog_product_entity_varchar');
+        $this->assertSame(
+            (((int)$currentTableStatusAfterSecondAttrSave['Auto_increment']) + 1),
+            (int) $currentTableStatusAfterThirdAttrSave['Auto_increment']
+        );
+    }
 }