ACP2E-2843: Products on the frontend use store specific data when Single-Store Mode is enabled

- solution with test coverage

Author: arnobsh

app/code/Magento/Catalog/Model/ResourceModel/CatalogCategoryAndProductResolverOnSingleStoreMode.php

@@ -19,7 +19,10 @@
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Exception;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Store\Model\Store;
@@ -31,9 +34,11 @@ class CatalogCategoryAndProductResolverOnSingleStoreMode
 {
     /**
      * @param ResourceConnection $resourceConnection
+     * @param MetadataPool $metadataPool
      */
     public function __construct(
-        private readonly ResourceConnection $resourceConnection
+        private readonly ResourceConnection $resourceConnection,
+        private readonly MetadataPool $metadataPool
     ) {
     }
 
@@ -47,6 +52,8 @@ public function __construct(
      */
     private function process(int $storeId, string $table): void
     {
+        $productMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $productLinkField = $productMetadata->getLinkField();
         $catalogProductTable = $this->resourceConnection->getTableName($table);
 
         $catalogProducts = $this->getCatalogProducts($table, $storeId);
@@ -56,8 +63,8 @@ private function process(int $storeId, string $table): void
         try {
             if ($catalogProducts) {
                 foreach ($catalogProducts as $catalogProduct) {
-                    $rowIds[] = $catalogProduct['row_id'];
-                    $attributeIds[] = $catalogProduct['attribute_id'];
+                    $rowIds[] = $catalogProduct[$productLinkField];
+                    $attributeIds[] = $catalogProduct[AttributeInterface::ATTRIBUTE_ID];
                     $valueIds[] = $catalogProduct['value_id'];
                 }
                 $this->massDelete($catalogProductTable, $attributeIds, $rowIds);
@@ -107,12 +114,12 @@ public function migrateCatalogCategoryAndProductTables(int $storeId): void
     /**
      * Delete default store related products
      *
-     * @param $catalogProductTable
+     * @param string $catalogProductTable
      * @param array $attributeIds
      * @param array $rowIds
      * @return void
      */
-    private function massDelete($catalogProductTable, array $attributeIds, array $rowIds): void
+    private function massDelete(string $catalogProductTable, array $attributeIds, array $rowIds): void
     {
         $connection = $this->resourceConnection->getConnection();
 
@@ -129,11 +136,11 @@ private function massDelete($catalogProductTable, array $attributeIds, array $ro
     /**
      * Update default store related products
      *
-     * @param $catalogProductTable
+     * @param string $catalogProductTable
      * @param array $valueIds
      * @return void
      */
-    private function massUpdate($catalogProductTable, array $valueIds): void
+    private function massUpdate(string $catalogProductTable, array $valueIds): void
     {
         $connection = $this->resourceConnection->getConnection();
 

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/CatalogCategoryAndProductResolverOnSingleStoreModeTest.php

@@ -23,7 +23,8 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -39,17 +40,21 @@ class CatalogCategoryAndProductResolverOnSingleStoreModeTest extends TestCase
      */
     private $resourceConnectionMock;
 
+    /**
+     * @var MetadataPool|MockObject
+     */
+    private $metadataPoolMock;
+
     protected function setUp(): void
     {
-        $objectManager = new ObjectManager($this);
         $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
-
-        $this->model = $objectManager->getObject(
-            Resolver::class,
-            [
-                'resourceConnection' => $this->resourceConnectionMock
-            ]
-        );
+        $this->metadataPoolMock = $this->getMockBuilder(MetadataPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model = new Resolver(
+                $this->resourceConnectionMock,
+                $this->metadataPoolMock
+            );
     }
 
     /**
@@ -78,7 +83,7 @@ public function testCheckMigrateCatalogCategoryAndProductTablesWithoutException(
             ]
         ];
         $connection = $this->getConnection();
-        $connection->expects($this->any())->method('fetchCol')->willReturn($catalogProducts);
+        $connection->expects($this->any())->method('fetchAll')->willReturn($catalogProducts);
         $connection->expects($this->any())->method('delete')->willReturnSelf();
         $connection->expects($this->any())->method('update')->willReturnSelf();
         $connection->expects($this->any())->method('commit')->willReturnSelf();
@@ -94,7 +99,7 @@ public function testCheckMigrateCatalogCategoryAndProductTablesWithException():
         $exceptionMessage = 'Exception message';
         $connection = $this->getConnection();
         $connection->expects($this->any())
-            ->method('fetchCol')
+            ->method('fetchAll')
             ->willThrowException(new Exception($exceptionMessage));
         $connection->expects($this->any())->method('rollBack')->willReturnSelf();
         $this->model->migrateCatalogCategoryAndProductTables(1);
@@ -108,6 +113,14 @@ public function testCheckMigrateCatalogCategoryAndProductTablesWithException():
     private function getConnection(): MockObject
     {
         $connection = $this->getMockForAbstractClass(AdapterInterface::class);
+        $metadata = $this->getMockForAbstractClass(EntityMetadataInterface::class);
+        $this->metadataPoolMock->expects($this->any())
+            ->method('getMetadata')
+            ->willReturn($metadata);
+        $metadata
+            ->expects($this->any())
+            ->method('getLinkField')
+            ->willReturn('row_id');
         $this->resourceConnectionMock
             ->expects($this->any())
             ->method('getConnection')