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

Add factory method to create ScheduledTasks

Browse Source 
[MAILPOET-2996]
This commit is contained in:
Rodrigo Primo
2021-09-22 12:19:00 -03:00
committed by Veljko V
parent e69a3f9a53
commit 7d87b042e8
2 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/DataFactories/ScheduledTask.php
View File

@@ -8,10 +8,21 @@ use MailPoet\Cron\Workers\SendingQueue\Migration;
use MailPoet\Cron\Workers\SubscriberLinkTokens; use MailPoet\Cron\Workers\SubscriberLinkTokens;
use MailPoet\Cron\Workers\UnsubscribeTokens; use MailPoet\Cron\Workers\UnsubscribeTokens;
use MailPoet\Cron\Workers\WooCommercePastOrders; use MailPoet\Cron\Workers\WooCommercePastOrders;
use MailPoet\DI\ContainerWrapper;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon; use MailPoetVendor\Carbon\Carbon;
use MailPoetVendor\Doctrine\ORM\EntityManager;
class ScheduledTask { class ScheduledTask {
private $diContainer;
private $entityManager;
public function __construct() {
$this->diContainer = ContainerWrapper::getInstance();
$this->entityManager = $this->diContainer->get(EntityManager::class);
}
public function deleteAll() { public function deleteAll() {
$tasks = \MailPoet\Models\ScheduledTask::findMany(); $tasks = \MailPoet\Models\ScheduledTask::findMany();
foreach ($tasks as $task) { foreach ($tasks as $task) {
@@ -19,6 +30,22 @@ class ScheduledTask {
} }
} }
public function create(string $type, ?string $status, \DateTimeInterface $scheduledAt, \DateTimeInterface $deletedAt = null) {
$task = new ScheduledTaskEntity();
$task->setType($type);
$task->setStatus($status);
$task->setScheduledAt($scheduledAt);
if ($deletedAt) {
$task->setDeletedAt($deletedAt);
}
$this->entityManager->persist($task);
$this->entityManager->flush();
return $task;
}
/** /**
* Reschedules tasks created after plugin activation so that they don't block cron tasks in tests * Reschedules tasks created after plugin activation so that they don't block cron tasks in tests
*/ */

49
tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php
View File

@@ -3,25 +3,30 @@
namespace MailPoet\Newsletter\Sending; namespace MailPoet\Newsletter\Sending;
use MailPoet\Entities\ScheduledTaskEntity; use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Test\DataFactories\ScheduledTask as ScheduledTaskFactory;
use MailPoetVendor\Carbon\Carbon; use MailPoetVendor\Carbon\Carbon;
class ScheduledTasksRepositoryTest extends \MailPoetTest { class ScheduledTasksRepositoryTest extends \MailPoetTest {
/** @var ScheduledTasksRepository */ /** @var ScheduledTasksRepository */
private $repository; private $repository;
/** @var ScheduledTaskFactory */
private $scheduledTaskFactory;
public function _before() { public function _before() {
parent::_before(); parent::_before();
$this->cleanup(); $this->cleanup();
$this->repository = $this->diContainer->get(ScheduledTasksRepository::class); $this->repository = $this->diContainer->get(ScheduledTasksRepository::class);
$this->scheduledTaskFactory = new ScheduledTaskFactory();
} }
public function testItCanGetDueTasks() { public function testItCanGetDueTasks() {
$this->createScheduledTask('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay(), Carbon::now()); // deleted (should not be fetched) $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay(), Carbon::now()); // deleted (should not be fetched)
$this->createScheduledTask('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->addDay()); // scheduled in future (should not be fetched) $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->addDay()); // scheduled in future (should not be fetched)
$this->createScheduledTask('test', '', Carbon::now()->subDay()); // wrong status (should not be fetched) $this->scheduledTaskFactory->create('test', '', Carbon::now()->subDay()); // wrong status (should not be fetched)
$expectedResult[] = $this->createScheduledTask('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay()); // due (scheduled in past) $expectedResult[] = $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay()); // due (scheduled in past)
$expectedResult[] = $this->createScheduledTask('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay()); // due (scheduled in past) $expectedResult[] = $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay()); // due (scheduled in past)
$this->createScheduledTask('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay()); // due (scheduled in past) $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay()); // due (scheduled in past)
$tasks = $this->repository->findDueByType('test', 2); $tasks = $this->repository->findDueByType('test', 2);
$this->assertCount(2, $tasks); $this->assertCount(2, $tasks);
@@ -29,20 +34,20 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
} }
public function testItCanGetRunningTasks() { public function testItCanGetRunningTasks() {
$expectedResult[] = $this->createScheduledTask('test', null, Carbon::now()->subDay()); // running (scheduled in past) $expectedResult[] = $this->scheduledTaskFactory->create('test', null, Carbon::now()->subDay()); // running (scheduled in past)
$this->createScheduledTask('test', null, Carbon::now()->subDay(), Carbon::now()); // deleted (should not be fetched) $this->scheduledTaskFactory->create('test', null, Carbon::now()->subDay(), Carbon::now()); // deleted (should not be fetched)
$this->createScheduledTask('test', null, Carbon::now()->addDay()); // scheduled in future (should not be fetched) $this->scheduledTaskFactory->create('test', null, Carbon::now()->addDay()); // scheduled in future (should not be fetched)
$this->createScheduledTask('test', ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->subDay()); // wrong status (should not be fetched) $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->subDay()); // wrong status (should not be fetched)
$tasks = $this->repository->findRunningByType('test', 10); $tasks = $this->repository->findRunningByType('test', 10);
$this->assertSame($expectedResult, $tasks); $this->assertSame($expectedResult, $tasks);
} }
public function testItCanGetCompletedTasks() { public function testItCanGetCompletedTasks() {
$expectedResult[] = $this->createScheduledTask('test', ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->subDay()); // completed (scheduled in past) $expectedResult[] = $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->subDay()); // completed (scheduled in past)
$this->createScheduledTask('test', ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->subDay(), Carbon::now()); // deleted (should not be fetched) $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->subDay(), Carbon::now()); // deleted (should not be fetched)
$this->createScheduledTask('test', ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay()); // scheduled in future (should not be fetched) $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay()); // scheduled in future (should not be fetched)
$this->createScheduledTask('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay()); // wrong status (should not be fetched) $this->scheduledTaskFactory->create('test', ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->subDay()); // wrong status (should not be fetched)
$tasks = $this->repository->findCompletedByType('test', 10); $tasks = $this->repository->findCompletedByType('test', 10);
$this->assertSame($expectedResult, $tasks); $this->assertSame($expectedResult, $tasks);
@@ -51,20 +56,4 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
public function cleanup() { public function cleanup() {
$this->truncateEntity(ScheduledTaskEntity::class); $this->truncateEntity(ScheduledTaskEntity::class);
} }
private function createScheduledTask(string $type, ?string $status, \DateTimeInterface $scheduledAt, \DateTimeInterface $deletedAt = null) {
$task = new ScheduledTaskEntity();
$task->setType($type);
$task->setStatus($status);
$task->setScheduledAt($scheduledAt);
if ($deletedAt) {
$task->setDeletedAt($deletedAt);
}
$this->entityManager->persist($task);
$this->entityManager->flush();
return $task;
}
} }