Skip to content

Commit 91c0e73

Browse files
author
Vasiliev.A
committed
fix counting different operations statuses in bulkStatus
1 parent 68b8a8e commit 91c0e73

File tree

2 files changed

+6
-29
lines changed

2 files changed

+6
-29
lines changed

app/code/Magento/AsynchronousOperations/Model/BulkStatus.php

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -153,24 +153,6 @@ public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
153153
*/
154154
public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
155155
{
156-
if ($status === OperationInterface::STATUS_TYPE_OPEN) {
157-
/**
158-
* Total number of operations that has been scheduled within the given bulk
159-
*/
160-
$allOperationsQty = $this->getOperationCount($bulkUuid);
161-
162-
/**
163-
* Number of operations that has been processed (i.e. operations with any status but 'open')
164-
*/
165-
$allProcessedOperationsQty = (int)$this->operationCollectionFactory->create()
166-
->addFieldToFilter(
167-
'bulk_uuid',
168-
$bulkUuid
169-
)
170-
->getSize();
171-
172-
return $allOperationsQty - $allProcessedOperationsQty;
173-
}
174156

175157
/** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation\Collection $collection */
176158
$collection = $this->operationCollectionFactory->create();
@@ -295,12 +277,12 @@ public function getBulkDetails($bulkUuid)
295277
/** @var \Magento\AsynchronousOperations\Model\Operation\Details $operationDetails */
296278
$operationDetails = $this->operationDetailsFactory->create(['bulkUuid' => $bulkUuid]);
297279

298-
/** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $bulkExtensionAttribute */
299-
$bulkExtensionAttribute = $this->bulkSummaryExtensionInterfaceFactory->create();
300-
$bulkExtensionAttribute->setOperationsList($operationList);
280+
/** @var \Magento\AsynchronousOperations\Api\Data\BulkSummaryExtensionInterface $bulkAttribute */
281+
$bulkAttribute = $this->bulkSummaryExtensionInterfaceFactory->create();
282+
$bulkAttribute->setOperationsList($operationList);
301283

302-
$bulkExtensionAttribute->setOperationsCount($operationDetails);
303-
$bulk->setExtensionAttributes($bulkExtensionAttribute);
284+
$bulkAttribute->setOperationsCount($operationDetails);
285+
$bulk->setExtensionAttributes($bulkAttribute);
304286

305287
return $bulk;
306288
}

app/code/Magento/AsynchronousOperations/Model/Operation/Details.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,7 @@ public function getDetails($bulkUuid)
7878
);
7979
}
8080

81-
// total is sum of successful, rejected, retriable, not retriable and open operations
82-
$details['operations_total'] =
83-
array_sum($details) + $this->bulkStatus->getOperationsCountByBulkIdAndStatus(
84-
$bulkUuid,
85-
OperationInterface::STATUS_TYPE_OPEN
86-
);
81+
$details['operations_total'] = array_sum($details);
8782
$details['operations_failed'] = $details['failed_retriable'] + $details['failed_not_retriable'];
8883
$this->operationCache[$bulkUuid] = $details;
8984

0 commit comments

Comments
 (0)