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

PR feedback adjustments

Browse Source 
[MAILPOET-4355]
This commit is contained in:
Sam Najian
2022-08-18 10:15:32 +02:00
committed by Veljko V
parent 18b1d9799f
commit e3b02a9a64
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mailpoet/lib/Newsletter/Sending/ScheduledTasksRepository.php
View File

@@ -174,20 +174,20 @@ class ScheduledTasksRepository extends Repository {
$tasksQuery = $this->doctrineRepository->createQueryBuilder('st')
->select('st')
->where('st.deletedAt IS NULL')
->where('st.status IN (:statuses)')
->setParameter('statuses', $statuses)
->setMaxResults($limit);
->where('st.status IN (:statuses)');
if (in_array(ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING, $statuses)) {
$tasksQuery = $tasksQuery->orWhere('st.status IS NULL');
}
if ($type) {
$tasksQuery = $tasksQuery->andWhere('st.type = :type')
->setParameter('type', $type);
}
if (in_array(ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING, $statuses)) {
$tasksQuery = $tasksQuery->orWhere('st.status IS NULL');
}
return $tasksQuery
->setParameter('statuses', $statuses)
->setMaxResults($limit)
->getQuery()
->getResult();
}