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

Author: aplapana

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

@@ -52,7 +52,7 @@ abstract class AbstractBlock extends \Magento\Catalog\Block\Product\AbstractProd
     /**
      * @var WishlistItemPermissionsCollectionProcessor
      */
-    private WishlistItemPermissionsCollectionProcessor $permissionCollectionProcessor;
+    private $permissionCollectionProcessor;
 
     /**
      * @param Context $context

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

@@ -13,6 +13,11 @@
 
 class WishlistItemPermissionsCollectionProcessor
 {
+    /**
+     * @var array
+     */
+    private array $validProductIds = [];
+
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
@@ -33,27 +38,38 @@ public function __construct(
     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()]) || $products[$item->getProductId()]->getIsHidden()) {
-                continue;
+        if (empty($items)) {
+            return $collection;
+        }
+        $productIds = $collection->getColumnValues('product_id');
+        $cacheKey = sha1(implode("-", $productIds));
+        if (!isset($this->validProductIds[$cacheKey])) {
+            $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 = [];
+            foreach ($items as $item) {
+                if (!isset($products[$item->getProductId()]) || $products[$item->getProductId()]->getIsHidden()) {
+                    continue;
+                }
+                $validItems[] = (int)$item->getProductId();
             }
-            $validItems[] = $item->getProductId();
-            $collection->addItem($item);
+            $this->validProductIds[$cacheKey] = $validItems;
         }
-        if (!empty($validItems)) {
-            $collection->addFieldToFilter('main_table.product_id', ['in' => $validItems]);
+
+        if (!empty($this->validProductIds[$cacheKey])) {
+            $collection->addFilter(
+                'main_table.product_id',
+                'main_table.product_id IN(' . implode(",", $this->validProductIds[$cacheKey]) . ')',
+                'string'
+            );
+            $collection->clear();
         }
 
         return $collection;

app/code/Magento/Wishlist/Test/Unit/Block/Customer/Wishlist/Item/OptionsTest.php

@@ -20,8 +20,8 @@
 
 class OptionsTest extends TestCase
 {
-    const TEST_PRODUCT_TYPE = 'testProductType';
-    const TEST_HELPER_CLASS_NAME = 'testHelperClass';
+    public const TEST_PRODUCT_TYPE = 'testProductType';
+    public const TEST_HELPER_CLASS_NAME = 'testHelperClass';
 
     /**
      * @var Escaper|MockObject

app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php

@@ -388,7 +388,8 @@ private function prepareWishlistItem(): MockObject
         return $newItem;
     }
 
-    protected function getMockForDataObject() {
+    protected function getMockForDataObject()
+    {
         $dataObjectMock = $this->createMock(DataObject::class);
         $dataObjectMock->expects($this->once())
             ->method('setData')