Merge pull request #50 from chadicus/master

Fix millisecond / max int / second issue

Author: chadicus

src/Queue.php

@@ -13,7 +13,12 @@
  */
 final class Queue implements QueueInterface
 {
-    const MONGO_INT32_MAX = 2147483647;//2147483648 can overflow in php mongo without using the MongoInt64
+    /**
+     * Maximum millisecond value to use for UTCDateTime creation.
+     *
+     * @var integer
+     */
+    const MONGO_INT32_MAX = PHP_INT_MAX;
 
     /**
      * mongo collection to use for queue.
@@ -178,7 +183,9 @@ public function get(array $query, $runningResetDuration, $waitDurationInMillis =
             $resetTimestamp = $runningResetDuration > 0 ? self::MONGO_INT32_MAX : 0;
         }
 
-        $update = ['$set' => ['resetTimestamp' => new \MongoDB\BSON\UTCDateTime($resetTimestamp * 1000), 'running' => true]];
+        $resetTimestamp = min(max(0, $resetTimestamp * 1000), self::MONGO_INT32_MAX);
+
+        $update = ['$set' => ['resetTimestamp' => new \MongoDB\BSON\UTCDateTime($resetTimestamp), 'running' => true]];
         $options = ['sort' => ['priority' => 1, 'created' => 1]];
 
         //ints overflow to floats, should be fine
@@ -388,13 +395,13 @@ public function send(array $payload, $earliestGet = 0, $priority = 0.0)
         }
 
         //Ensure $earliestGet is between 0 and MONGO_INT32_MAX
-        $earliestGet = min(max(0, $earliestGet), self::MONGO_INT32_MAX);
+        $earliestGet = min(max(0, $earliestGet * 1000), self::MONGO_INT32_MAX);
 
         $message = [
             'payload' => $payload,
             'running' => false,
-            'resetTimestamp' => new \MongoDB\BSON\UTCDateTime(self::MONGO_INT32_MAX * 1000),
-            'earliestGet' => new \MongoDB\BSON\UTCDateTime($earliestGet * 1000),
+            'resetTimestamp' => new \MongoDB\BSON\UTCDateTime(self::MONGO_INT32_MAX),
+            'earliestGet' => new \MongoDB\BSON\UTCDateTime($earliestGet),
             'priority' => $priority,
             'created' => new \MongoDB\BSON\UTCDateTime((int)(microtime(true) * 1000)),
         ];

tests/QueueTest.php

@@ -2,6 +2,8 @@
 
 namespace DominionEnterprises\Mongo;
 
+use MongoDB\BSON\UTCDateTime;
+
 /**
  * @coversDefaultClass \DominionEnterprises\Mongo\Queue
  * @covers ::<private>
@@ -603,6 +605,26 @@ public function ackSend()
         $this->assertSame($expected, $actual);
     }
 
+    /**
+     * Verify earliestGet with ackSend.
+     *
+     * @test
+     * @covers ::ackSend
+     *
+     * @return void
+     */
+    public function ackSendWithEarliestGet()
+    {
+        $message = ['key1' => 0, 'key2' => true];
+        $this->queue->send($message);
+        $result = $this->queue->get([], PHP_INT_MAX, 0);
+        $this->assertSame($message['key1'], $result['key1']);
+        $this->assertSame($message['key2'], $result['key2']);
+        $this->queue->ackSend($result, ['key1' => 1, 'key2' => 2], strtotime('+ 1 day'));
+        $actual = $this->queue->get([], PHP_INT_MAX, 0);
+        $this->assertNull($actual);
+    }
+
     /**
      * @test
      * @covers ::ackSend
@@ -765,7 +787,7 @@ public function send()
         $expected = [
             'payload' => $payload,
             'running' => false,
-            'resetTimestamp' => Queue::MONGO_INT32_MAX,
+            'resetTimestamp' => (new UTCDateTime(Queue::MONGO_INT32_MAX))->toDateTime()->getTimestamp(),
             'earliestGet' => 34,
             'priority' => 0.8,
         ];
@@ -823,8 +845,8 @@ public function sendWithHighEarliestGet()
         $expected = [
             'payload' => [],
             'running' => false,
-            'resetTimestamp' => Queue::MONGO_INT32_MAX,
-            'earliestGet' => Queue::MONGO_INT32_MAX,
+            'resetTimestamp' => (new UTCDateTime(Queue::MONGO_INT32_MAX))->toDateTime()->getTimestamp(),
+            'earliestGet' => (new UTCDateTime(Queue::MONGO_INT32_MAX))->toDateTime()->getTimestamp(),
             'priority' => 0.0,
         ];
 
@@ -851,7 +873,7 @@ public function sendWithLowEarliestGet()
         $expected = [
             'payload' => [],
             'running' => false,
-            'resetTimestamp' => Queue::MONGO_INT32_MAX,
+            'resetTimestamp' => (new UTCDateTime(Queue::MONGO_INT32_MAX))->toDateTime()->getTimestamp(),
             'earliestGet' => 0,
             'priority' => 0.0,
         ];
@@ -889,7 +911,7 @@ public function constructWithCollection()
         $expected = [
             'payload' => $payload,
             'running' => false,
-            'resetTimestamp' => Queue::MONGO_INT32_MAX,
+            'resetTimestamp' => (new UTCDateTime(Queue::MONGO_INT32_MAX))->toDateTime()->getTimestamp(),
             'earliestGet' => 34,
             'priority' => 0.8,
         ];