Merge remote-tracking branch 'bulk/bulk-status-search' into status-searchapi

Author: vrann

app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php

@@ -9,7 +9,8 @@
 namespace Magento\AsynchronousOperations\Api;
 
 /**
- * Interface BulkStatusInterface
+ * Interface BulkStatusInterface.
+ *
  * Bulk summary data with list of operations items short data.
  *
  * @api

app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php

@@ -23,14 +23,14 @@ interface DetailedBulkOperationsStatusInterface extends BulkSummaryInterface
     /**
      * Retrieve operations list.
      *
-     * @return \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface[]
+     * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
      */
     public function getOperationsList();
 
     /**
      * Set operations list.
      *
-     * @param \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface[] $operationStatusList
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $operationStatusList
      * @return $this
      */
     public function setOperationsList($operationStatusList);

app/code/Magento/AsynchronousOperations/Api/Data/DetailedOperationStatusInterface.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,21 +9,22 @@
 namespace Magento\AsynchronousOperations\Api\Data;
 
 /**
- * Interface defines Operation Search Results data object
+ * Bulk operation search result interface.
  *
+ * An bulk is a group of queue messages. An bulk operation item is a queue message.
  * @api
  */
 interface OperationSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
     /**
-     * Get operations list.
+     * Get list of operations.
      *
      * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
      */
     public function getItems();
 
     /**
-     * Set operations list.
+     * Set list of operations.
      *
      * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $items
      * @return $this

app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php

@@ -9,12 +9,15 @@
 namespace Magento\AsynchronousOperations\Api;
 
 /**
+ * Bulk operation item repository interface.
+ *
+ * An bulk is a group of queue messages. An bulk operation item is a queue message.
  * @api
  */
 interface OperationRepositoryInterface
 {
     /**
-     * Find operation entities by criteria
+     * Lists the bulk operation items that match specified search criteria.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface

app/code/Magento/AsynchronousOperations/Api/OperationRepositoryInterface.php

@@ -5,14 +5,13 @@
  */
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\Framework\DataObject;
-use Magento\Framework\Api\ExtensibleDataInterface;
 
 /**
  * Class Operation
  */
-class Operation extends DataObject implements DetailedOperationStatusInterface
+class Operation extends DataObject implements OperationInterface
 {
     /**
      * @inheritDoc

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

@@ -6,7 +6,7 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
 use Magento\Framework\EntityManager\EntityManager;
 
 /**
@@ -20,7 +20,7 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
     private $entityManager;
 
     /**
-     * @var DetailedOperationStatusInterfaceFactory
+     * @var OperationInterfaceFactory
      */
     private $operationFactory;
 
@@ -33,12 +33,12 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
      * OperationManagement constructor.
      *
      * @param EntityManager $entityManager
-     * @param DetailedOperationStatusInterfaceFactory $operationFactory
+     * @param OperationInterfaceFactory $operationFactory
      * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
         EntityManager $entityManager,
-        DetailedOperationStatusInterfaceFactory $operationFactory,
+        OperationInterfaceFactory $operationFactory,
         \Psr\Log\LoggerInterface $logger
     ) {
         $this->entityManager = $entityManager;
@@ -65,7 +65,6 @@ public function changeOperationStatus(
             $operationEntity->setResultMessage($message);
             $operationEntity->setSerializedData($data);
             $operationEntity->setResultSerializedData($resultData);
-            $operationEntity->setResultSerializedData($resultData);
             $this->entityManager->save($operationEntity);
         } catch (\Exception $exception) {
             $this->logger->critical($exception->getMessage());

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

@@ -8,8 +8,6 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterfaceFactory;
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterfaceFactory as SearchResultFactory;
@@ -20,7 +18,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
- * Operation Management Service
+ * Repository class for @see \Magento\AsynchronousOperations\Api\OperationRepositoryInterface
  */
 class OperationRepository implements \Magento\AsynchronousOperations\Api\OperationRepositoryInterface
 {
@@ -61,6 +59,7 @@ class OperationRepository implements \Magento\AsynchronousOperations\Api\Operati
 
     /**
      * OperationRepository constructor.
+     *
      * @param EntityManager $entityManager
      * @param CollectionFactory $collectionFactory
      * @param SearchResultFactory $searchResultFactory
@@ -83,6 +82,7 @@ public function __construct(
         $this->searchResultFactory = $searchResultFactory;
         $this->joinProcessor = $joinProcessor;
         $this->operationExtensionFactory = $operationExtension;
+        $this->collectionProcessor = $collectionProcessor;
         $this->logger = $logger;
         $this->collectionProcessor = $collectionProcessor;
     }
@@ -101,18 +101,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $this->collectionProcessor->process($searchCriteria, $collection);
         $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setTotalCount($collection->getSize());
-
-        $items = [];
-        foreach ($collection->getItems() as $item) {
-            $extensionAttributes = $item->getExtensionAttributes();
-            if ($extensionAttributes == null) {
-                $extensionAttributes = $this->operationExtensionFactory->create();
-            }
-            $extensionAttributes->setStartTime($item->getExtensionAttributeStartTimeStartTime());
-            $item->setExtensionAttributes($extensionAttributes);
-            $items[] = $item;
-        }
-        $searchResult->setItems($items);
+        $searchResult->setItems($collection->getItems());
 
         return $searchResult;
     }

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

@@ -40,11 +40,11 @@ protected function setUp()
         $this->entityManagerMock = $this->createMock(\Magento\Framework\EntityManager\EntityManager::class);
         $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
         $this->operationFactoryMock = $this->createPartialMock(
-            \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterfaceFactory::class,
+            \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory::class,
             ['create']
         );
         $this->operationMock =
-            $this->createMock(\Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface::class);
+            $this->createMock(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
         $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
         $this->model = new \Magento\AsynchronousOperations\Model\OperationManagement(
             $this->entityManagerMock,

app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php

@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface" type="Magento\AsynchronousOperations\Model\BulkSummary" />
     <preference for="Magento\AsynchronousOperations\Api\Data\OperationInterface" type="Magento\AsynchronousOperations\Model\Operation" />
-    <preference for="Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface" type="Magento\AsynchronousOperations\Model\Operation" />
     <preference for="Magento\AsynchronousOperations\Api\Data\OperationListInterface" type="Magento\AsynchronousOperations\Model\OperationList" />
     <preference for="Magento\Framework\Bulk\BulkManagementInterface" type="Magento\AsynchronousOperations\Model\BulkManagement" />
     <preference for="Magento\AsynchronousOperations\Api\BulkStatusInterface" type="Magento\AsynchronousOperations\Model\BulkOperationsStatus" />
@@ -22,7 +21,7 @@
     <type name="Magento\Framework\EntityManager\MetadataPool">
         <arguments>
             <argument name="metadata" xsi:type="array">
-                <item name="Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface" xsi:type="array">
+                <item name="Magento\AsynchronousOperations\Api\Data\OperationInterface" xsi:type="array">
                     <item name="entityTableName" xsi:type="string">magento_operation</item>
                     <item name="identifierField" xsi:type="string">id</item>
                 </item>