MAGETWO-65402: [Backport] - [Performance] Optimize validation of swatches attributes - for 2.1.6

Author: OlgaVasyltsun

app/code/Magento/Swatches/Model/SwatchAttributeCodes.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Swatches\Model;
 
-use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Select;
@@ -51,8 +50,8 @@ class SwatchAttributeCodes
     public function __construct(
         CacheInterface $cache,
         ResourceConnection $resourceConnection,
-        $cacheKey = 'swatch-attribute-list',
-        array $cacheTags = [Attribute::CACHE_TAG]
+        $cacheKey,
+        array $cacheTags
     ) {
         $this->cache = $cache;
         $this->resourceConnection = $resourceConnection;

app/code/Magento/Swatches/Model/SwatchAttributesProvider.php

@@ -25,7 +25,7 @@ class SwatchAttributesProvider
     private $swatchAttributeCodes;
 
     /**
-     * @var Attribute[]
+     * @var [productId => Attribute[]]
      */
     private $attributesPerProduct;
 

app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php

@@ -47,7 +47,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     protected $productRepoMock;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Swatches\Model\SwatchAttributesProvider */
-    protected $swatchAttributesProviderMock;
+    private $swatchAttributesProviderMock;
 
     protected function setUp()
     {

app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributeCodesTest.php

@@ -25,19 +25,19 @@ class SwatchAttributeCodesTest extends \PHPUnit_Framework_TestCase
     /**
      * @var SwatchAttributeCodes
      */
-    protected $swatchAttributeCodesModel;
+    private $swatchAttributeCodesModel;
 
     /**
      * @var CacheInterface
      */
-    protected $cache;
+    private $cache;
 
     /**
      * @var ResourceConnection;
      */
-    protected $resourceConnection;
+    private $resourceConnection;
 
-    protected $swatchAttributesCodes = [
+    private $swatchAttributesCodes = [
         10 => 'text_swatch',
         11 => 'image_swatch'
     ];

app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php

@@ -16,22 +16,22 @@ class SwatchAttributesProviderTest extends \PHPUnit_Framework_TestCase
     /**
      * @var SwatchAttributesProvider
      */
-    protected $swatchAttributesProvider;
+    private $swatchAttributesProvider;
 
     /**
      * @var Configurable
      */
-    protected $typeConfigurableMock;
+    private $typeConfigurableMock;
 
     /**
      * @var SwatchAttributeCodes
      */
-    protected $swatchAttributeCodesMock;
+    private $swatchAttributeCodesMock;
 
     /**
      * @var \Magento\Catalog\Model\Product
      */
-    protected $productMock;
+    private $productMock;
 
     protected function setUp()
     {

app/code/Magento/Swatches/etc/di.xml

@@ -73,4 +73,12 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Swatches\Model\SwatchAttributeCodes">
+        <arguments>
+            <argument name="cacheKey" xsi:type="string">swatch-attribute-list</argument>
+            <argument name="cacheTags" xsi:type="array">
+                <item name="0" xsi:type="const">Magento\Eav\Model\Entity\Attribute::CACHE_TAG</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

dev/tests/integration/testsuite/Magento/Swatches/Model/SwatchAttributeCodesTest.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Swatches\Model;
+
+class SwatchAttributeCodesTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var  \Magento\Swatches\Model\SwatchAttributeCodes */
+    private $swatchAttributeCodes;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $_objectManager;
+
+    protected function setUp()
+    {
+        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->swatchAttributeCodes = $this->_objectManager->create(
+            \Magento\Swatches\Model\SwatchAttributeCodes::class
+        );
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Swatches/_files/swatch_attribute.php
+     */
+    public function testGetCodes()
+    {
+        $attribute = $this->_objectManager
+            ->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
+            ->load('color_swatch', 'attribute_code');
+        $expected = [
+            $attribute->getAttributeId() => $attribute->getAttributeCode()
+        ];
+        $swatchAttributeCodes = $this->swatchAttributeCodes->getCodes();
+
+        $this->assertEquals($expected, $swatchAttributeCodes);
+    }
+}

dev/tests/integration/testsuite/Magento/Swatches/_files/swatch_attribute.php

@@ -0,0 +1,69 @@
+<?php
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$data = [
+    'is_required' => 1,
+    'is_visible_on_front' => 1,
+    'is_visible_in_advanced_search' => 0,
+    'attribute_code' => 'color_swatch',
+    'backend_type' => '',
+    'is_searchable' => 0,
+    'is_filterable' => 0,
+    'is_filterable_in_search' => 0,
+    'frontend_label' => 'Attribute ',
+    'entity_type_id' => 4
+];
+$optionsPerAttribute = 3;
+
+$data['frontend_input'] = 'swatch_visual';
+$data['swatch_input_type'] = 'visual';
+$data['swatchvisual']['value'] = array_reduce(
+    range(1, $optionsPerAttribute),
+    function ($values, $index) use ($optionsPerAttribute) {
+        $values['option_' . $index] = '#'
+            . str_repeat(
+                dechex(255 * $index / $optionsPerAttribute),
+                3
+            );
+        return $values;
+    },
+    []
+);
+$data['optionvisual']['value'] = array_reduce(
+    range(1, $optionsPerAttribute),
+    function ($values, $index) use ($optionsPerAttribute) {
+        $values['option_' . $index] = ['option ' . $index];
+        return $values;
+    },
+    []
+);
+
+$data['options']['option'] = array_reduce(
+    range(1, $optionsPerAttribute),
+    function ($values, $index) use ($optionsPerAttribute) {
+        $values[] = [
+            'label' => 'option ' . $index,
+            'value' => 'option_' . $index
+        ];
+        return $values;
+    },
+    []
+);
+
+$options = [];
+foreach ($data['options']['option'] as $optionData) {
+    $options[] = $objectManager->get(AttributeOptionInterface::class)
+        ->setLabel($optionData['label'])
+        ->setValue($optionData['value'])
+        ;
+}
+
+$attribute = $objectManager->create(
+    \Magento\Catalog\Api\Data\ProductAttributeInterface::class,
+    ['data' => $data])
+    ;
+$attribute->setOptions($options);
+$attribute->save();

dev/tests/integration/testsuite/Magento/Swatches/_files/swatch_attribute_rollback.php

@@ -0,0 +1,19 @@
+<?php
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+
+$attribute->loadByCode(4, 'color_swatch');
+
+if ($attribute->getId()) {
+    $attribute->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);