ACP2E-3387: [Cloud] Magento: queue message has been deleted

Author: aplapana

app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php

@@ -173,8 +173,9 @@ public function deleteMarkedMessages(): void
 
         $select = $connection->select()
             ->from(['queue_message_status' => $this->getMessageStatusTable()], ['message_id'])
-            ->where('status = ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED);
-        $connection->delete($this->getMessageTable(), 'id IN (' . $select->assemble() . ')');
+            ->where('status <> ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->distinct();
+        $connection->delete($this->getMessageTable(), 'id NOT IN (' . $select->assemble() . ')');
     }
 
     /**

app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php

@@ -286,16 +286,17 @@ function ($arg1, $arg2) use ($tableNames) {
         $select->expects($this->once())
             ->method('from')->with(['queue_message_status' => $tableNames[0]], ['message_id'])->willReturnSelf();
         $select->expects($this->once())->method('where')
-            ->with('status = ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->with('status <> ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
             ->willReturnSelf();
+        $select->expects($this->once())->method('distinct')->willReturnSelf();
         $select->expects($this->once())
             ->method('assemble')
             ->willReturn('SELECT message_id FROM queue_message_status WHERE status = 7');
 
         $connection->expects($this->once())->method('delete')
             ->with(
                 $tableNames[1],
-                'id IN (SELECT message_id FROM queue_message_status WHERE status = 7)'
+                'id NOT IN (SELECT message_id FROM queue_message_status WHERE status = 7)'
             )->willReturn(2);
         $this->queue->deleteMarkedMessages();
     }