Fix ability to query bulk operations across multiple bulk_uuid values (broken by 2.4 release)

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

@@ -168,7 +168,7 @@ public function retryBulk($bulkUuid, array $errorCodes)
                     $currentBatchSize = 0;
                 }
                 $currentBatchSize++;
-                $operationIds[] = $operation->getId();
+                $operationIds[] = $operation->getOperationKey();
             }
             // remove operations from the last batch
             if (!empty($operationIds)) {

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

@@ -162,6 +162,23 @@ public function setErrorCode($errorCode)
         return $this->setData(self::ERROR_CODE, $errorCode);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getOperationKey()
+    {
+        return $this->getData(self::OPERATION_KEY);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setOperationKey(int $operationKey)
+    {
+        $this->setData(self::OPERATION_KEY, $operationKey);
+        return $this;
+    }
+
     /**
      * Retrieve existing extension attributes object.
      *

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

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

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

@@ -215,7 +215,7 @@ public function testRetryBulk()
         $operation = $this->getMockForAbstractClass(OperationInterface::class);
         $operationCollection->expects($this->once())->method('getItems')->willReturn([$operation]);
         $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
-        $operation->expects($this->once())->method('getId')->willReturn($operationId);
+        $operation->expects($this->once())->method('getOperationKey')->willReturn($operationId);
         $this->resourceConnection->expects($this->once())
             ->method('getTableName')->with($operationTable)->willReturn($operationTable);
         $connection->expects($this->at(1))
@@ -265,7 +265,7 @@ public function testRetryBulkWithException()
         $operation = $this->getMockForAbstractClass(OperationInterface::class);
         $operationCollection->expects($this->once())->method('getItems')->willReturn([$operation]);
         $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
-        $operation->expects($this->once())->method('getId')->willReturn($operationId);
+        $operation->expects($this->once())->method('getOperationKey')->willReturn($operationId);
         $this->resourceConnection->expects($this->once())
             ->method('getTableName')->with($operationTable)->willReturn($operationTable);
         $connection->expects($this->at(1))

dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php

@@ -121,4 +121,52 @@ public function testGetList()
             $this->assertEquals('bulk-uuid-searchable-6', $item['bulk_uuid']);
         }
     }
+
+    /**
+     * @magentoApiDataFixture Magento/AsynchronousOperations/_files/operation_searchable.php
+     */
+    public function testGetMultipleBulkUuids()
+    {
+        $searchCriteria = [
+            'searchCriteria' => [
+                'filter_groups' => [
+                    [
+                        'filters' => [
+                            [
+                                'field' => 'status',
+                                'value' => OperationInterface::STATUS_TYPE_COMPLETE,
+                                'condition_type' => 'eq',
+                            ],
+                        ],
+                    ],
+                ],
+                'current_page' => 1,
+            ],
+        ];
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria),
+                'httpMethod' => Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'operation' => self::SERVICE_NAME . 'GetList',
+            ],
+        ];
+
+        $response = $this->_webApiCall($serviceInfo, $searchCriteria);
+
+        $this->assertArrayHasKey('search_criteria', $response);
+        $this->assertArrayHasKey('total_count', $response);
+        $this->assertArrayHasKey('items', $response);
+
+        $this->assertEquals($searchCriteria['searchCriteria'], $response['search_criteria']);
+        $this->assertEquals(2, $response['total_count']);
+        $this->assertCount(2, $response['items']);
+
+        foreach ($response['items'] as $item) {
+            $this->assertEquals('0', $item['operation_key']);
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php

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

dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php

@@ -89,6 +89,15 @@
         'result_message' => '',
         'operation_key' => 5
     ],
+    [
+        'bulk_uuid' => 'bulk-uuid-searchable-6-1',
+        'topic_name' => 'topic-5',
+        'serialized_data' => json_encode(['entity_id' => 5]),
+        'status' => OperationInterface::STATUS_TYPE_COMPLETE,
+        'error_code' => null,
+        'result_message' => '',
+        'operation_key' => 0
+    ],
 ];
 
 $bulkQuery = "INSERT INTO {$bulkTable} (`uuid`, `user_id`, `description`, `operation_count`, `start_time`)"

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

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