Merge branch 'MAGETWO-71662-2' into 2.2-develop-PR-2

Author: dhorytskyi

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php

@@ -82,6 +82,7 @@ public function reindexEntities($processIds)
         $this->_prepareIndex($processIds);
         $this->_prepareRelationIndex($processIds);
         $this->_removeNotVisibleEntityFromIndex();
+
         return $this;
     }
 
@@ -164,6 +165,7 @@ protected function _prepareRelationIndexSelect($parentIds = null)
         $connection = $this->getConnection();
         $idxTable = $this->getIdxTable();
         $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+
         $select = $connection->select()->from(
             ['l' => $this->getTable('catalog_product_relation')],
             []
@@ -179,6 +181,16 @@ protected function _prepareRelationIndexSelect($parentIds = null)
             ['i' => $idxTable],
             'l.child_id = i.entity_id AND cs.store_id = i.store_id',
             []
+        )->join(
+            ['sw' => $this->getTable('store_website')],
+            "cs.website_id = sw.website_id",
+            []
+        )->joinLeft(
+            ['cpw' => $this->getTable('catalog_product_website')],
+            "i.entity_id = cpw.product_id AND sw.website_id = cpw.website_id",
+            []
+        )->where(
+            'cpw.product_id IS NOT NULL'
         )->group(
             ['parent_id', 'i.attribute_id', 'i.store_id', 'i.value', 'l.child_id']
         )->columns(

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/AbstractActionTest.php

@@ -113,11 +113,20 @@ public function testReindexWithoutArgumentsExecutesReindexAll()
         $this->_model->reindex();
     }
 
-    public function testReindexWithNotNullArgumentExecutesReindexEntities()
-    {
-        $childIds = [1, 2, 3];
-        $parentIds = [4];
-        $reindexIds = array_merge($childIds, $parentIds);
+    /**
+     * @param array $ids
+     * @param array $parentIds
+     * @param array $childIds
+     * @throws \Exception
+     * @dataProvider reindexEntitiesDataProvider
+     */
+    public function testReindexWithNotNullArgumentExecutesReindexEntities(
+        array $ids,
+        array $parentIds,
+        array $childIds
+    ) {
+        $reindexIds = array_unique(array_merge($ids, $parentIds, $childIds));
+
         $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
             ->getMockForAbstractClass();
 
@@ -129,12 +138,23 @@ public function testReindexWithNotNullArgumentExecutesReindexEntities()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $eavSource->expects($this->once())->method('getRelationsByChild')->with($childIds)->willReturn($parentIds);
-        $eavSource->expects($this->once())->method('getRelationsByParent')
-            ->with(array_unique(array_merge($parentIds, $childIds)))->willReturn($parentIds);
+        $eavSource->expects($this->once())
+            ->method('getRelationsByChild')
+            ->with($ids)
+            ->willReturn($parentIds);
+        $eavSource->expects($this->once())
+            ->method('getRelationsByParent')
+            ->with(array_unique(array_merge($parentIds, $ids)))
+            ->willReturn($childIds);
 
-        $eavDecimal->expects($this->once())->method('getRelationsByChild')->with($reindexIds)->willReturn($reindexIds);
-        $eavDecimal->expects($this->once())->method('getRelationsByParent')->with($reindexIds)->willReturn([]);
+        $eavDecimal->expects($this->once())
+            ->method('getRelationsByChild')
+            ->with($reindexIds)
+            ->willReturn($parentIds);
+        $eavDecimal->expects($this->once())
+            ->method('getRelationsByParent')
+            ->with(array_unique(array_merge($parentIds, $reindexIds)))
+            ->willReturn($childIds);
 
         $eavSource->expects($this->once())->method('getConnection')->willReturn($connectionMock);
         $eavDecimal->expects($this->once())->method('getConnection')->willReturn($connectionMock);
@@ -154,6 +174,15 @@ public function testReindexWithNotNullArgumentExecutesReindexEntities()
             ->method('create')
             ->will($this->returnValue($eavDecimal));
 
-        $this->_model->reindex($childIds);
+        $this->_model->reindex($ids);
+    }
+
+    public function reindexEntitiesDataProvider()
+    {
+        return [
+            [[4], [], [1, 2, 3]],
+            [[3], [4], []],
+            [[5], [], []]
+        ];
     }
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php

@@ -96,6 +96,19 @@ public function testReindexEntitiesForConfigurableProduct()
 
         $result = $connection->fetchAll($select);
         $this->assertCount(0, $result);
+
+        /** @var \Magento\Catalog\Model\Product $product1 **/
+        $product1 = $productRepository->getById(10);
+        $product1->setStatus(Status::STATUS_ENABLED)->setWebsiteIds([]);
+        $productRepository->save($product1);
+
+        /** @var \Magento\Catalog\Model\Product $product2 **/
+        $product2 = $productRepository->getById(20);
+        $product2->setStatus(Status::STATUS_ENABLED);
+        $productRepository->save($product2);
+
+        $result = $connection->fetchAll($select);
+        $this->assertCount(1, $result);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php

@@ -525,7 +525,6 @@ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
      */
     public function testAdvancedSearchCompositeProductWithOutOfStockOption()
     {
-        $this->markTestSkipped('MAGETWO-71445: configurable product created incorrectly - children not linked').
         /** @var Attribute $attribute */
         $attribute = $this->objectManager->get(Attribute::class)
             ->loadByCode(Product::ENTITY, 'test_configurable');