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

Author: aplapana

app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php

@@ -319,7 +319,7 @@ protected function _assignOptions()
      * @return $this
      */
     protected function _assignProducts()
-    {
+    {//here
         \Magento\Framework\Profiler::start(
             'WISHLIST:' . __METHOD__,
             ['group' => 'WISHLIST', 'method' => __METHOD__]
@@ -351,7 +351,7 @@ protected function _assignProducts()
         /** @var \Magento\Wishlist\Model\Item $item */
         foreach ($this as $item) {
             $product = $productCollection->getItemById($item->getProductId());
-            if ($product) {
+            if ($product && !$product->getIsHidden()) {
                 if ($checkInStock && !$product->isInStock()) {
                     $this->removeItemByKey($item->getId());
                 } else {

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

@@ -388,7 +388,6 @@ public function getItemCollection()
             )->addStoreFilter(
                 $this->getSharedStoreIds()
             )->setVisibilityFilter($this->_useCurrentWebsite);
-            $this->_itemCollection = $this->permissionCollectionProcessor->execute($this->_itemCollection);
         }
 
         return $this->_itemCollection;

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

@@ -13,15 +13,16 @@
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\Escaper;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Wishlist\Block\Customer\Wishlist\Item\Options;
 use Magento\Wishlist\Model\Item;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class OptionsTest extends TestCase
 {
-    public const TEST_PRODUCT_TYPE = 'testProductType';
-    public const TEST_HELPER_CLASS_NAME = 'testHelperClass';
+    const TEST_PRODUCT_TYPE = 'testProductType';
+    const TEST_HELPER_CLASS_NAME = 'testHelperClass';
 
     /**
      * @var Escaper|MockObject
@@ -76,7 +77,15 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->block = new Options($productContextMock, $this->httpContextMock, $this->helperPoolMock);
+        $objectManager = new ObjectManager($this);
+        $this->block = $objectManager->getObject(
+            Options::class,
+            [
+                'context' => $productContextMock,
+                'httpContext' => $this->httpContextMock,
+                'helperPool' => $this->helperPoolMock,
+            ]
+        );
         $this->block->setItem($this->itemMock);
         $this->block->addOptionsRenderCfg(self::TEST_PRODUCT_TYPE, self::TEST_HELPER_CLASS_NAME);
     }

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

@@ -26,7 +26,6 @@
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Stdlib\DateTime;
-use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Wishlist\Helper\Data;
 use Magento\Wishlist\Model\Item;
@@ -36,7 +35,6 @@
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
 use Magento\Wishlist\Model\ResourceModel\Wishlist\Collection as WishlistCollection;
 use Magento\Wishlist\Model\Wishlist;
-use Magento\Wishlist\Model\WishlistItemPermissionsCollectionProcessor;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -140,11 +138,6 @@ class WishlistTest extends TestCase
      */
     private $stockConfiguration;
 
-    /**
-     * @var WishlistItemPermissionsCollectionProcessor|MockObject
-     */
-    private WishlistItemPermissionsCollectionProcessor $permissionCollectionProcessor;
-
     protected function setUp(): void
     {
         $context = $this->getMockBuilder(Context::class)
@@ -207,7 +200,6 @@ protected function setUp(): void
             ->willReturn($this->eventDispatcher);
 
         $this->stockConfiguration = $this->createMock(StockConfigurationInterface::class);
-        $this->permissionCollectionProcessor = $this->createMock(WishlistItemPermissionsCollectionProcessor::class);
 
         $this->wishlist = new Wishlist(
             $context,
@@ -229,36 +221,11 @@ protected function setUp(): void
             $this->serializer,
             $this->stockRegistry,
             $this->scopeConfig,
-            $this->stockConfiguration,
-            $this->permissionCollectionProcessor
+            $this->stockConfiguration
         );
     }
 
-    /**
-     * @return void
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \PHPUnit\Framework\MockObject\Exception
-     */
-    public function testGetItemCollection(): void
-    {
-        $wishlistItemCollection = $this->createMock(Collection::class);
-        $wishlistItemCollection->expects($this->once())->method('addWishlistFilter')->willReturnSelf();
-        $wishlistItemCollection->expects($this->once())->method('addStoreFilter')->willReturnSelf();
-        $wishlistItemCollection->expects($this->once())->method('setVisibilityFilter')->willReturnSelf();
-        $this->permissionCollectionProcessor->expects($this->once())
-            ->method('execute')
-            ->with($wishlistItemCollection);
-        $this->itemsFactory->expects($this->once())->method('create')->willReturn($wishlistItemCollection);
-        $store = $this->createMock(StoreInterface::class);
-        $this->storeManager->expects($this->any())->method('getStores')->willReturn([$store]);
-        $this->wishlist->getItemCollection();
-    }
-
-    /**
-     * @return void
-     * @throws LocalizedException
-     */
-    public function testLoadByCustomerId(): void
+    public function testLoadByCustomerId()
     {
         $customerId = 1;
         $customerIdFieldName = 'customer_id';
@@ -375,7 +342,6 @@ public function testUpdateItem($itemId, $buyRequest, $param): void
         $this->itemsFactory->expects($this->any())
             ->method('create')
             ->willReturn($items);
-        $this->permissionCollectionProcessor->expects($this->once())->method('execute')->willReturn($items);
 
         $this->productRepository->expects($this->once())
             ->method('getById')
@@ -414,8 +380,7 @@ private function prepareWishlistItem(): MockObject
         return $newItem;
     }
 
-    protected function getMockForDataObject()
-    {
+    protected function getMockForDataObject() {
         $dataObjectMock = $this->createMock(DataObject::class);
         $dataObjectMock->expects($this->once())
             ->method('setData')

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

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