MAGETWO-65245: parent_id of deleted configurable product variation does not get sent to ElasticSearch

Author: nmalevanec

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php

@@ -5,20 +5,16 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer;
 
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\FullFactory;
 use Magento\CatalogSearch\Model\Indexer\Scope\State;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Search\Request\Config as SearchRequestConfig;
 use Magento\Framework\Search\Request\DimensionFactory;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Provide functionality for Fulltext Search indexing.
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
@@ -72,13 +68,6 @@ class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\F
      */
     private $indexScopeState;
 
-    /**
-     * Holder for MetadataPool instance.
-     *
-     * @var MetadataPool
-     */
-    private $metadataPool = null;
-
     /**
      * @param FullFactory $fullActionFactory
      * @param IndexerHandlerFactory $indexerHandlerFactory
@@ -133,37 +122,12 @@ public function execute($ids)
         ]);
         foreach ($storeIds as $storeId) {
             $dimension = $this->dimensionFactory->create(['name' => 'scope', 'value' => $storeId]);
-            $productIds = array_unique(array_merge($ids, $this->getRelationsByChild($ids)));
+            $productIds = array_unique(array_merge($ids, $this->fulltextResource->getRelationsByChild($ids)));
             $saveHandler->deleteIndex([$dimension], new \ArrayObject($productIds));
             $saveHandler->saveIndex([$dimension], $this->fullAction->rebuildStoreIndex($storeId, $ids));
         }
     }
 
-    /**
-     * Retrieve product relations by children.
-     *
-     * @param int|array $childIds
-     * @return array
-     */
-    private function getRelationsByChild($childIds)
-    {
-        $connection = $this->fulltextResource->getConnection();
-        $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
-        $select = $connection->select()->from(
-            ['relation' => $this->fulltextResource->getTable('catalog_product_relation')],
-            []
-        )->join(
-            ['cpe' => $this->fulltextResource->getTable('catalog_product_entity')],
-            'cpe.' . $linkField . ' = relation.parent_id',
-            ['cpe.entity_id']
-        )->where(
-            'relation.child_id IN (?)',
-            $childIds
-        )->distinct(true);
-
-        return $connection->fetchCol($select);
-    }
-
     /**
      * Execute full indexation
      *
@@ -211,18 +175,4 @@ public function executeRow($id)
     {
         $this->execute([$id]);
     }
-
-    /**
-     * Get Metadata Pool instance.
-     *
-     * @return MetadataPool
-     */
-    private function getMetadataPool()
-    {
-        if ($this->metadataPool === null) {
-            $this->metadataPool = ObjectManager::getInstance()->get(MetadataPool::class);
-        }
-
-        return $this->metadataPool;
-    }
 }

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php

@@ -5,6 +5,10 @@
  */
 namespace Magento\CatalogSearch\Model\ResourceModel;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
+
 /**
  * CatalogSearch Fulltext Index resource model
  */
@@ -17,17 +21,27 @@ class Fulltext extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $_eventManager;
 
+    /**
+     * Holder for MetadataPool instance.
+     *
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param string $connectionName
+     * @param MetadataPool $metadataPool
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        $connectionName = null
+        $connectionName = null,
+        MetadataPool $metadataPool = null
     ) {
         $this->_eventManager = $eventManager;
+        $this->metadataPool = $metadataPool ? : ObjectManager::getInstance()->get(MetadataPool::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -53,4 +67,29 @@ public function resetSearchResults()
         $this->_eventManager->dispatch('catalogsearch_reset_search_result');
         return $this;
     }
+
+    /**
+     * Retrieve product relations by children.
+     *
+     * @param int|array $childIds
+     * @return array
+     */
+    public function getRelationsByChild($childIds)
+    {
+        $connection = $this->getConnection();
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $select = $connection->select()->from(
+            ['relation' => $this->getTable('catalog_product_relation')],
+            []
+        )->join(
+            ['cpe' => $this->getTable('catalog_product_entity')],
+            'cpe.' . $linkField . ' = relation.parent_id',
+            ['cpe.entity_id']
+        )->where(
+            'relation.child_id IN (?)',
+            $childIds
+        )->distinct(true);
+
+        return $connection->fetchCol($select);
+    }
 }