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

Author: aplapana

app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php

@@ -17,6 +17,7 @@
 use Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory as WishlistItemCollectionFactory;
 use Magento\Wishlist\Model\Item;
 use Magento\Wishlist\Model\Wishlist;
+use Magento\Wishlist\Model\WishlistItemSellableCollectionProcessor;
 
 /**
  * Fetches the Wishlist Items data according to the GraphQL schema
@@ -26,23 +27,31 @@ class WishlistItemsResolver implements ResolverInterface
     /**
      * @var WishlistItemCollectionFactory
      */
-    private $wishlistItemCollectionFactory;
+    private WishlistItemCollectionFactory $wishlistItemCollectionFactory;
 
     /**
      * @var StoreManagerInterface
      */
-    private $storeManager;
+    private StoreManagerInterface $storeManager;
+
+    /**
+     * @var WishlistItemSellableCollectionProcessor
+     */
+    private WishlistItemSellableCollectionProcessor $sellableCollectionProcessor;
 
     /**
      * @param WishlistItemCollectionFactory $wishlistItemCollectionFactory
      * @param StoreManagerInterface $storeManager
+     * @param WishlistItemSellableCollectionProcessor $sellableCollectionProcessor
      */
     public function __construct(
         WishlistItemCollectionFactory $wishlistItemCollectionFactory,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        WishlistItemSellableCollectionProcessor $sellableCollectionProcessor
     ) {
         $this->wishlistItemCollectionFactory = $wishlistItemCollectionFactory;
         $this->storeManager = $storeManager;
+        $this->sellableCollectionProcessor = $sellableCollectionProcessor;
     }
 
     /**
@@ -92,6 +101,7 @@ private function getWishListItems(Wishlist $wishlist): array
                 return $store->getId();
             }, $this->storeManager->getStores()))
             ->setVisibilityFilter();
+        $this->sellableCollectionProcessor->execute($wishlistItemCollection);
         return $wishlistItemCollection->getItems();
     }
 }

app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php

@@ -16,6 +16,7 @@
 use Magento\Wishlist\Model\Wishlist\Config as WishlistConfig;
 use Magento\Wishlist\Model\WishlistFactory;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Wishlist\Model\WishlistItemSellableCollectionProcessor;
 
 /**
  * Fetches the Wishlist data according to the GraphQL schema
@@ -37,19 +38,27 @@ class WishlistResolver implements ResolverInterface
      */
     private $wishlistConfig;
 
+    /**
+     * @var WishlistItemSellableCollectionProcessor
+     */
+    private WishlistItemSellableCollectionProcessor $sellableCollectionProcessor;
+
     /**
      * @param WishlistResourceModel $wishlistResource
      * @param WishlistFactory $wishlistFactory
      * @param WishlistConfig $wishlistConfig
+     * @param WishlistItemSellableCollectionProcessor $sellableCollectionProcessor
      */
     public function __construct(
         WishlistResourceModel $wishlistResource,
         WishlistFactory $wishlistFactory,
-        WishlistConfig $wishlistConfig
+        WishlistConfig $wishlistConfig,
+        WishlistItemSellableCollectionProcessor $sellableCollectionProcessor
     ) {
         $this->wishlistResource = $wishlistResource;
         $this->wishlistFactory = $wishlistFactory;
         $this->wishlistConfig = $wishlistConfig;
+        $this->sellableCollectionProcessor = $sellableCollectionProcessor;
     }
 
     /**
@@ -79,6 +88,7 @@ public function resolve(
         if (null === $wishlist->getId()) {
             return [];
         }
+        $this->sellableCollectionProcessor->execute($wishlist->getItemCollection());
 
         return [
             'sharing_code' => $wishlist->getSharingCode(),

app/code/Magento/WishlistGraphQl/etc/graphql/events.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * ADOBE CONFIDENTIAL
+ *
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="catalog_product_collection_load_after">
+        <observer name="magento_catalogpermissions" instance="Magento\CatalogPermissions\Observer\ApplyProductPermissionOnCollectionAfterLoadObserver"/>
+    </event>
+</config>