Merge remote-tracking branch 'origin/MC-36250' into 2.4-develop-pr36

Author: serhii-balko

app/code/Magento/Wishlist/Model/Adminhtml/ResourceModel/Item/Product/CollectionBuilder.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\Adminhtml\ResourceModel\Item\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
+use Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilderInterface;
+
+/**
+ * Wishlist items products collection builder for adminhtml area
+ */
+class CollectionBuilder implements CollectionBuilderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function build(WishlistItemCollection $wishlistItemCollection, Collection $productCollection): Collection
+    {
+        return $productCollection;
+    }
+}

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

@@ -11,6 +11,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Sales\Model\ConfigInterface;
+use Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilderInterface;
 
 /**
  * Wishlist item collection
@@ -157,6 +158,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @var ConfigInterface
      */
     private $salesConfig;
+    /**
+     * @var CollectionBuilderInterface
+     */
+    private $productCollectionBuilder;
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
@@ -178,8 +183,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param TableMaintainer|null $tableMaintainer
-     * @param  ConfigInterface|null $salesConfig
-     *
+     * @param ConfigInterface|null $salesConfig
+     * @param CollectionBuilderInterface|null $productCollectionBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -202,7 +207,8 @@ public function __construct(
         \Magento\Framework\App\State $appState,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         TableMaintainer $tableMaintainer = null,
-        ConfigInterface $salesConfig = null
+        ConfigInterface $salesConfig = null,
+        ?CollectionBuilderInterface $productCollectionBuilder = null
     ) {
         $this->stockConfiguration = $stockConfiguration;
         $this->_adminhtmlSales = $adminhtmlSales;
@@ -219,6 +225,8 @@ public function __construct(
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
         $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
         $this->salesConfig = $salesConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
+        $this->productCollectionBuilder = $productCollectionBuilder
+            ?: ObjectManager::getInstance()->get(CollectionBuilderInterface::class);
     }
 
     /**
@@ -309,12 +317,10 @@ protected function _assignProducts()
             $productCollection->setVisibility($this->_productVisibility->getVisibleInSiteIds());
         }
 
-        $productCollection->addPriceData()
-            ->addTaxPercents()
-            ->addIdFilter($this->_productIds)
-            ->addAttributeToSelect($this->_wishlistConfig->getProductAttributes())
-            ->addOptionsToResult()
-            ->addUrlRewrite();
+        $productCollection->addIdFilter($this->_productIds)
+            ->addAttributeToSelect($this->_wishlistConfig->getProductAttributes());
+
+        $productCollection = $this->productCollectionBuilder->build($this, $productCollection);
 
         if ($this->_productSalable) {
             $productCollection = $this->_adminhtmlSales->applySalableProductTypesFilter($productCollection);

app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilder.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\ResourceModel\Item\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
+
+/**
+ * Wishlist items products collection builder
+ */
+class CollectionBuilder implements CollectionBuilderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function build(WishlistItemCollection $wishlistItemCollection, Collection $productCollection): Collection
+    {
+        return $productCollection->addPriceData()
+            ->addTaxPercents()
+            ->addOptionsToResult()
+            ->addUrlRewrite();
+    }
+}

app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilderInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\ResourceModel\Item\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
+
+/**
+ * Wishlist items products collection builder
+ */
+interface CollectionBuilderInterface
+{
+    /**
+     * Modify product collection
+     *
+     * @param WishlistItemCollection $wishlistItemCollection
+     * @param Collection $productCollection
+     * @return Collection
+     */
+    public function build(WishlistItemCollection $wishlistItemCollection, Collection $productCollection): Collection;
+}

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

@@ -383,7 +383,7 @@ public function getItemCollection()
                 $this
             )->addStoreFilter(
                 $this->getSharedStoreIds()
-            )->setVisibilityFilter();
+            )->setVisibilityFilter($this->_useCurrentWebsite);
         }
 
         return $this->_itemCollection;
@@ -475,6 +475,7 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
             $_buyRequest = $buyRequest;
         } elseif (is_string($buyRequest)) {
             $isInvalidItemConfiguration = false;
+            $buyRequestData = [];
             try {
                 $buyRequestData = $this->serializer->unserialize($buyRequest);
                 if (!is_array($buyRequestData)) {
@@ -515,6 +516,7 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
 
         $errors = [];
         $items = [];
+        $item = null;
 
         foreach ($cartCandidates as $candidate) {
             if ($candidate->getParentProductId()) {

app/code/Magento/Wishlist/etc/adminhtml/di.xml

@@ -24,4 +24,6 @@
     <type name="Magento\Catalog\Model\ResourceModel\Product">
         <plugin name="cleanups_wishlist_item_after_product_delete" type="Magento\Wishlist\Plugin\Model\ResourceModel\Product" />
     </type>
+    <preference for="Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilderInterface"
+                type="Magento\Wishlist\Model\Adminhtml\ResourceModel\Item\Product\CollectionBuilder"/>
 </config>

app/code/Magento/Wishlist/etc/di.xml

@@ -78,4 +78,6 @@
             </argument>
         </arguments>
     </type>
+    <preference for="Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilderInterface"
+                type="Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilder"/>
 </config>

dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php

@@ -268,6 +268,27 @@ public function testUpdateNotExistingProductInWishList(): void
         $wishlist->updateItem($item, []);
     }
 
+    /**
+     * Test that admin user should be able to update wishlist on second website
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist_on_second_website.php
+     *
+     * @return void
+     */
+    public function testUpdateWishListItemOnSecondWebsite(): void
+    {
+        $wishlist = $this->getWishlistByCustomerId->execute(1);
+        $item = $this->getWishlistByCustomerId->getItemBySku(1, 'simple-2');
+        $this->assertNotNull($item);
+        $this->assertEquals(1, $item->getQty());
+        $buyRequest = $this->dataObjectFactory->create(['data' => ['qty' => 2]]);
+        $wishlist->updateItem($item->getId(), $buyRequest);
+        $updatedItem = $this->getWishlistByCustomerId->getItemBySku(1, 'simple-2');
+        $this->assertEquals(2, $updatedItem->getQty());
+    }
+
     /**
      * Assert item in wish list.
      *