ACP2E-465: Bundle product special price is not updated via REST API at store view scope

Author: bubasuma

app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Catalog\Model\Attribute;
 
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -75,7 +77,7 @@ public function __construct(
      * Whether attribute value is overridden in specific store
      *
      * @param string $entityType
-     * @param \Magento\Catalog\Model\AbstractModel $entity
+     * @param AbstractModel $entity
      * @param string $attributeCode
      * @param int|string $storeId
      * @return bool
@@ -85,39 +87,41 @@ public function containsValue($entityType, $entity, $attributeCode, $storeId)
         if ((int)$storeId === Store::DEFAULT_STORE_ID) {
             return false;
         }
-        if (!isset($this->attributesValues[$storeId])) {
+        $values = $this->getAttributesValues($entityType, $entity);
+
+        if (!isset($values[$storeId])) {
             $this->initAttributeValues($entityType, $entity, (int)$storeId);
+            $values = $this->getAttributesValues($entityType, $entity);
         }
 
-        return isset($this->attributesValues[$storeId])
-            && array_key_exists($attributeCode, $this->attributesValues[$storeId]);
+        return isset($values[$storeId]) && array_key_exists($attributeCode, $values[$storeId]);
     }
 
     /**
      * Get attribute default values
      *
      * @param string $entityType
-     * @param \Magento\Catalog\Model\AbstractModel $entity
+     * @param AbstractModel $entity
      * @return array
      *
      * @deprecated 101.0.0
      */
     public function getDefaultValues($entityType, $entity)
     {
-        if ($this->attributesValues === null) {
+        $values = $this->getAttributesValues($entityType, $entity);
+        if (!isset($values[Store::DEFAULT_STORE_ID])) {
             $this->initAttributeValues($entityType, $entity, (int)$entity->getStoreId());
+            $values = $this->getAttributesValues($entityType, $entity);
         }
 
-        return isset($this->attributesValues[Store::DEFAULT_STORE_ID])
-            ? $this->attributesValues[Store::DEFAULT_STORE_ID]
-            : [];
+        return $values[Store::DEFAULT_STORE_ID] ?? [];
     }
 
     /**
      * Init attribute values.
      *
      * @param string $entityType
-     * @param \Magento\Catalog\Model\AbstractModel $entity
+     * @param AbstractModel $entity
      * @param int $storeId
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
@@ -128,6 +132,7 @@ private function initAttributeValues($entityType, $entity, $storeId)
         /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
         $attributeTables = [];
         if ($metadata->getEavEntityType()) {
+            $entityId = $entity->getData($metadata->getLinkField());
             foreach ($this->getAttributes($entityType) as $attribute) {
                 if (!$attribute->isStatic()) {
                     $attributeTables[$attribute->getBackend()->getTable()][] = $attribute->getAttributeId();
@@ -146,7 +151,7 @@ private function initAttributeValues($entityType, $entity, $storeId)
                         'a.attribute_id = t.attribute_id',
                         ['attribute_code' => 'a.attribute_code']
                     )
-                    ->where($metadata->getLinkField() . ' = ?', $entity->getData($metadata->getLinkField()))
+                    ->where($metadata->getLinkField() . ' = ?', $entityId)
                     ->where('t.attribute_id IN (?)', $attributeCodes)
                     ->where('t.store_id IN (?)', $storeIds);
                 $selects[] = $select;
@@ -157,9 +162,14 @@ private function initAttributeValues($entityType, $entity, $storeId)
                 \Magento\Framework\DB\Select::SQL_UNION_ALL
             );
             $attributes = $metadata->getEntityConnection()->fetchAll((string)$unionSelect);
+            $values = array_merge(
+                $this->getAttributesValues($entityType, $entity),
+                array_fill_keys($storeIds, [])
+            );
             foreach ($attributes as $attribute) {
-                $this->attributesValues[$attribute['store_id']][$attribute['attribute_code']] = $attribute['value'];
+                $values[$attribute['store_id']][$attribute['attribute_code']] = $attribute['value'];
             }
+            $this->setAttributesValues($entityType, $entity, $values);
         }
     }
 
@@ -188,12 +198,50 @@ private function getAttributes($entityType)
     }
 
     /**
-     * Clear attributes values cache
+     * Clear entity attributes values cache
+     *
+     * @param string $entityType
+     * @param DataObject $entity
+     * @return void
+     * @throws \Exception
+     */
+    public function clearAttributesValues(string $entityType, DataObject $entity): void
+    {
+        if (isset($this->attributesValues[$entityType])) {
+            $metadata = $this->metadataPool->getMetadata($entityType);
+            $entityId = $entity->getData($metadata->getLinkField());
+            unset($this->attributesValues[$entityType][$entityId]);
+        }
+    }
+
+    /**
+     * Get entity attributes values from cache
      *
+     * @param string $entityType
+     * @param DataObject $entity
+     * @return array
+     * @throws \Exception
+     */
+    private function getAttributesValues(string $entityType, DataObject $entity): array
+    {
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $entityId = $entity->getData($metadata->getLinkField());
+        return $this->attributesValues[$entityType][$entityId] ?? [];
+    }
+
+    /**
+     * Set entity attributes values into cache
+     *
+     * @param string $entityType
+     * @param DataObject $entity
+     * @param array $values
      * @return void
+     * @throws \Exception
      */
-    public function clearAttributeValues(): void
+    private function setAttributesValues(string $entityType, DataObject $entity, array $values): void
     {
-        $this->attributesValues = null;
+        $metadata = $this->metadataPool->getMetadata($entityType);
+        $entityId = $entity->getData($metadata->getLinkField());
+        $this->attributesValues[$entityType][$entityId] = $values;
     }
 }

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

@@ -323,7 +323,7 @@ protected function _afterSave(DataObject $product)
     {
         $this->removeNotInSetAttributeValues($product);
         $this->_saveWebsiteIds($product)->_saveCategories($product);
-        $this->scopeOverriddenValue->clearAttributeValues();
+        $this->scopeOverriddenValue->clearAttributesValues(ProductInterface::class, $product);
         return parent::_afterSave($product);
     }