ACP2E-3987: Wishlist items are not shared between stores views within one website in GraphQL request

Author: aplapana

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

@@ -61,7 +61,7 @@ public function resolve(
         $wishlist = $value['model'];
 
         if ($context->getExtensionAttributes()->getStore() instanceof StoreInterface) {
-            $args['store_id'] = $context->getExtensionAttributes()->getStore()->getId();
+            $args['website_id'] = $context->getExtensionAttributes()->getStore()->getWebsiteId();
         }
 
         /** @var WishlistItemCollection $wishlistItemCollection */
@@ -95,6 +95,7 @@ public function resolve(
      * @param Wishlist $wishlist
      * @param array $args
      * @return WishlistItemCollection
+     * @throws LocalizedException
      */
     private function getWishListItems(Wishlist $wishlist, array $args): WishlistItemCollection
     {
@@ -104,8 +105,11 @@ private function getWishListItems(Wishlist $wishlist, array $args): WishlistItem
         /** @var WishlistItemCollection $wishlistItemCollection */
         $wishlistItemCollection = $this->wishlistItemCollectionFactory->create();
         $wishlistItemCollection->addWishlistFilter($wishlist);
-        if (isset($args['store_id'])) {
-            $wishlistItemCollection->addStoreFilter($args['store_id']);
+        if (isset($args['website_id']) && $args['website_id']) {
+            $website = $this->storeManager->getWebsite($args['website_id']);
+            foreach ($website->getStores() as $store) {
+                $wishlistItemCollection->addStoreFilter($store->getId());
+            }
         } else {
             $wishlistItemCollection->addStoreFilter(array_map(function (StoreInterface $store) {
                 return $store->getId();

app/code/Magento/WishlistGraphQl/Test/Unit/Model/Resolver/WishlistItemsTest.php

@@ -13,6 +13,7 @@
 use Magento\GraphQl\Model\Query\ContextExtensionInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
 use Magento\Wishlist\Model\ResourceModel\Item;
 use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
 use Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory as WishlistItemCollectionFactory;
@@ -49,18 +50,18 @@ protected function setUp(): void
      */
     public function testResolve(): void
     {
-        $storeId = $itemId = 1;
+        $webId = $storeId = $itemId = 1;
 
         $field = $this->createMock(Field::class);
         $context = $this->getMockBuilder(ContextInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $store = $this->createMock(StoreInterface::class);
-        $store->expects($this->once())->method('getId')->willReturn($storeId);
+        $store->expects($this->once())->method('getWebsiteId')->willReturn($webId);
+        $store->expects($this->any())->method('getId')->willReturn($storeId);
 
         $extensionAttributes = $this->getMockBuilder(ContextExtensionInterface::class)
             ->disableOriginalConstructor()
-            ->addMethods(['getStore'])
             ->getMock();
         $extensionAttributes->expects($this->exactly(2))
             ->method('getStore')
@@ -100,6 +101,10 @@ public function testResolve(): void
             ->method('create')
             ->willReturn($wishlistCollection);
 
+        $website = $this->createMock(Website::class);
+        $website->expects($this->any())->method('getStores')->willReturn([$store]);
+        $this->storeManager->expects($this->once())->method('getWebsite')->with($webId)->willReturn($website);
+
         $resolver = new WishlistItems($this->wishlistItemCollectionFactory, $this->storeManager);
         $resolver->resolve($field, $context, $info, ['model' => $wishlist]);
     }