Move SQL queries from SimpleWorker to model, improve naming

[MAILPOET-2538]
This commit is contained in:
Jan Jakeš
2019-11-19 10:31:35 +01:00
committed by Jack Kitterhing
parent 4e8165c4b4
commit ba41f4901e
4 changed files with 49 additions and 58 deletions

View File

@ -160,4 +160,44 @@ class ScheduledTask extends Model {
->whereNull('tasks.deleted_at')
->findOne() ?: null;
}
static function findDueByType($type, $limit = null) {
return self::findByTypeAndStatus($type, ScheduledTask::STATUS_SCHEDULED, $limit);
}
static function findRunningByType($type, $limit = null) {
return self::findByTypeAndStatus($type, null, $limit);
}
static function findFutureScheduledByType($type, $limit = null) {
return self::findByTypeAndStatus($type, ScheduledTask::STATUS_SCHEDULED, $limit, true);
}
static function findCompletedByType($type, $limit = null) {
return self::findByTypeAndStatus($type, ScheduledTask::STATUS_COMPLETED, $limit);
}
private static function findByTypeAndStatus($type, $status, $limit = null, $future = false) {
$query = ScheduledTask::where('type', $type)
->whereNull('deleted_at');
$now = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
if ($future) {
$query->whereGt('scheduled_at', $now);
} else {
$query->whereLte('scheduled_at', $now);
}
if ($status === null) {
$query->whereNull('status');
} else {
$query->where('status', $status);
}
if ($limit !== null) {
$query->limit($limit);
}
return $query->findMany();
}
}