Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add join on queues to scheduled tasks query

Browse Source 
[MAILPOET-1471]
This commit is contained in:
Jan Jakeš
2018-08-21 21:48:47 +02:00
parent 54629b7690
commit a08ed493cf
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Tasks/Sending.php
View File

@ -224,12 +224,15 @@ class Sending {
} }
static function getScheduledQueues($amount = self::RESULT_BATCH_SIZE) { static function getScheduledQueues($amount = self::RESULT_BATCH_SIZE) {
$tasks = ScheduledTask::where('status', ScheduledTask::STATUS_SCHEDULED) $tasks = ScheduledTask::table_alias('tasks')
->whereNull('deleted_at') ->select('tasks.*')
->whereLte('scheduled_at', Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp'))) ->join(SendingQueue::$_table, 'tasks.id = queues.task_id', 'queues')
->where('type', 'sending') ->whereNull('tasks.deleted_at')
->whereNotEqual('status', ScheduledTask::STATUS_PAUSED) ->where('tasks.status', ScheduledTask::STATUS_SCHEDULED)
->orderByAsc('updated_at') ->whereLte('tasks.scheduled_at', Carbon::createFromTimestamp(WPFunctions::currentTime('timestamp')))
->where('tasks.type', 'sending')
->whereNotEqual('tasks.status', ScheduledTask::STATUS_PAUSED)
->orderByAsc('tasks.updated_at')
->limit($amount) ->limit($amount)
->findMany(); ->findMany();
$result = array(); $result = array();