MC-21755: Changing Attributes sets doesn't remove attribute from layered navigation and search

Author: yelahin-serhiy

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

@@ -6,10 +6,12 @@
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
+use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 use Magento\Catalog\Model\Product as ProductEntity;
 use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\Framework\Model\AbstractModel;
 
@@ -93,6 +95,11 @@ class Product extends AbstractResource
      */
     private $tableMaintainer;
 
+    /**
+     * @var AttributeManagementInterface
+     */
+    private $eavAttributeManagement;
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -106,7 +113,7 @@ class Product extends AbstractResource
      * @param array $data
      * @param TableMaintainer|null $tableMaintainer
      * @param UniqueValidationInterface|null $uniqueValidator
-     *
+     * @param AttributeManagementInterface|null $eavAttributeManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -121,7 +128,8 @@ public function __construct(
         \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes,
         $data = [],
         TableMaintainer $tableMaintainer = null,
-        UniqueValidationInterface $uniqueValidator = null
+        UniqueValidationInterface $uniqueValidator = null,
+        AttributeManagementInterface $eavAttributeManagement = null
     ) {
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_catalogCategory = $catalogCategory;
@@ -138,6 +146,8 @@ public function __construct(
         );
         $this->connectionName  = 'catalog';
         $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
+        $this->eavAttributeManagement = $eavAttributeManagement
+            ?? ObjectManager::getInstance()->get(AttributeManagementInterface::class);
     }
 
     /**
@@ -268,10 +278,10 @@ public function getIdBySku($sku)
     /**
      * Process product data before save
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      */
-    protected function _beforeSave(\Magento\Framework\DataObject $object)
+    protected function _beforeSave(DataObject $object)
     {
         $self = parent::_beforeSave($object);
         /**
@@ -286,15 +296,73 @@ protected function _beforeSave(\Magento\Framework\DataObject $object)
     /**
      * Save data related with product
      *
-     * @param \Magento\Framework\DataObject $product
+     * @param DataObject $product
      * @return $this
      */
-    protected function _afterSave(\Magento\Framework\DataObject $product)
+    protected function _afterSave(DataObject $product)
     {
+        $this->removeNotInSetAttributeValues($product);
         $this->_saveWebsiteIds($product)->_saveCategories($product);
         return parent::_afterSave($product);
     }
 
+    /**
+     * Remove attribute values that absent in product attribute set
+     *
+     * @param DataObject $product
+     * @return DataObject
+     */
+    private function removeNotInSetAttributeValues(DataObject $product): DataObject
+    {
+        $oldAttributeSetId = $product->getOrigData(ProductEntity::ATTRIBUTE_SET_ID);
+        if ($oldAttributeSetId && $product->dataHasChangedFor(ProductEntity::ATTRIBUTE_SET_ID)) {
+            $newAttributes = $product->getAttributes();
+            $newAttributesCodes = array_keys($newAttributes);
+            $oldAttributes = $this->eavAttributeManagement->getAttributes(
+                ProductEntity::ENTITY,
+                $oldAttributeSetId
+            );
+            $oldAttributesCodes = [];
+            foreach ($oldAttributes as $oldAttribute) {
+                $oldAttributesCodes[] = $oldAttribute->getAttributecode();
+            }
+            $notInSetAttributeCodes = array_diff($oldAttributesCodes, $newAttributesCodes);
+            if (!empty($notInSetAttributeCodes)) {
+                $this->deleteSelectedEntityAttributeRows($product, $notInSetAttributeCodes);
+            }
+        }
+
+        return $product;
+    }
+
+    /**
+     * Clear selected entity attribute rows
+     *
+     * @param DataObject $product
+     * @param array $attributeCodes
+     * @return void
+     */
+    private function deleteSelectedEntityAttributeRows(DataObject $product, array $attributeCodes): void
+    {
+        $backendTables = [];
+        foreach ($attributeCodes as $attributeCode) {
+            $attribute = $this->getAttribute($attributeCode);
+            $backendTable = $attribute->getBackendTable();
+            if (!$attribute->isStatic() && $backendTable) {
+                $backendTables[$backendTable][] = $attribute->getId();
+            }
+        }
+
+        $entityIdField = $this->getLinkField();
+        $entityId = $product->getData($entityIdField);
+        foreach ($backendTables as $backendTable => $attributes) {
+            $connection = $this->getConnection();
+            $where = $connection->quoteInto('attribute_id IN (?)', $attributes);
+            $where .= $connection->quoteInto(" AND {$entityIdField} = ?", $entityId);
+            $connection->delete($backendTable, $where);
+        }
+    }
+
     /**
      * @inheritdoc
      */
@@ -337,12 +405,12 @@ protected function _saveWebsiteIds($product)
     /**
      * Save product category relations
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @deprecated 101.1.0
      */
-    protected function _saveCategories(\Magento\Framework\DataObject $object)
+    protected function _saveCategories(DataObject $object)
     {
         return $this;
     }

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

@@ -6,7 +6,12 @@
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Action;
+use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Eav\Model\AttributeSetRepository;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -164,4 +169,33 @@ public function testUpdateStoreSpecificSpecialPrice()
         $product = $this->productRepository->get('simple', false, 0, true);
         $this->assertEquals(5.99, $product->getSpecialPrice());
     }
+
+    /**
+     * Checks that product has no attribute values for attributes not assigned to the product's attribute set.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/attribute_set_with_image_attribute.php
+     */
+    public function testChangeAttributeSet()
+    {
+        $attributeCode = 'funny_image';
+        /** @var GetAttributeSetByName $attributeSetModel */
+        $attributeSetModel = $this->objectManager->get(GetAttributeSetByName::class);
+        $attributeSet = $attributeSetModel->execute('attribute_set_with_media_attribute');
+
+        $product = $this->productRepository->get('simple', true, 1, true);
+        $product->setAttributeSetId($attributeSet->getAttributeSetId());
+        $this->productRepository->save($product);
+        $product->setData($attributeCode, 'test');
+        $this->model->saveAttribute($product, $attributeCode);
+
+        $product = $this->productRepository->get('simple', true, 1, true);
+        $this->assertEquals('test', $product->getData($attributeCode));
+
+        $product->setAttributeSetId($product->getDefaultAttributeSetId());
+        $this->productRepository->save($product);
+
+        $attribute = $this->model->getAttributeRawValue($product->getId(), $attributeCode, 1);
+        $this->assertEmpty($attribute);
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php

@@ -17,9 +17,10 @@
 $attributeCollection->setCodeFilter('funny_image');
 $attributeCollection->setEntityTypeFilter($entityType->getId());
 $attributeCollection->setPageSize(1);
-$attributeCollection->load();
-$attribute = $attributeCollection->fetchItem();
-$attribute->delete();
+$attribute = $attributeCollection->getFirstItem();
+if ($attribute->getId()) {
+    $attribute->delete();
+}
 
 // remove attribute set
 
@@ -31,8 +32,9 @@
 $attributeSetCollection->addFilter('entity_type_id', $entityType->getId());
 $attributeSetCollection->setOrder('attribute_set_id'); // descending is default value
 $attributeSetCollection->setPageSize(1);
-$attributeSetCollection->load();
 
 /** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
-$attributeSet = $attributeSetCollection->fetchItem();
-$attributeSet->delete();
+$attributeSet = $attributeSetCollection->getFirstItem();
+if ($attributeSet->getId()) {
+    $attributeSet->delete();
+}