ACP2E-1992: Configurable on sale products not visible in products carousel

- addressed CR

Author: aplapana

app/code/Magento/ConfigurableProduct/Plugin/CatalogWidget/Block/Product/ProductsListPlugin.php

@@ -13,6 +13,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogWidget\Block\Product\ProductsList;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 
 class ProductsListPlugin
@@ -32,19 +33,27 @@ class ProductsListPlugin
      */
     protected ResourceConnection $resource;
 
+    /**
+     * @var MetadataPool
+     */
+    protected MetadataPool $metadataPool;
+
     /**
      * @param CollectionFactory $productCollectionFactory
      * @param Visibility $catalogProductVisibility
      * @param ResourceConnection $resource
+     * @param MetadataPool $metadataPool
      */
     public function __construct(
         CollectionFactory  $productCollectionFactory,
         Visibility         $catalogProductVisibility,
-        ResourceConnection $resource
+        ResourceConnection $resource,
+        MetadataPool $metadataPool
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->catalogProductVisibility = $catalogProductVisibility;
         $this->resource = $resource;
+        $this->metadataPool = $metadataPool;
     }
 
     /**
@@ -59,14 +68,16 @@ public function __construct(
     public function afterCreateCollection(ProductsList $subject, Collection $result): Collection
     {
         if ($result->count()) {
+            $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+                ->getLinkField();
             $connection = $this->resource->getConnection();
             $productIds = $connection->fetchCol(
                 $connection
                 ->select()
                 ->from(['e' => $this->resource->getTableName('catalog_product_entity')], ['link_table.parent_id'])
                 ->joinInner(
                     ['link_table' => $this->resource->getTableName('catalog_product_super_link')],
-                    'link_table.product_id = e.entity_id',
+                    'link_table.product_id = e.' . $linkField,
                     []
                 )
                 ->where('link_table.product_id IN (?)', $result->getAllIds())

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/CatalogWidget/Block/Product/ProductListPluginTest.php

@@ -14,6 +14,8 @@
 use Magento\ConfigurableProduct\Plugin\CatalogWidget\Block\Product\ProductsListPlugin;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Magento\Framework\DB\Select;
@@ -36,6 +38,11 @@ class ProductListPluginTest extends TestCase
      */
     protected ResourceConnection $resource;
 
+    /**
+     * @var MetadataPool
+     */
+    protected MetadataPool $metadataPool;
+
     /**
      * @var ProductsListPlugin
      */
@@ -46,11 +53,13 @@ protected function setUp(): void
         $this->productCollectionFactory = $this->createMock(CollectionFactory::class);
         $this->catalogProductVisibility = $this->createMock(Visibility::class);
         $this->resource = $this->createMock(ResourceConnection::class);
+        $this->metadataPool = $this->createMock(MetadataPool::class);
 
         $this->plugin = new ProductsListPlugin(
             $this->productCollectionFactory,
             $this->catalogProductVisibility,
-            $this->resource
+            $this->resource,
+            $this->metadataPool
         );
 
         parent::setUp();
@@ -80,6 +89,12 @@ public function testAfterCreateCollectionSuccess(): void
         $result->expects($this->once())->method('count')->willReturn(1);
         $result->expects($this->once())->method('getAllIds')->willReturn([1]);
         $result->expects($this->once())->method('addItem');
+        $entity = $this->createMock(EntityMetadataInterface::class);
+        $entity->expects($this->once())->method('getLinkField')->willReturn('row_id');
+        $this->metadataPool->expects($this->once())
+            ->method('getMetadata')
+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->willReturn($entity);
 
         $select = $this->createMock(Select::class);
         $select->expects($this->once())
@@ -90,7 +105,7 @@ public function testAfterCreateCollectionSuccess(): void
             ->method('joinInner')
             ->with(
                 ['link_table' => 'catalog_product_super_link'],
-                'link_table.product_id = e.entity_id',
+                'link_table.product_id = e.row_id',
                 []
             )->willReturn($select);
         $select->expects($this->once())->method('where')->with('link_table.product_id IN (?)', [1]);