fix(message-order): consume message by creation order (fifo) (#362)

sonata-project · Feb 9, 2019 · 24edcdb · 24edcdb
1 parent fbbea65
commit 24edcdb
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/src/Iterator/MessageManagerMessageIterator.php b/src/Iterator/MessageManagerMessageIterator.php
@@ -123,7 +123,7 @@ protected function setCurrent(): void
             $this->bufferize($this->types);
         }
 
-        $this->current = array_pop($this->buffer);
+        $this->current = array_shift($this->buffer);
     }
 
     /**

diff --git a/tests/Entity/MessageManagerTest.php b/tests/Entity/MessageManagerTest.php
@@ -151,6 +151,21 @@ public function testGetPagerWithInProgressMessages(): void
             ->getPager(['state' => MessageInterface::STATE_IN_PROGRESS], 1);
     }
 
+    public function testFindByTypes(): void
+    {
+        $this
+            ->getMessageManager(function ($qb): void {
+                $qb->expects($this->never())->method('andWhere');
+                $qb->expects($this->once())->method('where')->willReturnSelf();
+                $qb->expects($this->once())->method('setParameters')
+                    ->with(['state' => MessageInterface::STATE_OPEN]);
+                $qb->expects($this->once())->method('orderBy')->with(
+                    $this->equalTo('m.createdAt')
+                )->willReturnSelf();
+            })
+            ->findByTypes([], MessageInterface::STATE_OPEN, 10);
+    }
+
     /**
      * @return MessageManagerMock
      */

diff --git a/tests/Iterator/MessageManagerMessageIteratorTest.php b/tests/Iterator/MessageManagerMessageIteratorTest.php
@@ -15,6 +15,9 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
+use Sonata\NotificationBundle\Iterator\MessageManagerMessageIterator as MessageManagerMessageIteratorObject;
+use Sonata\NotificationBundle\Model\Message;
+use Sonata\NotificationBundle\Model\MessageManagerInterface;
 
 /**
  * @author Kevin Nedelec <kevin.nedelec@ekino.com>
@@ -77,4 +80,27 @@ public function testLongForeach(): void
             }
         }
     }
+
+    public function testMessageConsumptionOrder(): void
+    {
+        $now = new \DateTime();
+        $olderDate = (clone $now)->modify('-1 hour');
+        $oldMessage = new Message();
+        $oldMessage->setCreatedAt($olderDate);
+        $oldMessage->setType('older.message');
+
+        $newMessage = new Message();
+        $newMessage->setCreatedAt($now);
+        $newMessage->setType('newer.message');
+
+        $messageManager = $this->createMock(MessageManagerInterface::class);
+        $messageManager->expects($this->once())->method('findByTypes')->willReturn([$oldMessage, $newMessage]);
+
+        $iterator = new MessageManagerMessageIteratorObject($messageManager, [], 500000, 2);
+
+        $iterator->next();
+        $this->assertSame($oldMessage, $iterator->current());
+        $iterator->next();
+        $this->assertSame($newMessage, $iterator->current());
+    }
 }