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

- Reverting framework file changes.
- Created changes in specific module interface instead of doing in base api interface

Author: Mohan Ahuja

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

@@ -13,6 +13,8 @@
  */
 interface OperationInterface extends \Magento\Framework\Bulk\OperationInterface
 {
+    public const OPERATION_ID = 'id';
+
     /**
      * Retrieve existing extension attributes object.
      *
@@ -31,4 +33,20 @@ public function getExtensionAttributes();
     public function setExtensionAttributes(
         \Magento\AsynchronousOperations\Api\Data\OperationExtensionInterface $extensionAttributes
     );
+
+    /**
+     * Get operation key
+     *
+     * @return int|null
+     * @since 103.0.1
+     */
+    public function getOperationKey();
+
+    /**
+     * Set operation key
+     *
+     * @param int|null $operationKey
+     * @since 103.0.1
+     */
+    public function setOperationKey(?int $operationKey);
 }

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

@@ -7,7 +7,6 @@
 
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\AsynchronousOperations\Model\OperationStatusValidator;
-use Magento\Framework\Bulk\OperationInterface as BulkOperationInterface;
 use Magento\Framework\DataObject;
 
 /**
@@ -39,15 +38,15 @@ public function __construct(
      */
     public function getId()
     {
-        return $this->getData(self::ID);
+        return $this->getData(self::OPERATION_ID);
     }
 
     /**
      * @inheritDoc
      */
     public function setId($id)
     {
-        return $this->setData(self::ID, $id);
+        return $this->setData(self::OPERATION_ID, $id);
     }
 
     /**
@@ -168,16 +167,15 @@ public function setErrorCode($errorCode)
      */
     public function getOperationKey(): ?int
     {
-        return $this->getData(self::OPERATION_KEY) ? (int) $this->getData(self::OPERATION_KEY) : null;
+        return $this->getData(self::ID) ? (int) $this->getData(self::ID) : null;
     }
 
     /**
      * @inheritDoc
      */
-    public function setOperationKey(?int $operationKey): BulkOperationInterface
+    public function setOperationKey(?int $operationKey)
     {
-        $this->setData(self::OPERATION_KEY, $operationKey);
-        return $this;
+        return $this->setData(self::ID, $operationKey);
     }
 
     /**

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

@@ -91,7 +91,7 @@ public function createByTopic($topicName, $entityParams, $groupId, $operationId)
         ];
         $data = [
             'data' => [
-                OperationInterface::OPERATION_KEY => $operationId,
+                OperationInterface::ID => $operationId,
                 OperationInterface::BULK_ID => $groupId,
                 OperationInterface::TOPIC_NAME => $topicName,
                 OperationInterface::SERIALIZED_DATA => $this->jsonSerializer->serialize($serializedData),

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

@@ -89,7 +89,7 @@ public function create($topicName, $entityParams, $groupId, $operationId): Opera
         ];
         $data = [
             'data' => [
-                OperationInterface::OPERATION_KEY => $operationId,
+                OperationInterface::ID => $operationId,
                 OperationInterface::BULK_ID => $groupId,
                 OperationInterface::TOPIC_NAME => $topicName,
                 OperationInterface::SERIALIZED_DATA => $this->jsonSerializer->serialize($serializedData),

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

@@ -53,22 +53,22 @@ public function testExecute(): void
         $startedAt = $resource->getConnection()->formatDate(new \DateTime('-14 hours', new \DateTimeZone('UTC')));
         $operationsData = [
             [
-                OperationInterface::OPERATION_KEY => 0,
+                OperationInterface::ID => 0,
                 OperationInterface::STATUS => OperationInterface::STATUS_TYPE_COMPLETE,
                 'started_at' => $startedAt,
             ],
             [
-                OperationInterface::OPERATION_KEY => 1,
+                OperationInterface::ID => 1,
                 OperationInterface::STATUS => OperationInterface::STATUS_TYPE_OPEN,
                 'started_at' => $startedAt,
             ],
             [
-                OperationInterface::OPERATION_KEY => 2,
+                OperationInterface::ID => 2,
                 OperationInterface::STATUS => OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
                 'started_at' => $startedAt,
             ],
             [
-                OperationInterface::OPERATION_KEY => 3,
+                OperationInterface::ID => 3,
                 OperationInterface::STATUS => OperationInterface::STATUS_TYPE_OPEN,
                 'started_at' => null,
             ]

lib/internal/Magento/Framework/Bulk/OperationInterface.php

@@ -15,25 +15,24 @@ interface OperationInterface extends \Magento\Framework\Api\ExtensibleDataInterf
     /**#@+
      * Constants for keys of data array. Identical to the name of the getter in snake case
      */
-    public const ID = 'id';
-    public const BULK_ID = 'bulk_uuid';
-    public const TOPIC_NAME = 'topic_name';
-    public const SERIALIZED_DATA = 'serialized_data';
-    public const RESULT_SERIALIZED_DATA = 'result_serialized_data';
-    public const OPERATION_KEY = 'operation_key';
-    public const STATUS = 'status';
-    public const RESULT_MESSAGE = 'result_message';
-    public const ERROR_CODE = 'error_code';
+    const ID = 'operation_key';
+    const BULK_ID = 'bulk_uuid';
+    const TOPIC_NAME = 'topic_name';
+    const SERIALIZED_DATA = 'serialized_data';
+    const RESULT_SERIALIZED_DATA = 'result_serialized_data';
+    const STATUS = 'status';
+    const RESULT_MESSAGE = 'result_message';
+    const ERROR_CODE = 'error_code';
     /**#@-*/
 
     /**#@+
      * Status types
      */
-    public const STATUS_TYPE_COMPLETE = 1;
-    public const STATUS_TYPE_RETRIABLY_FAILED = 2;
-    public const STATUS_TYPE_NOT_RETRIABLY_FAILED = 3;
-    public const STATUS_TYPE_OPEN = 4;
-    public const STATUS_TYPE_REJECTED = 5;
+    const STATUS_TYPE_COMPLETE = 1;
+    const STATUS_TYPE_RETRIABLY_FAILED = 2;
+    const STATUS_TYPE_NOT_RETRIABLY_FAILED = 3;
+    const STATUS_TYPE_OPEN = 4;
+    const STATUS_TYPE_REJECTED = 5;
     /**#@-*/
 
     /**
@@ -173,21 +172,4 @@ public function getErrorCode();
      * @since 103.0.0
      */
     public function setErrorCode($errorCode);
-
-    /**
-     * Get operation key
-     *
-     * @return int|null
-     * @since 103.0.1
-     */
-    public function getOperationKey(): ?int;
-
-    /**
-     * Set operation key
-     *
-     * @param int|null $operationKey
-     * @return $this
-     * @since 103.0.1
-     */
-    public function setOperationKey(?int $operationKey): self;
 }