MAGETWO-58401: Cannot create configurable product with child by REST API - for 2.1.x

 - retrieve attributes into collection
 - update test

Author: cspruiell

app/code/Magento/ConfigurableProduct/Model/LinkManagement.php

@@ -117,15 +117,15 @@ public function addChild($sku, $childSku)
             throw new StateException(__('Parent product does not have configurable product options'));
         }
 
-        $configurableOptionData = [];
+        $attributeIds = [];
         foreach ($configurableProductOptions as $configurableProductOption) {
             $attributeCode = $configurableProductOption->getProductAttribute()->getAttributeCode();
             if (!$child->getData($attributeCode)) {
                 throw new StateException(__('Child product does not have attribute value %1', $attributeCode));
             }
-            $configurableOptionData = array_merge($configurableOptionData,
-                $this->getConfigurableAttributesData($configurableProductOption->getAttributeId()));
+            $attributeIds[] = $configurableProductOption->getAttributeId();
         }
+        $configurableOptionData = $this->getConfigurableAttributesData($attributeIds);
 
         /** @var Factory $optionFactory */
         $optionFactory = $this->getOptionsFactory();
@@ -201,33 +201,35 @@ private function getAttributeFactory()
     /**
      * Get Configurable Attribute Data
      *
-     * @param int $attributeId
+     * @param int[] $attributeIds
      * @return array
      */
-    private function getConfigurableAttributesData($attributeId)
+    private function getConfigurableAttributesData($attributeIds)
     {
         $attributeValues = [];
-        $attribute = $this->getAttributeFactory()->create();
-        $attribute->load($attributeId);
-        foreach ($attribute->getOptions() as $option) {
-            if ($option->getValue()) {
-                $attributeValues[] = [
-                    'label' => $option->getLabel(),
+        $attributes = $this->getAttributeFactory()->create()
+            ->getCollection()
+            ->addFieldToFilter('attribute_id', $attributeIds)
+            ->getItems();
+        foreach ($attributes as $attribute) {
+            foreach ($attribute->getOptions() as $option) {
+                if ($option->getValue()) {
+                    $attributeValues[] = [
+                        'label' => $option->getLabel(),
+                        'attribute_id' => $attribute->getId(),
+                        'value_index' => $option->getValue(),
+                    ];
+                }
+            }
+            $configurableAttributesData[] =
+                [
                     'attribute_id' => $attribute->getId(),
-                    'value_index' => $option->getValue(),
+                    'code' => $attribute->getAttributeCode(),
+                    'label' => $attribute->getStoreLabel(),
+                    'values' => $attributeValues,
                 ];
-            }
         }
 
-        $configurableAttributesData = [
-            [
-                'attribute_id' => $attribute->getId(),
-                'code' => $attribute->getAttributeCode(),
-                'label' => $attribute->getStoreLabel(),
-                'values' => $attributeValues,
-            ],
-        ];
-
         return $configurableAttributesData;
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php

@@ -183,13 +183,20 @@ public function testAddChild()
 
         $attributeMock = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute')
             ->disableOriginalConstructor()
-            ->setMethods(['load', 'getOptions', 'getId', 'getAttributeCode', 'getStoreLabel'])
+            ->setMethods(['getCollection', 'getOptions', 'getId', 'getAttributeCode', 'getStoreLabel'])
             ->getMock();
         $attributeOptionMock = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\Option')
             ->disableOriginalConstructor()
             ->setMethods(['getValue', 'getLabel'])
             ->getMock();
 
+        $attributeCollectionMock = $this->getMockBuilder(
+            'Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection'
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(['addFieldToFilter', 'getItems'])
+            ->getMock();
+
         $this->productRepository->expects($this->at(0))->method('get')->with($productSku)->willReturn($configurable);
         $this->productRepository->expects($this->at(1))->method('get')->with($childSku)->willReturn($simple);
 
@@ -212,7 +219,10 @@ public function testAddChild()
 
         $optionsFactoryMock->expects($this->any())->method('create')->willReturn([$optionMock]);
         $attributeFactoryMock->expects($this->any())->method('create')->willReturn($attributeMock);
-        $attributeMock->expects($this->any())->method('load');
+        $attributeMock->expects($this->any())->method('getCollection')->willReturn($attributeCollectionMock);
+        $attributeCollectionMock->expects($this->any())->method('addFieldToFilter')->willReturnSelf();
+        $attributeCollectionMock->expects($this->any())->method('getItems')->willReturn([$attributeMock]);
+
         $attributeMock->expects($this->any())->method('getOptions')->willReturn([$attributeOptionMock]);
 
         $extensionAttributesMock->expects($this->any())->method('setConfigurableProductOptions');