Skip to content

⚡ perf: use getSize() in Order hasInvoices/hasShipments/hasCreditmemos #40731

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

Open
lbajsarowicz wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Open

⚡ perf: use getSize() in Order hasInvoices/hasShipments/hasCreditmemos #40731

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
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/Model/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,7 +2065,7 @@ public function getTracksCollection()
*/
public function hasInvoices()
{
return (bool)$this->getInvoiceCollection()->count();
return $this->getInvoiceCollection()->getSize() > 0;
}

/**
Expand All @@ -2075,7 +2075,7 @@ public function hasInvoices()
*/
public function hasShipments()
{
return (bool)$this->getShipmentsCollection()->count();
return $this->getShipmentsCollection()->getSize() > 0;
}

/**
Expand All @@ -2085,7 +2085,7 @@ public function hasShipments()
*/
public function hasCreditmemos()
{
return (bool)$this->getCreditmemosCollection()->count();
return $this->getCreditmemosCollection()->getSize() > 0;
}

/**
Expand Down
42 changes: 42 additions & 0 deletions app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@
use Magento\Sales\Model\Order;
use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection as OrderCreditmemoCollection;
use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection as OrderInvoiceCollection;
use Magento\Sales\Model\Order\Item;
use Magento\Sales\Model\ResourceModel\Order\Item\Collection as OrderItemCollection;
use Magento\Sales\Model\ResourceModel\Order\Item\CollectionFactory as OrderItemCollectionFactory;
use Magento\Sales\Model\ResourceModel\Order\Payment;
use Magento\Sales\Model\ResourceModel\Order\Payment\Collection as PaymentCollection;
use Magento\Sales\Model\ResourceModel\Order\Payment\CollectionFactory as PaymentCollectionFactory;
use Magento\Sales\Model\ResourceModel\Order\Shipment\Collection as OrderShipmentCollection;
use Magento\Sales\Model\ResourceModel\Order\Status\History\Collection as HistoryCollection;
use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory as HistoryCollectionFactory;
use PHPUnit\Framework\MockObject\MockObject;
Expand Down Expand Up @@ -634,6 +636,34 @@ public function testCanEditIfHasInvoices()
$this->assertFalse($this->order->canEdit());
}

#[DataProvider('hasRelatedDocumentsDataProvider')]
public function testHasRelatedDocumentsUsesGetSize(
string $method,
string $collectionGetter,
string $collectionClass,
int $size,
bool $expected
): void {
$collection = $this->createPartialMock($collectionClass, ['getSize', 'count', 'load']);
$collection->expects($this->once())
->method('getSize')
->willReturn($size);
$collection->expects($this->never())
->method('count');
$collection->expects($this->never())
->method('load');

$order = $this->getMockBuilder(Order::class)
->disableOriginalConstructor()
->onlyMethods([$collectionGetter])
->getMock();
$order->expects($this->once())
->method($collectionGetter)
->willReturn($collection);

$this->assertSame($expected, $order->$method());
}

/**
* @covers \Magento\Sales\Model\Order::canReorder
*/
Expand Down Expand Up @@ -1345,4 +1375,16 @@ public static function canNotCreditMemoStatesProvider()
[Order::STATE_PAYMENT_REVIEW]
];
}

public static function hasRelatedDocumentsDataProvider(): array
{
return [
['hasInvoices', 'getInvoiceCollection', OrderInvoiceCollection::class, 1, true],
['hasInvoices', 'getInvoiceCollection', OrderInvoiceCollection::class, 0, false],
['hasShipments', 'getShipmentsCollection', OrderShipmentCollection::class, 1, true],
['hasShipments', 'getShipmentsCollection', OrderShipmentCollection::class, 0, false],
['hasCreditmemos', 'getCreditmemosCollection', OrderCreditmemoCollection::class, 1, true],
['hasCreditmemos', 'getCreditmemosCollection', OrderCreditmemoCollection::class, 0, false],
];
}
}