MC-42811: Missing Bundled Products on Category Pages

Author: Oleksandr Iegorov

app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\Category;
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
 use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
 use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
 use Magento\Framework\App\DeploymentConfig;
@@ -17,7 +18,6 @@
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Search\Request\Dimension;
 use Magento\Framework\Indexer\CacheContext;
-use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
 
 /**
  * Indexer Handler for Elasticsearch engine.

app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php

@@ -7,18 +7,22 @@
 
 namespace Magento\Elasticsearch\Test\Unit\Model\Indexer;
 
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
 use Magento\AdvancedSearch\Model\Client\ClientInterface;
 use Magento\Elasticsearch\Model\Adapter\Elasticsearch;
 use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
 use Magento\Elasticsearch\Model\Indexer\IndexerHandler;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\SaveHandler\Batch;
 use Magento\Framework\Search\Request\Dimension;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Indexer\CacheContext;
 
 /**
  * Test for \Magento\Elasticsearch\Model\Indexer\IndexerHandler
@@ -71,6 +75,26 @@ class IndexerHandlerTest extends TestCase
      */
     private $scopeInterface;
 
+    /**
+     * @var Processor|MockObject
+     */
+    private $processor;
+
+    /**
+     * @var IndexerInterface|MockObject
+     */
+    private $indexer;
+
+    /**
+     * @var CacheContext|MockObject
+     */
+    private $cacheContext;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfig;
+
     /**
      * Set up test environment.
      *
@@ -117,26 +141,42 @@ protected function setUp(): void
             false
         );
 
+        $this->processor = $this->getMockBuilder(Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->indexer = $this->getMockBuilder(IndexerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->processor->expects($this->any())
+            ->method('getIndexer')
+            ->willReturn($this->indexer);
+
+        $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->cacheContext = $this->getMockBuilder(CacheContext::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->scopeInterface = $this->getMockForAbstractClass(
             ScopeInterface::class,
             [],
             '',
             false
         );
 
-        $objectManager = new ObjectManagerHelper($this);
-
-        $this->model = $objectManager->getObject(
-            IndexerHandler::class,
-            [
-                'indexStructure' => $this->indexStructure,
-                'adapter' => $this->adapter,
-                'indexNameResolver' => $this->indexNameResolver,
-                'batch' => $this->batch,
-                'data' => ['indexer_id' => 'catalogsearch_fulltext'],
-                500,
-                'scopeResolver' => $this->scopeResolver
-            ]
+        $this->model = new IndexerHandler(
+            $this->indexStructure,
+            $this->adapter,
+            $this->indexNameResolver,
+            $this->batch,
+            $this->scopeResolver,
+            ['indexer_id' => 'catalogsearch_fulltext'],
+            500,
+            $this->deploymentConfig,
+            $this->cacheContext,
+            $this->processor
         );
     }
 
@@ -182,7 +222,8 @@ public function testSaveIndex()
     {
         $dimensionValue = 3;
         $documentId = 123;
-        $documents = new \ArrayIterator([$documentId]);
+        $document = ['entity_id' => $documentId, 'category_ids' => [1, 2]];
+        $documents = new \ArrayIterator([$document]);
 
         $dimension = $this->getMockBuilder(Dimension::class)
             ->disableOriginalConstructor()
@@ -199,17 +240,23 @@ public function testSaveIndex()
         $this->adapter->expects($this->once())
             ->method('prepareDocsPerStore')
             ->with([], $dimensionValue)
-            ->willReturn([$documentId]);
+            ->willReturn([$document]);
         $this->adapter->expects($this->once())
             ->method('addDocs')
-            ->with([$documentId]);
+            ->with([$document]);
         $this->scopeResolver->expects($this->once())
             ->method('getScope')
             ->willReturn($this->scopeInterface);
         $this->scopeInterface->expects($this->once())
             ->method('getId')
             ->willReturn($dimensionValue);
 
+        $this->indexer->expects($this->once())
+            ->method('isScheduled')
+            ->willReturn(true);
+        $this->cacheContext->expects($this->once())
+            ->method('registerEntities');
+
         $result = $this->model->saveIndex([$dimension], $documents);
 
         $this->assertEquals($this->model, $result);