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

- adjusted page-builder widget total count

Author: aplapana

app/code/Magento/PageBuilder/Model/Catalog/ProductTotals.php

@@ -66,8 +66,6 @@ class ProductTotals
      */
     private ResourceConnection $resource;
 
-    private ?Collection $parentsCollection = null;
-
     /**
      * @param CollectionFactory $productCollectionFactory
      * @param Builder $sqlBuilder
@@ -184,34 +182,32 @@ private function getProductCollection(string $conditions, bool $usePriceIndex =
      * Get parent products that don't have stand-alone properties (e.g. price or special price)
      *
      * @param Collection $collection
-     * @return Collection
+     * @return Collection|null
      * @throws \Exception
      */
-    private function getParentProductsCollection(Collection $collection): Collection
+    private function getParentProductsCollection(Collection $collection): ?Collection
     {
-        if (!$this->parentsCollection) {
-            $ids = $collection->getAllIds();
-            $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
-                ->getLinkField();
-            $connection = $this->resource->getConnection();
-            $productIds = $connection->fetchCol(
-                $connection
-                    ->select()
-                    ->from(['e' => $collection->getTable('catalog_product_entity')], ['link_table.parent_id'])
-                    ->joinInner(
-                        ['link_table' => $collection->getTable('catalog_product_super_link')],
-                        'link_table.product_id = e.' . $linkField,
-                        []
-                    )
-                    ->where('link_table.product_id IN (?)', $ids)
-            );
-
-            $parentProducts = $this->productCollectionFactory->create();
+        $parentProducts = $this->productCollectionFactory->create();
+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
+        $connection = $this->resource->getConnection();
+        $productIds = $connection->fetchCol(
+            $connection
+                ->select()
+                ->from(['e' => $collection->getTable('catalog_product_entity')], ['link_table.parent_id'])
+                ->joinInner(
+                    ['link_table' => $collection->getTable('catalog_product_super_link')],
+                    'link_table.product_id = e.' . $linkField,
+                    []
+                )
+                ->where('link_table.product_id IN (?)', $collection->getAllIds())
+        );
+        if ($productIds) {
             $parentProducts->addIdFilter($productIds);
-            $this->parentsCollection = $parentProducts;
+            return $parentProducts;
         }
 
-        return $this->parentsCollection;
+        return null;
     }
 
     /**
@@ -226,11 +222,13 @@ private function getEnabledCount(string $conditions): int
     {
         $collection = $this->getProductCollection($conditions, true);
         $collection->addAttributeToFilter('status', Status::STATUS_ENABLED);
+        $count = $collection->getSize();
+        if ($collection->getSize() && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
+            $count += $parentProducts->getSize();
+        }
 
-        $parentProducts = $this->getParentProductsCollection($collection);
-        $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
-
-        return $collection->getSize() + $parentProducts->getSize();
+        return $count;
     }
 
     /**
@@ -244,11 +242,13 @@ private function getDisabledCount(string $conditions): int
     {
         $collection = $this->getProductCollection($conditions, false);
         $collection->addAttributeToFilter('status', Status::STATUS_DISABLED);
+        $count = $collection->getSize();
+        if ($count && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_DISABLED);
+            $count += $parentProducts->getSize();
+        }
 
-        $parentProducts = $this->getParentProductsCollection($collection);
-        $parentProducts->addAttributeToFilter('status', Status::STATUS_DISABLED);
-
-        return $collection->getSize() + $parentProducts->getSize();
+        return $count;
     }
 
     /**
@@ -269,18 +269,20 @@ private function getNotVisibleCount(string $conditions): int
                 Visibility::VISIBILITY_IN_SEARCH
             ]
         );
+        $count = $collection->getSize();
+        if ($count && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
+            $parentProducts->addAttributeToFilter(
+                'visibility',
+                [
+                    Visibility::VISIBILITY_NOT_VISIBLE,
+                    Visibility::VISIBILITY_IN_SEARCH
+                ]
+            );
+            $count += $parentProducts->getSize();
+        }
 
-        $parentProducts = $this->getParentProductsCollection($collection);
-        $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
-        $parentProducts->addAttributeToFilter(
-            'visibility',
-            [
-                Visibility::VISIBILITY_NOT_VISIBLE,
-                Visibility::VISIBILITY_IN_SEARCH
-            ]
-        );
-
-        return $collection->getSize() + $parentProducts->getSize();
+        return $count;
     }
 
     /**

app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/ProductTotalsTest.php

@@ -101,18 +101,19 @@ public function testGetProductTotals(): void
         $collection = $this->createMock(Collection::class);
         $collection->expects($this->exactly(3))->method('distinct');
         $collection->expects($this->any())->method('addAttributeToFilter');
-        $collection->expects($this->once())->method('getAllIds');
+        $collection->expects($this->exactly(3))->method('getAllIds');
+        $collection->expects($this->any())->method('getSize')->willReturn(1);
         $select = $this->createMock(Select::class);
         $select->expects($this->any())->method('joinLeft')->willReturn($select);
 
         $collection->expects($this->exactly(3))->method('getSelect')->willReturn($select);
-        $this->productCollectionFactory->expects($this->exactly(4))
+        $this->productCollectionFactory->expects($this->any())
             ->method('create')
             ->willReturn($collection);
 
         $entityMeta = $this->createMock(EntityMetadataInterface::class);
-        $entityMeta->expects($this->once())->method('getLinkField')->willReturn('row_id');
-        $this->metadataPool->expects($this->exactly(1))
+        $entityMeta->expects($this->exactly(3))->method('getLinkField')->willReturn('row_id');
+        $this->metadataPool->expects($this->exactly(3))
             ->method('getMetadata')
             ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
             ->willReturn($entityMeta);
@@ -121,9 +122,9 @@ public function testGetProductTotals(): void
         $parentSelect->expects($this->any())->method('from')->willReturn($parentSelect);
         $parentSelect->expects($this->any())->method('joinInner')->willReturn($parentSelect);
         $db = $this->createMock(AdapterInterface::class);
-        $db->expects($this->once())->method('select')->willReturn($parentSelect);
-        $db->expects($this->once())->method('fetchCol')->willReturn([1]);
-        $this->resource->expects($this->once())->method('getConnection')->willReturn($db);
+        $db->expects($this->exactly(3))->method('select')->willReturn($parentSelect);
+        $db->expects($this->exactly(3))->method('fetchCol')->willReturn([1]);
+        $this->resource->expects($this->exactly(3))->method('getConnection')->willReturn($db);
 
         $this->conditionsHelper->expects($this->exactly(3))->method('decode')->willReturn([]);
         $this->rule->expects($this->exactly(3))->method('loadPost');