Merge remote-tracking branch 'act4/ACP2E-3987' into PR_25_June_odubovyk

Author: o-dubovyk

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,15 @@ 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']);
+            $stores = [];
+            foreach ($website->getStores() as $store) {
+                $stores[] = $store->getId();
+            }
+            if ($stores) {
+                $wishlistItemCollection->addStoreFilter($stores);
+            }
         } else {
             $wishlistItemCollection->addStoreFilter(array_map(function (StoreInterface $store) {
                 return $store->getId();

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

@@ -8,11 +8,12 @@
 namespace Magento\WishlistGraphQl\Test\Unit\Model\Resolver;
 
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\GraphQl\Model\Query\ContextExtensionInterface;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Framework\GraphQl\Config\Element\Field;
-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;
@@ -21,6 +22,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class WishlistItemsTest extends TestCase
 {
     /**
@@ -49,14 +53,13 @@ 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();
+        $context = $this->createMock(ContextInterface::class);
         $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()
@@ -87,7 +90,7 @@ public function testResolve(): void
             ->willReturnSelf();
         $wishlistCollection->expects($this->once())
             ->method('addStoreFilter')
-            ->with($storeId)
+            ->with([$storeId])
             ->willReturnSelf();
         $wishlistCollection->expects($this->once())->method('setVisibilityFilter')->willReturnSelf();
         $wishlistCollection->expects($this->once())->method('setCurPage')->willReturnSelf();
@@ -100,6 +103,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]);
     }