Check queue name on message pick

renatocason · Jul 20, 2018 · dc3b64d · dc3b64d
1 parent bfbd8d8
commit dc3b64d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Api/QueueMessageRepositoryInterface.php b/Api/QueueMessageRepositoryInterface.php
@@ -22,9 +22,10 @@ public function create(QueueMessageInterface $message);
     /**
      * Take first element in the queue without removing it
      * 
+     * @param string $queueName
      * @return \Rcason\MqMysql\Api\Data\QueueMessageInterface
      */
-    public function peek();
+    public function peek(string $queueName);
 
     /**
      * Get message by id

diff --git a/Model/MysqlBroker.php b/Model/MysqlBroker.php
@@ -67,7 +67,7 @@ public function enqueue(MessageEnvelopeInterface $messageEnvelope)
      */
     public function peek()
     {
-        $queueMessage = $this->queueMessageRepository->peek();
+        $queueMessage = $this->queueMessageRepository->peek($this->queueName);
         if(!$queueMessage || !$queueMessage->getId()) {
             return false;
         }

diff --git a/Model/Queue/MessageRepository.php b/Model/Queue/MessageRepository.php
@@ -63,11 +63,12 @@ public function create(QueueMessageInterface $message)
     /**
      * @inheritdoc
      */
-    public function peek()
+    public function peek(string $queueName)
     {
         // Create collection instance and apply filter
         $collection = $this->collectionFactory->create()
             ->addFieldToFilter('status', 0)
+            ->addFieldToFilter('queue_name', $queueName)
             ->setOrder('updated_at', 'ASC')
             ->setCurPage(1)
             ->setPageSize(1);

diff --git a/Test/Unit/Model/Queue/MessageRepositoryTest.php b/Test/Unit/Model/Queue/MessageRepositoryTest.php
@@ -15,6 +15,7 @@
 
 class MessageRepositoryTest extends \PHPUnit\Framework\TestCase
 {
+    const QUEUE_NAME = 'test';
     const MAX_RETRIES = 5;
     const MESSAGE_ID = 7;
 
@@ -118,7 +119,7 @@ public function testPeek()
             ->willReturn($this->collection);
 
         $this->assertEquals(
-            $this->messageRepository->peek(),
+            $this->messageRepository->peek(self::QUEUE_NAME),
             $this->message
         );
     }