Cavemanon/piratepoet
8
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') $tasksQuery = $this->doctrineRepository->createQueryBuilder('st')
->select('st') ->select('st')
->where('st.deletedAt IS NULL') ->where('st.deletedAt IS NULL')
->where('st.status IN (:statuses)') ->where('st.status IN (:statuses)');
->setParameter('statuses', $statuses)
->setMaxResults($limit); if (in_array(ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING, $statuses)) {
$tasksQuery = $tasksQuery->orWhere('st.status IS NULL');
}
if ($type) { if ($type) {
$tasksQuery = $tasksQuery->andWhere('st.type = :type') $tasksQuery = $tasksQuery->andWhere('st.type = :type')
->setParameter('type', $type); ->setParameter('type', $type);
} }
if (in_array(ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING, $statuses)) {
$tasksQuery = $tasksQuery->orWhere('st.status IS NULL');
}
return $tasksQuery return $tasksQuery
->setParameter('statuses', $statuses)
->setMaxResults($limit)
->getQuery() ->getQuery()
->getResult(); ->getResult();
} }

7
mailpoet/tests/integration/AdminPages/HelpTest.php
View File

@@ -78,7 +78,7 @@ class HelpTest extends \MailPoetTest {
expect($data['newsletter']['preview_url'])->equals(null); expect($data['newsletter']['preview_url'])->equals(null);
} }
public function createNewSendingQueue(?ScheduledTaskEntity $task, ?NewsletterEntity $newsletter, $renderedSubject = null) { private function createNewSendingQueue(?ScheduledTaskEntity $task, ?NewsletterEntity $newsletter, $renderedSubject = null) {
$queue = new SendingQueueEntity(); $queue = new SendingQueueEntity();
if ($newsletter instanceof NewsletterEntity) { if ($newsletter instanceof NewsletterEntity) {
$queue->setNewsletter($newsletter); $queue->setNewsletter($newsletter);
@@ -100,8 +100,7 @@ class HelpTest extends \MailPoetTest {
} }
function _after() { function _after() {
parent::_after(); // TODO: Change the autogenerated stub parent::_after();
$this->cleanup(); $this->cleanup();
} }
}
}

1
mailpoet/tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php
View File

@@ -24,7 +24,6 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
public function _before() { public function _before() {
parent::_before(); parent::_before();
$this->cleanup();
$this->repository = $this->diContainer->get(ScheduledTasksRepository::class); $this->repository = $this->diContainer->get(ScheduledTasksRepository::class);
$this->scheduledTaskFactory = new ScheduledTaskFactory(); $this->scheduledTaskFactory = new ScheduledTaskFactory();
$this->sendingQueueFactory = new SendingQueue(); $this->sendingQueueFactory = new SendingQueue();