ACP2E-55: Simple only global attributes make configurable attributes hidden when creating product configurations

 - Fixed the solution and test coverage.

Author: devarul

app/code/Magento/ConfigurableProduct/Plugin/Model/UpdateConfigurableProductAttributeCollection.php

@@ -7,6 +7,8 @@
 
 namespace Magento\ConfigurableProduct\Plugin\Model;
 
+use Magento\Catalog\Model\Product\Type;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Ui\DataProvider\Attributes;
 
 /**
@@ -18,21 +20,26 @@ class UpdateConfigurableProductAttributeCollection
      * Adding a field to filter in existing configurable product attribute collection.
      *
      * @param Attributes $subject
-     * @return object
+     * @return void
      */
-    public function beforeGetData(Attributes $subject): object
+    public function beforeGetData(Attributes $subject): void
     {
-        $types = [
-            \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE,
-            \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL,
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE,
-        ];
-        return $subject->getCollection()->addFieldToFilter(
-            ['apply_to', 'apply_to'],
-            [
-                ['null' => true],
-                ['like' => '%' . implode(',', $types) . '%']
-            ]
+        $subject->getCollection()->getSelect()->where(
+            '(`apply_to` IS NULL) OR
+                (
+                    FIND_IN_SET(' .
+            "'" . Type::TYPE_SIMPLE . "'" . ',
+                        `apply_to`
+                    ) AND
+                    FIND_IN_SET(' .
+            "'" . Type::TYPE_VIRTUAL . "'" . ',
+                        `apply_to`
+                    ) AND
+                    FIND_IN_SET(' .
+            "'" . Configurable::TYPE_CODE . "'" . ',
+                        `apply_to`
+                    )
+                 )'
         );
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Model/UpdateConfigurableProductAttributeCollectionTest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\Model;
+
+use Magento\ConfigurableProduct\Plugin\Model\UpdateConfigurableProductAttributeCollection;
+use Magento\ConfigurableProduct\Ui\DataProvider\Attributes;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection;
+use Magento\Framework\DB\Select;
+use PHPUnit\Framework\TestCase;
+
+class UpdateConfigurableProductAttributeCollectionTest extends TestCase
+{
+    /**
+     * @var Attributes
+     */
+    private Attributes $attributesMock;
+
+    /**
+     * @var Collection
+     */
+    private Collection $collectionMock;
+
+    /**
+     * @var Select
+     */
+    private Select $selectMock;
+
+    /**
+     * @var UpdateConfigurableProductAttributeCollection
+     */
+    private UpdateConfigurableProductAttributeCollection $plugin;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->attributesMock = $this->getMockBuilder(Attributes::class)
+            ->setMethods(['getCollection'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->collectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getSelect'])
+            ->getMock();
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['where'])
+            ->getMock();
+        $this->plugin = new UpdateConfigurableProductAttributeCollection();
+    }
+
+    /**
+     * @return void
+     */
+    public function testBeforeGetData()
+    {
+        $this->collectionMock->expects($this->once())
+            ->method('getSelect')
+            ->willReturn($this->selectMock);
+        $this->attributesMock->expects($this->any())
+            ->method('getCollection')
+            ->willReturn($this->collectionMock);
+        $this->plugin->beforeGetData($this->attributesMock);
+    }
+}