MC-36830: [Issue] Fix for empty category field values in REST calls

Author: tsviklinskyi

app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php

@@ -55,7 +55,10 @@ public function afterGetTableName(
         string $result,
         $modelEntity
     ) {
-        if (!is_array($modelEntity) && $modelEntity === AbstractAction::MAIN_INDEX_TABLE) {
+        if (!is_array($modelEntity) &&
+            $modelEntity === AbstractAction::MAIN_INDEX_TABLE &&
+            $this->storeManager->getStore()->getId()
+        ) {
             $catalogCategoryProductDimension = new Dimension(
                 \Magento\Store\Model\Store::ENTITY,
                 $this->storeManager->getStore()->getId()

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/TableResolverTest.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Indexer\Category\Product\Plugin;
+
+use Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
+
+class TableResolverTest extends TestCase
+{
+    /**
+     * Tests replacing catalog_category_product_index table name
+     *
+     * @param int $storeId
+     * @param string $tableName
+     * @param string $expected
+     * @dataProvider afterGetTableNameDataProvider
+     */
+    public function testAfterGetTableName(int $storeId, string $tableName, string $expected): void
+    {
+        $storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
+
+        $storeMock = $this->getMockBuilder(Store::class)
+            ->onlyMethods(['getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storeMock->method('getId')
+            ->willReturn($storeId);
+
+        $storeManagerMock->method('getStore')->willReturn($storeMock);
+
+        $tableResolverMock = $this->getMockBuilder(IndexScopeResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $tableResolverMock->method('resolve')->willReturn('catalog_category_product_index_store1');
+
+        $subjectMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $model = new TableResolver($storeManagerMock, $tableResolverMock);
+
+        $this->assertEquals(
+            $expected,
+            $model->afterGetTableName($subjectMock, $tableName, 'catalog_category_product_index')
+        );
+    }
+
+    /**
+     * Data provider for testAfterGetTableName
+     *
+     * @return array
+     */
+    public function afterGetTableNameDataProvider(): array
+    {
+        return [
+            [
+                'storeId' => 1,
+                'tableName' => 'catalog_category_product_index',
+                'expected' => 'catalog_category_product_index_store1'
+            ],
+            [
+                'storeId' => 0,
+                'tableName' => 'catalog_category_product_index',
+                'expected' => 'catalog_category_product_index'
+            ],
+        ];
+    }
+}

app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php

@@ -417,6 +417,48 @@ public function testGetCategoryProductIndexData()
         );
     }
 
+    /**
+     * Test getCategoryProductIndexData method for all stores
+     */
+    public function testGetCategoryProductIndexDataForAllStores()
+    {
+        $connection = $this->connection;
+        $select = $this->select;
+
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+
+        $select->expects($this->any())
+            ->method('from')
+            ->with(
+                ['catalog_category_product_index'],
+                ['category_id', 'product_id', 'position', 'store_id']
+            )->willReturnSelf();
+
+        $select->expects($this->any())
+            ->method('where')
+            ->willReturnSelf();
+
+        $connection->expects($this->once())
+            ->method('fetchAll')
+            ->with($select)
+            ->willReturn([[
+                'product_id' => 1,
+                'category_id' => 1,
+                'position' => 1,
+            ]]);
+
+        $this->assertEquals(
+            [
+                1 => [
+                    1 => 1,
+                ],
+            ],
+            $this->model->getCategoryProductIndexData(0, [1])
+        );
+    }
+
     /**
      * Test getMovedCategoryProductIds method
      */

lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php

@@ -44,6 +44,9 @@ public function resolve($index, array $dimensions)
     {
         $tableNameParts = [];
         foreach ($dimensions as $dimension) {
+            if (!$dimension->getValue()) {
+                continue;
+            }
             switch ($dimension->getName()) {
                 case 'scope':
                     $tableNameParts[$dimension->getName()] = $dimension->getName() . $this->getScopeId($dimension);