MC-42811: Missing Bundled Products on Category Pages

Author: Oleksandr Iegorov

app/code/Magento/Bundle/Model/Plugin/Frontend/ProductIdentitiesExtender.php

@@ -63,7 +63,7 @@ public function afterGetIdentities(CatalogProduct $product, array $identities):
     private function getChildrenIds($entityId): array
     {
         if (!isset($this->cacheChildrenIds[$entityId])) {
-            $this->cacheChildrenIds[$entityId] = $this->type->getChildrenIds($entityId);
+            $this->cacheChildrenIds[$entityId] = $this->type->getChildrenIds($entityId, false);
         }
 
         return $this->cacheChildrenIds[$entityId];

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Elasticsearch\Model\Indexer;
 
+use Magento\Catalog\Model\Category;
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
 use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
 use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
@@ -15,6 +16,7 @@
 use Magento\Framework\Indexer\SaveHandler\Batch;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\Indexer\CacheContext;
 
 /**
  * Indexer Handler for Elasticsearch engine.
@@ -73,6 +75,11 @@ class IndexerHandler implements IndexerInterface
      */
     private const DEPLOYMENT_CONFIG_INDEXER_BATCHES = 'indexer/batch_size/';
 
+    /**
+     * @var CacheContext
+     */
+    private $cacheContext;
+
     /**
      * IndexerHandler constructor.
      * @param IndexStructureInterface $indexStructure
@@ -83,6 +90,7 @@ class IndexerHandler implements IndexerInterface
      * @param array $data
      * @param int $batchSize
      * @param DeploymentConfig|null $deploymentConfig
+     * @param CacheContext|null $cacheContext
      */
     public function __construct(
         IndexStructureInterface $indexStructure,
@@ -91,8 +99,9 @@ public function __construct(
         Batch $batch,
         ScopeResolverInterface $scopeResolver,
         array $data = [],
-        $batchSize = self::DEFAULT_BATCH_SIZE,
-        ?DeploymentConfig $deploymentConfig = null
+        int $batchSize = self::DEFAULT_BATCH_SIZE,
+        ?DeploymentConfig $deploymentConfig = null,
+        ?CacheContext $cacheContext = null
     ) {
         $this->indexStructure = $indexStructure;
         $this->adapter = $adapter;
@@ -102,6 +111,7 @@ public function __construct(
         $this->batchSize = $batchSize;
         $this->scopeResolver = $scopeResolver;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
+        $this->cacheContext = $cacheContext ?: ObjectManager::getInstance()->get(CacheContext::class);
     }
 
     /**
@@ -119,11 +129,30 @@ public function saveIndex($dimensions, \Traversable $documents)
         foreach ($this->batch->getItems($documents, $this->batchSize) as $documentsBatch) {
             $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $scopeId);
             $this->adapter->addDocs($docs, $scopeId, $this->getIndexerId());
+            $this->updateCacheContext($docs);
         }
         $this->adapter->updateAlias($scopeId, $this->getIndexerId());
         return $this;
     }
 
+    /**
+     * Add category cache tags for the affected products to the cache context
+     *
+     * @param array $docs
+     * @return void
+     */
+    private function updateCacheContext(array $docs) : void
+    {
+        $categoryIds = [];
+        foreach ($docs as $document) {
+            array_push($categoryIds, ...$document['category_ids']);
+        }
+        if (!empty($categoryIds)) {
+            $categoryIds = array_unique($categoryIds);
+            $this->cacheContext->registerEntities(Category::CACHE_TAG, $categoryIds);
+        }
+    }
+
     /**
      * @inheritdoc
      */