Refactor KeyCheckWorker::proccessTaskStrategy() to use Doctrine

Replaces all instances of ScheduledTask with ScheduledTaskEntity

[MAILPOET-3843]

lib/Cron/Workers/KeyCheck/KeyCheckWorker.php

@@ -3,6 +3,7 @@
 namespace MailPoet\Cron\Workers\KeyCheck;
 
 use MailPoet\Cron\Workers\SimpleWorker;
+use MailPoet\Entities\ScheduledTaskEntity;
 use MailPoet\Models\ScheduledTask;
 use MailPoet\Services\Bridge;
 use MailPoetVendor\Carbon\Carbon;
@@ -16,7 +17,7 @@ abstract class KeyCheckWorker extends SimpleWorker {
     }
   }
 
-  public function processTaskStrategy(ScheduledTask $task, $timer) {
+  public function processTaskStrategy(ScheduledTaskEntity $task, $timer) {
     try {
       $result = $this->checkKey();
     } catch (\Exception $e) {
@@ -24,7 +25,10 @@ abstract class KeyCheckWorker extends SimpleWorker {
     }
 
     if (empty($result['code']) || $result['code'] == Bridge::CHECK_ERROR_UNAVAILABLE) {
-      $task->rescheduleProgressively();
+      $parisTask = ScheduledTask::getFromDoctrineEntity($task);
+      if ($parisTask) {
+        $parisTask->rescheduleProgressively();
+      }
       return false;
     }
 

tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php

@@ -3,23 +3,31 @@
 namespace MailPoet\Test\Cron\Workers\KeyCheck;
 
 use Codeception\Stub;
-use Codeception\Stub\Expected;
 use MailPoet\Cron\Workers\KeyCheck\KeyCheckWorkerMockImplementation as MockKeyCheckWorker;
-use MailPoet\Models\ScheduledTask;
+use MailPoet\Entities\ScheduledTaskEntity;
+use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
 use MailPoet\Services\Bridge;
 use MailPoet\Settings\SettingsRepository;
+use MailPoet\Test\DataFactories\ScheduledTask as ScheduledTaskFactory;
 use MailPoet\WP\Functions as WPFunctions;
 use MailPoetVendor\Carbon\Carbon;
-use MailPoetVendor\Idiorm\ORM;
 
 require_once('KeyCheckWorkerMockImplementation.php');
 
 class KeyCheckWorkerTest extends \MailPoetTest {
   public $worker;
 
+  /** @var ScheduledTaskFactory */
+  private $scheduledTaskFactory;
+
+  /** @var ScheduledTasksRepository */
+  private $scheduledTasksRepository;
+
   public function _before() {
     parent::_before();
+    $this->scheduledTaskFactory = new ScheduledTaskFactory();
     $this->worker = new MockKeyCheckWorker();
+    $this->scheduledTasksRepository = $this->diContainer->get(ScheduledTasksRepository::class);
   }
 
   public function testItCanInitializeBridgeAPI() {
@@ -43,13 +51,21 @@ class KeyCheckWorkerTest extends \MailPoetTest {
       ],
       $this
     );
-    $task = Stub::make(
+    $currentTime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
-      ScheduledTask::class,
+    $task = $this->createRunningTask($currentTime);
-      ['rescheduleProgressively' => Expected::once()],
-      $this
-    );
     $result = $worker->processTaskStrategy($task, microtime(true));
-    expect($result)->false();
+
+    // need to clear Doctrine cache and get the entity again while ScheduledTask::rescheduleProgressively() is not migrated to Doctrine
+    $this->entityManager->clear();
+    $task = $this->scheduledTasksRepository->findOneById($task->getId());
+
+    assert($task instanceof ScheduledTaskEntity);
+    assert($task->getScheduledAt() instanceof \DateTimeInterface);
+    $newScheduledAtTime = $currentTime->addMinutes(5)->format('Y-m-d H:i:s');
+    $scheduledAt = $task->getScheduledAt()->format('Y-m-d H:i:s');
+    $this->assertFalse($result);
+    $this->assertSame($newScheduledAtTime, $scheduledAt);
+    $this->assertSame(1, $task->getRescheduleCount());
   }
 
   public function testItReschedulesCheckOnError() {
@@ -60,13 +76,23 @@ class KeyCheckWorkerTest extends \MailPoetTest {
       ],
       $this
     );
-    $task = Stub::make(
+
-      ScheduledTask::class,
+    $currentTime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
-      ['rescheduleProgressively' => Expected::once()],
+    $task = $this->createRunningTask($currentTime);
-      $this
+
-    );
     $result = $worker->processTaskStrategy($task, microtime(true));
-    expect($result)->false();
+
+    // need to clear Doctrine cache and get the entity again while ScheduledTask::rescheduleProgressively() is not migrated to Doctrine
+    $this->entityManager->clear();
+    $task = $this->scheduledTasksRepository->findOneById($task->getId());
+
+    assert($task instanceof ScheduledTaskEntity);
+    assert($task->getScheduledAt() instanceof \DateTimeInterface);
+    $newScheduledAtTime = $currentTime->addMinutes(5)->format('Y-m-d H:i:s');
+    $scheduledAt = $task->getScheduledAt()->format('Y-m-d H:i:s');
+    $this->assertFalse($result);
+    $this->assertSame($newScheduledAtTime, $scheduledAt);
+    $this->assertSame(1, $task->getRescheduleCount());
   }
 
   public function testItNextRunIsNextDay(): void {
@@ -94,17 +120,20 @@ class KeyCheckWorkerTest extends \MailPoetTest {
     expect($nextRunDate->diffInSeconds($dateTime))->lessOrEquals(21600 + $secondsToMidnight);
   }
 
-  private function createRunningTask() {
+  private function createRunningTask(Carbon $scheduledAt = null) {
-    $task = ScheduledTask::create();
+    if (!$scheduledAt) {
-    $task->type = MockKeyCheckWorker::TASK_TYPE;
+      $scheduledAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
-    $task->status = null;
+    }
-    $task->scheduledAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
+
-    $task->save();
+    return $this->scheduledTaskFactory->create(
-    return $task;
+      MockKeyCheckWorker::TASK_TYPE,
+      null,
+      $scheduledAt
+    );
   }
 
   public function _after() {
     $this->diContainer->get(SettingsRepository::class)->truncate();
-    ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
+    $this->truncateEntity(ScheduledTaskEntity::class);
   }
 }