Rotate sending queues

This should prevent sending queues to be stuck when a newsletter cannot be send.

[MAILPOET-1391]

lib/Cron/Workers/SendingQueue/SendingQueue.php

@@ -34,6 +34,7 @@ class SendingQueue {
     $this->enforceSendingAndExecutionLimits();
     foreach(self::getRunningQueues() as $queue) {
       if(!$queue instanceof SendingTask) continue;
+      ScheduledTaskModel::touchAllByIds(array($queue->task_id));
 
       $newsletter = $this->newsletter_task->getNewsletterFromQueue($queue);
       if(!$newsletter) {

lib/Tasks/Sending.php

@@ -239,7 +239,7 @@ class Sending {
 
   static function getRunningQueues($amount = self::RESULT_BATCH_SIZE) {
     $tasks = ScheduledTask::orderByAsc('priority')
-      ->orderByAsc('created_at')
+      ->orderByAsc('updated_at')
       ->whereNull('deleted_at')
       ->whereNull('status')
       ->where('type', 'sending')

tests/unit/Cron/Workers/SendingQueue/SendingQueueTest.php

@@ -385,6 +385,26 @@ class SendingQueueTest extends \MailPoetTest {
     expect($statistics)->notEquals(false);
   }
 
+  function testItUpdatesUpdateTime() {
+    $originalUpdated = Carbon::createFromTimestamp(current_time('timestamp'))->subHours(5)->toDateTimeString();
+
+    $this->queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $this->queue->updated_at = $originalUpdated;
+    $this->queue->save();
+
+    $this->newsletter->type = Newsletter::TYPE_WELCOME;
+    $this->newsletter_segment->delete();
+
+    $sending_queue_worker = new SendingQueueWorker(
+      $timer = false,
+      Stub::makeEmpty(new MailerTask(), array(), $this)
+    );
+    $sending_queue_worker->process();
+
+    $newQueue = ScheduledTask::findOne($this->queue->task_id);
+    expect($newQueue->updated_at)->notEquals($originalUpdated);
+  }
+
   function testItCanProcessWelcomeNewsletters() {
     $this->newsletter->type = Newsletter::TYPE_WELCOME;
     $this->newsletter_segment->delete();
@@ -631,4 +651,4 @@ class SendingQueueTest extends \MailPoetTest {
     \ORM::raw_execute('TRUNCATE ' . NewsletterSegment::$_table);
     \ORM::raw_execute('TRUNCATE ' . StatisticsNewsletters::$_table);
   }
-}
+}

tests/unit/Tasks/SendingTest.php

@@ -195,6 +195,25 @@ class SendingTest extends \MailPoetTest {
     expect($queues[2]->task_id)->equals($sending2->id());
   }
 
+  function testItGetsBatchOfScheduledQueuesSortedByUpdatedTime() {
+    $this->_after();
+
+    $sending1 = $this->createNewSendingTask(['status' => null]);
+    $sending1->updated_at = '2017-05-04 14:00:00';
+    $sending1->save();
+    $sending2 = $this->createNewSendingTask(['status' => null]);
+    $sending2->updated_at = '2017-05-04 16:00:00';
+    $sending2->save();
+    $sending3 = $this->createNewSendingTask(['status' => null]);
+    $sending3->updated_at = '2017-05-04 15:00:00';
+    $sending3->save();
+
+    $queues = SendingTask::getRunningQueues(3);
+    expect($queues[0]->task_id)->equals($sending1->id());
+    expect($queues[1]->task_id)->equals($sending3->id());
+    expect($queues[2]->task_id)->equals($sending2->id());
+  }
+
   function createNewNewsletter() {
     $newsletter = Newsletter::create();
     $newsletter->type = Newsletter::TYPE_STANDARD;