Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue-#25675 Added fix for #25675 issue to the 2.4 Magento version #26650

Merged
merged 1 commit into from
Feb 21, 2020
Merged

issue-#25675 Added fix for #25675 issue to the 2.4 Magento version #26650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/QuoteItemQtyList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
*/
namespace Magento\CatalogInventory\Model\Quote\Item\QuantityValidator;

/**
* Class QuoteItemQtyList collects qty of quote items
*/
class QuoteItemQtyList
{
/**
Expand All @@ -17,6 +20,7 @@ class QuoteItemQtyList

/**
* Get product qty includes information from all quote items
*
* Need be used only in singleton mode
*
* @param int $productId
Expand All @@ -29,18 +33,18 @@ class QuoteItemQtyList
public function getQty($productId, $quoteItemId, $quoteId, $itemQty)
{
$qty = $itemQty;
if (isset(
$this->_checkedQuoteItems[$quoteId][$productId]['qty']
) && !in_array(
if (isset($this->_checkedQuoteItems[$quoteId][$productId]['qty']) && !in_array(
$quoteItemId,
$this->_checkedQuoteItems[$quoteId][$productId]['items']
)
) {
$qty += $this->_checkedQuoteItems[$quoteId][$productId]['qty'];
}

$this->_checkedQuoteItems[$quoteId][$productId]['qty'] = $qty;
$this->_checkedQuoteItems[$quoteId][$productId]['items'][] = $quoteItemId;
if ($quoteItemId !== null) {
$this->_checkedQuoteItems[$quoteId][$productId]['qty'] = $qty;
$this->_checkedQuoteItems[$quoteId][$productId]['items'][] = $quoteItemId;
}

return $qty;
}
Expand Down
68 changes: 68 additions & 0 deletions ...to/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/QuoteItemQtyListTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\CatalogInventory\Test\Unit\Model\Quote\Item\QuantityValidator;

use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use PHPUnit\Framework\TestCase;
use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\QuoteItemQtyList;

/**
* Class QuoteItemQtyListTest
*/
class QuoteItemQtyListTest extends TestCase
{
/**
* @var QuoteItemQtyList
*/
private $quoteItemQtyList;

/**
* @var int
*/
private $itemQtyTestValue;
Copy link
Contributor

@rogyar rogyar Feb 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a hint for the future. If we don't need to share value between different methods, there's no need to create an additional class property. You may use just local variables inside of the methods.

So $this->itemQtyTestValue will be simply $itemQtyTestValue inside of every method (test) of the current class

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rogyar Thank you, I agree, I had some ideas about using it, but then changed my mind and just used this as this is already created


/**
* Sets up the fixture, for example, open a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
{
$objectManagerHelper = new ObjectManager($this);
$this->quoteItemQtyList = $objectManagerHelper->getObject(QuoteItemQtyList::class);
}

/**
* This tests the scenario when item has not quote_item_id and after save gets a value.
*
* @return void
*/
public function testSingleQuoteItemQty()
{
$this->itemQtyTestValue = 1;
$qty = $this->quoteItemQtyList->getQty(125, null, 11232, 1);
$this->assertEquals($this->itemQtyTestValue, $qty);

$qty = $this->quoteItemQtyList->getQty(125, 1, 11232, 1);
$this->assertEquals($this->itemQtyTestValue, $qty);
}

/**
* This tests the scenario when item has been added twice to the cart.
*
* @return void
*/
public function testMultipleQuoteItemQty()
{
$this->itemQtyTestValue = 1;
$qty = $this->quoteItemQtyList->getQty(127, 1, 112, 1);
$this->assertEquals($this->itemQtyTestValue, $qty);

$this->itemQtyTestValue = 2;
$qty = $this->quoteItemQtyList->getQty(127, 2, 112, 1);
$this->assertEquals($this->itemQtyTestValue, $qty);
}
}