ACP2E-726: Unable to query bulk operations by search criteria using REST Api

- Reverted old solution
- Added plugin for updating data value for magneto bulk operation

Author: Mohan Ahuja

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

@@ -11,7 +11,7 @@
 /**
  * Class Operation encapsulates methods for Operation Model Object
  */
-class Operation extends DataObject implements OperationInterface, BulkOperationInterface
+class Operation extends DataObject implements OperationInterface
 {
     /**
      * @var OperationStatusValidator
@@ -37,15 +37,15 @@ public function __construct(
      */
     public function getId()
     {
-        return $this->getData(self::OPERATION_ID);
+        return $this->getData(self::ID);
     }
 
     /**
      * @inheritDoc
      */
     public function setId($id)
     {
-        return $this->setData(self::OPERATION_ID, $id);
+        return $this->setData(self::ID, $id);
     }
 
     /**
@@ -161,22 +161,6 @@ public function setErrorCode($errorCode)
         return $this->setData(self::ERROR_CODE, $errorCode);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getOperationKey(): ?int
-    {
-        return $this->getData(self::ID) ? (int) $this->getData(self::ID) : null;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setOperationKey(?int $operationKey)
-    {
-        return $this->setData(self::ID, $operationKey);
-    }
-
     /**
      * Retrieve existing extension attributes object.
      *

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

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Plugin;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+
+/**
+ * Class for bulk operation collection updates for operation key unique values
+ */
+class CollectionUpdater
+{
+    /**
+     * Adds id value in operation_key in case of bulk operation
+     *
+     * @param AbstractDb $subject
+     * @param $result
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function afterGetData(AbstractDb $subject, $result)
+    {
+        if (is_array($result) && !empty($result) &&
+            $subject->getResource()->getMainTable() == "magento_operation" &&
+            $subject->getResource()->getTable('magento_bulk') == "magento_bulk"
+        ) {
+            foreach ($result as $key => $row) {
+                $result[$key][OperationInterface::ID] = $row['id'];
+            }
+        }
+
+        return $result;
+    }
+}

app/code/Magento/AsynchronousOperations/Plugin/CollectionUpdater.php

@@ -116,6 +116,9 @@
             <argument name="bulkManagement" xsi:type="object">Magento\AsynchronousOperations\Model\VirtualType\BulkManagement</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Data\Collection\AbstractDb">
+        <plugin name="collection_updater" type="Magento\AsynchronousOperations\Plugin\CollectionUpdater"/>
+    </type>
     <preference for="Magento\AsynchronousOperations\Api\Data\AsyncResponseInterface" type="Magento\AsynchronousOperations\Model\AsyncResponse" />
     <preference for="Magento\AsynchronousOperations\Api\Data\ItemStatusInterface" type="Magento\AsynchronousOperations\Model\ItemStatus" />
 </config>

app/code/Magento/AsynchronousOperations/etc/di.xml

@@ -103,7 +103,7 @@ public function testExecute(): void
         );
         $this->assertEquals(1, $collection->count());
         $operation = $collection->getFirstItem();
-        $this->assertEquals(1, $operation->getOperationKey());
+        $this->assertEquals(1, $operation->getId());
         $this->assertEquals(0, $operation->getErrorCode());
         $this->assertEquals('Unknown Error', $operation->getResultMessage());
     }

dev/tests/integration/testsuite/Magento/AsynchronousOperations/Cron/MarkIncompleteOperationsAsFailedTest.php

@@ -61,7 +61,7 @@ public function testGetBulkStatus()
         }
         /** @var OperationInterface $operation */
         $operation = array_shift($operations);
-        $operationId = $operation->getOperationKey();
+        $operationId = $operation->getId();
 
         $this->assertTrue($this->model->changeOperationStatus(
             'bulk-uuid-5',