Merge pull request #5934 from magento-tsg/2.4-develop-pr67

zakdma · web-flow · commit de9332cacf38 · 2020-07-28T15:08:22.000+03:00
[TSG] Fixes for 2.4 (pr67) (2.4-develop)
diff --git a/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php b/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GroupedProduct\Model\Wishlist\Product;
 
+use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
 use Magento\Wishlist\Model\Item as WishlistItem;
 use Magento\GroupedProduct\Model\Product\Type\Grouped as TypeGrouped;
 use Magento\Catalog\Model\Product;
@@ -36,7 +37,7 @@ public function beforeRepresentProduct(
 
             $diff = array_diff_key($itemOptions, $productOptions);
 
-            if (!$diff) {
+            if (!$diff && $this->isAddAction($productOptions['info_buyRequest'])) {
                 $buyRequest = $subject->getBuyRequest();
                 $superGroupInfo = $buyRequest->getData('super_group');
 
@@ -78,10 +79,13 @@ public function beforeCompareOptions(
         array $options2
     ): array {
         $diff = array_diff_key($options1, $options2);
+        $productOptions = isset($options1['info_buyRequest']['product']) ? $options1 : $options2;
 
         if (!$diff) {
             foreach (array_keys($options1) as $key) {
-                if (preg_match('/associated_product_\d+/', $key)) {
+                if (preg_match('/associated_product_\d+/', $key)
+                    && $this->isAddAction($productOptions['info_buyRequest'])
+                ) {
                     unset($options1[$key]);
                     unset($options2[$key]);
                 }
@@ -90,4 +94,18 @@ public function beforeCompareOptions(
 
         return [$options1, $options2];
     }
+
+    /**
+     * Check that current request belongs to add to wishlist action.
+     *
+     * @param OptionInterface $buyRequest
+     *
+     * @return bool
+     */
+    private function isAddAction(OptionInterface $buyRequest): bool
+    {
+        $requestValue = json_decode($buyRequest->getValue(), true);
+
+        return $requestValue['action'] === 'add';
+    }
 }
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Wishlist/Product/ItemTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Wishlist/Product/ItemTest.php
@@ -115,13 +115,29 @@ public function testBeforeRepresentProduct()
      */
     public function testBeforeCompareOptionsSameKeys()
     {
-        $options1 = ['associated_product_34' => 3];
-        $options2 = ['associated_product_34' => 2];
+        $infoBuyRequestMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\Configuration\Item\Option::class,
+            [
+                'getValue',
+            ]
+        );
+
+        $infoBuyRequestMock->expects($this->atLeastOnce())
+            ->method('getValue')
+            ->willReturn('{"product":"3","action":"add"}');
+        $options1 = [
+            'associated_product_34' => 3,
+            'info_buyRequest' => $infoBuyRequestMock,
+        ];
+        $options2 = [
+            'associated_product_34' => 3,
+            'info_buyRequest' => $infoBuyRequestMock,
+        ];
 
         $res = $this->model->beforeCompareOptions($this->subjectMock, $options1, $options2);
 
-        $this->assertEquals([], $res[0]);
-        $this->assertEquals([], $res[1]);
+        $this->assertEquals(['info_buyRequest' => $infoBuyRequestMock], $res[0]);
+        $this->assertEquals(['info_buyRequest' => $infoBuyRequestMock], $res[1]);
     }
 
     /**
@@ -175,16 +191,26 @@ private function getProductAssocOption($initVal, $prodId)
     {
         $items = [];
 
-        $optionMock = $this->createPartialMock(
+        $associatedProductMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\Configuration\Item\Option::class,
+            [
+                'getValue',
+            ]
+        );
+        $infoBuyRequestMock = $this->createPartialMock(
             \Magento\Catalog\Model\Product\Configuration\Item\Option::class,
             [
                 'getValue',
             ]
         );
 
-        $optionMock->expects($this->once())->method('getValue')->willReturn($initVal);
+        $associatedProductMock->expects($this->once())->method('getValue')->willReturn($initVal);
+        $infoBuyRequestMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn('{"product":"'. $prodId . '","action":"add"}');
 
-        $items['associated_product_' . $prodId] = $optionMock;
+        $items['associated_product_' . $prodId] = $associatedProductMock;
+        $items['info_buyRequest'] = $infoBuyRequestMock;
 
         return $items;
     }
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -492,6 +492,9 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
         } else {
             $_buyRequest = new DataObject();
         }
+        if ($_buyRequest->getData('action') !== 'updateItem') {
+            $_buyRequest->setData('action', 'add');
+        }
 
         /* @var $product Product */
         $cartCandidates = $product->getTypeInstance()->processConfiguration($_buyRequest, clone $product);
@@ -750,15 +753,16 @@ public function updateItem($itemId, $buyRequest, $params = null)
             }
             $params->setCurrentConfig($item->getBuyRequest());
             $buyRequest = $this->_catalogProduct->addParamsToBuyRequest($buyRequest, $params);
+            $buyRequest->setData('action', 'updateItem');
 
             $product->setWishlistStoreId($item->getStoreId());
             $items = $this->getItemCollection();
             $isForceSetQuantity = true;
-            foreach ($items as $_item) {
-                /* @var $_item Item */
-                if ($_item->getProductId() == $product->getId() && $_item->representProduct(
-                    $product
-                ) && $_item->getId() != $item->getId()
+            foreach ($items as $wishlistItem) {
+                /* @var $wishlistItem Item */
+                if ($wishlistItem->getProductId() == $product->getId()
+                    && $wishlistItem->getId() != $item->getId()
+                    && $wishlistItem->representProduct($product)
                 ) {
                     // We do not add new wishlist item, but updating the existing one
                     $isForceSetQuantity = false;
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php
@@ -243,34 +243,22 @@ public function testLoadByCustomerId()
 
     /**
      * @param int|Item|MockObject $itemId
-     * @param DataObject $buyRequest
+     * @param DataObject|MockObject $buyRequest
      * @param null|array|DataObject $param
      * @throws LocalizedException
      *
      * @dataProvider updateItemDataProvider
      */
-    public function testUpdateItem($itemId, $buyRequest, $param)
+    public function testUpdateItem($itemId, $buyRequest, $param): void
     {
         $storeId = 1;
         $productId = 1;
         $stores = [(new DataObject())->setId($storeId)];
 
-        $newItem = $this->getMockBuilder(Item::class)
-            ->setMethods(
-                ['setProductId', 'setWishlistId', 'setStoreId', 'setOptions', 'setProduct', 'setQty', 'getItem', 'save']
-            )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $newItem->expects($this->any())->method('setProductId')->willReturnSelf();
-        $newItem->expects($this->any())->method('setWishlistId')->willReturnSelf();
-        $newItem->expects($this->any())->method('setStoreId')->willReturnSelf();
-        $newItem->expects($this->any())->method('setOptions')->willReturnSelf();
-        $newItem->expects($this->any())->method('setProduct')->willReturnSelf();
-        $newItem->expects($this->any())->method('setQty')->willReturnSelf();
-        $newItem->expects($this->any())->method('getItem')->willReturn(2);
-        $newItem->expects($this->any())->method('save')->willReturnSelf();
+        $newItem = $this->prepareWishlistItem();
 
         $this->itemFactory->expects($this->once())->method('create')->willReturn($newItem);
+        $this->productHelper->expects($this->once())->method('addParamsToBuyRequest')->willReturn($buyRequest);
 
         $this->storeManager->expects($this->any())->method('getStores')->willReturn($stores);
         $this->storeManager->expects($this->any())->method('getStore')->willReturn($stores[0]);
@@ -355,13 +343,48 @@ public function testUpdateItem($itemId, $buyRequest, $param)
         );
     }
 
+    /**
+     * Prepare wishlist item mock.
+     *
+     * @return MockObject
+     */
+    private function prepareWishlistItem(): MockObject
+    {
+        $newItem = $this->getMockBuilder(Item::class)
+            ->setMethods(
+                ['setProductId', 'setWishlistId', 'setStoreId', 'setOptions', 'setProduct', 'setQty', 'getItem', 'save']
+            )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $newItem->expects($this->any())->method('setProductId')->willReturnSelf();
+        $newItem->expects($this->any())->method('setWishlistId')->willReturnSelf();
+        $newItem->expects($this->any())->method('setStoreId')->willReturnSelf();
+        $newItem->expects($this->any())->method('setOptions')->willReturnSelf();
+        $newItem->expects($this->any())->method('setProduct')->willReturnSelf();
+        $newItem->expects($this->any())->method('setQty')->willReturnSelf();
+        $newItem->expects($this->any())->method('getItem')->willReturn(2);
+        $newItem->expects($this->any())->method('save')->willReturnSelf();
+
+        return $newItem;
+    }
+
     /**
      * @return array
      */
-    public function updateItemDataProvider()
+    public function updateItemDataProvider(): array
     {
+        $dataObjectMock = $this->createMock(DataObject::class);
+        $dataObjectMock->expects($this->once())
+            ->method('setData')
+            ->with('action', 'updateItem')
+            ->willReturnSelf();
+        $dataObjectMock->expects($this->once())
+            ->method('getData')
+            ->with('action')
+            ->willReturn('updateItem');
+
         return [
-            '0' => [1, new DataObject(), null]
+            '0' => [1, $dataObjectMock, null]
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateItemOptionsTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateItemOptionsTest.php
@@ -153,6 +153,33 @@ public function testUpdateItemNotSpecifyAsWishListItem(): void
         $this->assertRedirect($this->stringContains('wishlist/index/index/wishlist_id/'));
     }
 
+    /**
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist_with_grouped_product.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testUpdateItemOptionsForGroupedProduct(): void
+    {
+        $this->customerSession->setCustomerId(1);
+        $item = $this->getWishlistByCustomerId->getItemBySku(1, 'grouped');
+        $this->assertNotNull($item);
+        $params = [
+            'id' => $item->getId(),
+            'product' => $item->getProductId(),
+            'super_group' => $this->performGroupedOption(),
+            'qty' => 1,
+        ];
+        $this->performUpdateWishListItemRequest($params);
+        $message = sprintf("%s has been updated in your Wish List.", $item->getProduct()->getName());
+        $this->assertSessionMessages($this->equalTo([(string)__($message)]), MessageInterface::TYPE_SUCCESS);
+        $this->assertRedirect($this->stringContains('wishlist/index/index/wishlist_id/' . $item->getWishlistId()));
+        $this->assertUpdatedItem(
+            $this->getWishlistByCustomerId->getItemBySku(1, 'grouped'),
+            $params
+        );
+    }
+
     /**
      * Perform request update wish list item.
      *
@@ -195,4 +222,20 @@ private function performConfigurableOption(ProductInterface $product): array
 
         return [$attributeId => $option['value_index']];
     }
+
+    /**
+     * Perform group option to select.
+     *
+     * @return array
+     */
+    private function performGroupedOption(): array
+    {
+        $simple1 = $this->productRepository->get('simple_11');
+        $simple2 = $this->productRepository->get('simple_22');
+
+        return [
+            $simple1->getId() => '3',
+            $simple2->getId() => '3',
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -143,7 +143,12 @@ public function testAddConfigurableProductToWishList(): void
         $configurableOptions = $configurableProduct->getTypeInstance()->getConfigurableOptions($configurableProduct);
         $attributeId = key($configurableOptions);
         $option = reset($configurableOptions[$attributeId]);
-        $buyRequest = ['super_attribute' => [$attributeId => $option['value_index']]];
+        $buyRequest = [
+            'super_attribute' => [
+                $attributeId => $option['value_index']
+            ],
+            'action' => 'add',
+        ];
         $wishlist = $this->getWishlistByCustomerId->execute(1);
         $wishlist->addNewItem($configurableProduct, $buyRequest);
         $item = $this->getWishlistByCustomerId->getItemBySku(1, 'Configurable product');
@@ -166,7 +171,12 @@ public function testAddBundleProductToWishList(): void
         $option = reset($bundleOptions);
         $productLinks = $option->getProductLinks();
         $this->assertNotNull($productLinks[0]);
-        $buyRequest = ['bundle_option' => [$option->getOptionId() => $productLinks[0]->getId()]];
+        $buyRequest = [
+            'bundle_option' => [
+                $option->getOptionId() => $productLinks[0]->getId()
+            ],
+            'action' => 'add',
+        ];
         $skuWithChosenOption = implode('-', [$bundleProduct->getSku(), $productLinks[0]->getSku()]);
         $wishlist = $this->getWishlistByCustomerId->execute(1);
         $wishlist->addNewItem($bundleProduct, $buyRequest);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Wishlist\Model\WishlistFactory;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/GroupedProduct/_files/product_grouped_with_simple.php'
+);
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
+$customer = $customerRegistry->retrieve(1);
+$wishlistFactory = $objectManager->get(WishlistFactory::class);
+$wishlist = $wishlistFactory->create();
+$wishlist->loadByCustomerId($customer->getId(), true);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->get('grouped');
+$simple1 = $productRepository->get('simple_11');
+$simple2 = $productRepository->get('simple_22');
+$buyRequest = new DataObject([
+    'product' => $product->getId(),
+    'super_group' =>
+        [
+            $simple1->getId() => '1',
+            $simple2->getId() => '1',
+        ],
+    'action' => 'add',
+]);
+$wishlist->addNewItem($product, $buyRequest);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product_rollback.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php'
+);
