Merge remote-tracking branch 'origin/MC-30262' into 2.4-develop-pr8

Author: serhii-balko

app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php

@@ -14,7 +14,8 @@
 use Magento\Store\Model\Store;
 
 /**
- * Class Product
+ * Rule product condition data model
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
@@ -250,7 +251,7 @@ protected function addNotGlobalAttribute(
     public function getMappedSqlField()
     {
         $result = '';
-        if (in_array($this->getAttribute(), ['category_ids', 'sku'])) {
+        if (in_array($this->getAttribute(), ['category_ids', 'sku', 'attribute_set_id'])) {
             $result = parent::getMappedSqlField();
         } elseif (isset($this->joinedAttributes[$this->getAttribute()])) {
             $result = $this->joinedAttributes[$this->getAttribute()];

app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php

@@ -5,53 +5,65 @@
  */
 namespace Magento\CatalogWidget\Test\Unit\Model\Rule\Condition;
 
+use Magento\Catalog\Model\ProductCategoryList;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogWidget\Model\Rule\Condition\Product as ProductWidget;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\AbstractEntity;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ProductTest extends \PHPUnit\Framework\TestCase
+class ProductTest extends TestCase
 {
     /**
-     * @var \Magento\CatalogWidget\Model\Rule\Condition\Product
+     * @var ProductWidget
      */
     private $model;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product|\PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
-    private $productResource;
+    private $attributeMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Product|MockObject
      */
-    private $attributeMock;
+    private $productResource;
 
     /**
      * @inheritdoc
-     *
-     * @return void
      */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManager($this);
 
-        $eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
-        $this->attributeMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+        $eavConfig = $this->createMock(Config::class);
+        $this->attributeMock = $this->createMock(Attribute::class);
         $eavConfig->expects($this->any())->method('getAttribute')->willReturn($this->attributeMock);
-        $ruleMock = $this->createMock(\Magento\SalesRule\Model\Rule::class);
-        $storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-        $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $ruleMock = $this->createMock(Rule::class);
+        $storeManager = $this->createMock(StoreManagerInterface::class);
+        $storeMock = $this->createMock(StoreInterface::class);
         $storeManager->expects($this->any())->method('getStore')->willReturn($storeMock);
-        $this->productResource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product::class);
+        $this->productResource = $this->createMock(Product::class);
         $this->productResource->expects($this->once())->method('loadAllAttributes')->willReturnSelf();
         $this->productResource->expects($this->once())->method('getAttributesByCode')->willReturn([]);
-        $productCategoryList = $this->getMockBuilder(\Magento\Catalog\Model\ProductCategoryList::class)
+        $productCategoryList = $this->getMockBuilder(ProductCategoryList::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->model = $objectManagerHelper->getObject(
-            \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
+            ProductWidget::class,
             [
                 'config' => $eavConfig,
                 'storeManager' => $storeManager,
@@ -72,8 +84,8 @@ protected function setUp()
      */
     public function testAddToCollection()
     {
-        $collectionMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
-        $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
+        $collectionMock = $this->createMock(Collection::class);
+        $selectMock = $this->createMock(Select::class);
         $collectionMock->expects($this->once())->method('getSelect')->willReturn($selectMock);
         $selectMock->expects($this->any())->method('join')->willReturnSelf();
         $this->attributeMock->expects($this->any())->method('getAttributeCode')->willReturn('code');
@@ -83,10 +95,10 @@ public function testAddToCollection()
         $this->attributeMock->expects($this->once())->method('isScopeGlobal')->willReturn(true);
         $this->attributeMock->expects($this->once())->method('getBackendType')->willReturn('multiselect');
 
-        $entityMock = $this->createMock(\Magento\Eav\Model\Entity\AbstractEntity::class);
+        $entityMock = $this->createMock(AbstractEntity::class);
         $entityMock->expects($this->once())->method('getLinkField')->willReturn('entitiy_id');
         $this->attributeMock->expects($this->once())->method('getEntity')->willReturn($entityMock);
-        $connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $connection = $this->createMock(AdapterInterface::class);
 
         $this->productResource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connection);
 
@@ -102,5 +114,7 @@ public function testGetMappedSqlFieldSku()
     {
         $this->model->setAttribute('sku');
         $this->assertEquals('e.sku', $this->model->getMappedSqlField());
+        $this->model->setAttribute('attribute_set_id');
+        $this->assertEquals('e.attribute_set_id', $this->model->getMappedSqlField());
     }
 }

app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php

@@ -625,6 +625,8 @@ public function getMappedSqlField()
             $mappedSqlField = $this->getEavAttributeTableAlias() . '.value';
         } elseif ($this->getAttribute() == 'category_ids') {
             $mappedSqlField = 'e.entity_id';
+        } elseif ($this->getAttribute() == 'attribute_set_id') {
+            $mappedSqlField = 'e.attribute_set_id';
         } else {
             $mappedSqlField = parent::getMappedSqlField();
         }