ACP2E-4294: Restricted Category Products Still Counted in Wishlist After Customer Group Update

Author: aplapana

app/code/Magento/Wishlist/Block/Customer/Wishlist.php

@@ -3,17 +3,16 @@
  * Copyright 2013 Adobe
  * All Rights Reserved.
  */
+declare(strict_types=1);
 
 namespace Magento\Wishlist\Block\Customer;
 
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Helper\Product\ConfigurationPool;
 use Magento\Customer\Helper\Session\CurrentCustomer;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Helper\PostHelper;
+use Magento\Wishlist\Model\WishlistItemSellableCollectionProcessor;
 
 /**
  * Wishlist block customer items.
@@ -23,21 +22,6 @@
  */
 class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
 {
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private ProductRepositoryInterface $productRepository;
-
-    /**
-     * @var SalableResolver
-     */
-    private SalableResolver $salableResolver;
-
-    /**
-     * @var SearchCriteriaBuilder
-     */
-    private SearchCriteriaBuilder $searchCriteriaBuilder;
-
     /**
      * List of product options rendering configurations by product type
      *
@@ -66,15 +50,18 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
      */
     protected $postDataHelper;
 
+    /**
+     * @var WishlistItemSellableCollectionProcessor
+     */
+    private WishlistItemSellableCollectionProcessor $sellableCollectionProcessor;
+
     /**
      * @param Context $context
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param ConfigurationPool $helperPool
      * @param CurrentCustomer $currentCustomer
      * @param PostHelper $postDataHelper
-     * @param ProductRepositoryInterface|null $productRepository
-     * @param SalableResolver|null $salableResolver
-     * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param WishlistItemSellableCollectionProcessor|null $sellableCollectionProcessor
      * @param array $data
      */
     public function __construct(
@@ -83,9 +70,7 @@ public function __construct(
         \Magento\Catalog\Helper\Product\ConfigurationPool $helperPool,
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
-        ?ProductRepositoryInterface $productRepository = null,
-        ?SalableResolver $salableResolver = null,
-        ?SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        ?WishlistItemSellableCollectionProcessor $sellableCollectionProcessor = null,
         array $data = []
     ) {
         parent::__construct(
@@ -96,12 +81,8 @@ public function __construct(
         $this->_helperPool = $helperPool;
         $this->currentCustomer = $currentCustomer;
         $this->postDataHelper = $postDataHelper;
-        $this->productRepository = $productRepository ?? ObjectManager::getInstance()
-            ->get(ProductRepositoryInterface::class);
-        $this->salableResolver = $salableResolver ?? ObjectManager::getInstance()
-            ->get(SalableResolver::class);
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?? ObjectManager::getInstance()
-            ->get(SearchCriteriaBuilder::class);
+        $this->sellableCollectionProcessor = $sellableCollectionProcessor ??
+            ObjectManager::getInstance()->get(WishlistItemSellableCollectionProcessor::class);
     }
 
     /**
@@ -114,31 +95,7 @@ public function __construct(
     protected function _prepareCollection($collection)
     {
         $collection->setInStockFilter()->setOrder('added_at', 'ASC');
-        $items = $collection->getItems();
-        $productIds = array_map(static fn($item) => $item->getProductId(), $items);
-        $searchCriteria = $this->searchCriteriaBuilder
-            ->addFilter('entity_id', $productIds, 'in')
-            ->create();
-        $productCollection = $this->productRepository->getList($searchCriteria);
-        $products = array_combine(
-            array_map(fn($p) => $p->getId(), $productCollection->getItems()),
-            $productCollection->getItems()
-        );
-
-        $validItems = [];
-        $collection->removeAllItems();
-        foreach ($items as $item) {
-            if (!isset($products[$item->getProductId()]) ||
-                !$this->salableResolver->isSalable($products[$item->getProductId()])
-            ) {
-                continue;
-            }
-            $validItems[] = $item->getProductId();
-            $collection->addItem($item);
-        }
-        if (!empty($validItems)) {
-            $collection->addFieldToFilter('main_table.product_id', ['in' => $validItems]);
-        }
+        $this->sellableCollectionProcessor->execute($collection);
 
         return $this;
     }

app/code/Magento/Wishlist/Model/WishlistItemSellableCollectionProcessor.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection;
+
+class WishlistItemSellableCollectionProcessor
+{
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     * @param SalableResolver $salableResolver
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     */
+    public function __construct(
+        private readonly ProductRepositoryInterface $productRepository,
+        private readonly SalableResolver $salableResolver,
+        private readonly SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
+    }
+
+    /**
+     * @param Collection $collection
+     * @return Collection
+     * @throws \Exception
+     */
+    public function execute(Collection $collection): Collection
+    {
+        $items = $collection->getItems();
+        $productIds = array_map(static fn ($item) => $item->getProductId(), $items);
+        $searchCriteria = $this->searchCriteriaBuilder
+            ->addFilter('entity_id', $productIds, 'in')
+            ->create();
+        $productCollection = $this->productRepository->getList($searchCriteria);
+        $products = array_combine(
+            array_map(fn ($p) => $p->getId(), $productCollection->getItems()),
+            $productCollection->getItems()
+        );
+
+        $validItems = [];
+        $collection->removeAllItems();
+        foreach ($items as $item) {
+            if (!isset($products[$item->getProductId()]) ||
+                !$this->salableResolver->isSalable($products[$item->getProductId()])
+            ) {
+                continue;
+            }
+            $validItems[] = $item->getProductId();
+            $collection->addItem($item);
+        }
+        if (!empty($validItems)) {
+            $collection->addFieldToFilter('main_table.product_id', ['in' => $validItems]);
+        }
+
+        return $collection;
+    }
+}