Merge branch 'ACP2E-55' of https://github.com/magento-l3/magento2ce into PR1-21-01-2022

Author: chittima

app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/AttributesTest.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Ui\DataProvider;
+
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection;
+use Magento\ConfigurableProduct\Model\ConfigurableAttributeHandler;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Ui\DataProvider\Attributes;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Select;
+use PHPUnit\Framework\TestCase;
+
+class AttributesTest extends TestCase
+{
+    /**
+     * @var Collection
+     */
+    private Collection $collectionMock;
+
+    /**
+     * @var Select
+     */
+    private Select $selectMock;
+
+    /**
+     * @var Attributes
+     */
+    private Attributes $attributes;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->collectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['where'])
+            ->getMock();
+        $collectionAttributeHandlerMock = $this->getMockBuilder(ConfigurableAttributeHandler::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getApplicableAttributes'])
+            ->getMock();
+        $collectionAttributeHandlerMock->expects($this->once())
+            ->method('getApplicableAttributes')
+            ->willReturn($this->collectionMock);
+        $this->attributes = new Attributes(
+            'myName',
+            'myPrimaryFieldName',
+            'myRequestFieldName',
+            $collectionAttributeHandlerMock
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetData()
+    {
+        $expectedResult = [
+            'totalRecords' => 1,
+            'items' => [
+                0 => ['attribute' => 'color']
+            ]
+        ];
+        $this->collectionMock->expects($this->once())
+            ->method('getSelect')
+            ->willReturn($this->selectMock);
+        $this->selectMock->expects($this->once())
+            ->method('where')
+            ->with('(`apply_to` IS NULL) OR
+            (
+                FIND_IN_SET(' .
+                    sprintf("'%s'", Type::TYPE_SIMPLE) . ',
+                    `apply_to`
+                ) AND
+                FIND_IN_SET(' .
+                    sprintf("'%s'", Type::TYPE_VIRTUAL) . ',
+                    `apply_to`
+                ) AND
+                FIND_IN_SET(' .
+                    sprintf("'%s'", Configurable::TYPE_CODE) . ',
+                    `apply_to`
+                )
+             )')
+            ->willReturnSelf();
+        $this->collectionMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([new DataObject(['attribute' => 'color'])]);
+        $this->collectionMock->expects($this->once())
+            ->method('getSize')
+            ->willReturn(1);
+        $this->assertEquals($expectedResult, $this->attributes->getData());
+    }
+}

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Attributes.php

@@ -6,18 +6,16 @@
 
 namespace Magento\ConfigurableProduct\Ui\DataProvider;
 
+use Magento\Catalog\Model\Product\Type;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
 class Attributes extends \Magento\Ui\DataProvider\AbstractDataProvider
 {
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
      */
     protected $collection;
 
-    /**
-     * @var \Magento\ConfigurableProduct\Model\ConfigurableAttributeHandler
-     */
-    private $configurableAttributeHandler;
-
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -35,11 +33,12 @@ public function __construct(
         array $data = []
     ) {
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
-        $this->configurableAttributeHandler = $configurableAttributeHandler;
         $this->collection = $configurableAttributeHandler->getApplicableAttributes();
     }
 
     /**
+     * Getting the product attribute collection.
+     *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
      */
     public function getCollection()
@@ -48,21 +47,33 @@ public function getCollection()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getData()
     {
         $items = [];
-        $skippedItems = 0;
+        $this->getCollection()->getSelect()->where(
+            '(`apply_to` IS NULL) OR
+            (
+                FIND_IN_SET(' .
+            sprintf("'%s'", Type::TYPE_SIMPLE) . ',
+                    `apply_to`
+                ) AND
+                FIND_IN_SET(' .
+            sprintf("'%s'", Type::TYPE_VIRTUAL) . ',
+                    `apply_to`
+                ) AND
+                FIND_IN_SET(' .
+            sprintf("'%s'", Configurable::TYPE_CODE) . ',
+                    `apply_to`
+                )
+             )'
+        );
         foreach ($this->getCollection()->getItems() as $attribute) {
-            if ($this->configurableAttributeHandler->isAttributeApplicable($attribute)) {
-                $items[] = $attribute->toArray();
-            } else {
-                $skippedItems++;
-            }
+            $items[] = $attribute->toArray();
         }
         return [
-            'totalRecords' => $this->collection->getSize() - $skippedItems,
+            'totalRecords' => $this->collection->getSize(),
             'items' => $items
         ];
     }