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

Replace usage ScheduledTask::touchAllByIds with repository

Browse Source 
[MAILPOET-4309]
This commit is contained in:
Jan Lysý
2022-08-16 11:43:40 +02:00
committed by Veljko V
parent aa84ce66a6
commit fecb26b3b5
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mailpoet/lib/Cron/Workers/Scheduler.php
View File

@@ -11,7 +11,6 @@ use MailPoet\Entities\SegmentEntity;
use MailPoet\InvalidStateException; use MailPoet\InvalidStateException;
use MailPoet\Logging\LoggerFactory; use MailPoet\Logging\LoggerFactory;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
use MailPoet\Models\ScheduledTask;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberSegment; use MailPoet\Models\SubscriberSegment;
use MailPoet\Newsletter\NewslettersRepository; use MailPoet\Newsletter\NewslettersRepository;
@@ -367,7 +366,7 @@ class Scheduler {
$ids = array_map(function ($queue) { $ids = array_map(function ($queue) {
return $queue->taskId; return $queue->taskId;
}, $scheduledQueues); }, $scheduledQueues);
ScheduledTask::touchAllByIds($ids); $this->scheduledTasksRepository->touchAllByIds($ids);
} }
public static function getScheduledQueues() { public static function getScheduledQueues() {

2
mailpoet/lib/Cron/Workers/SendingQueue/SendingQueue.php
View File

@@ -134,7 +134,7 @@ class SendingQueue {
$this->startProgress($task); $this->startProgress($task);
try { try {
ScheduledTaskModel::touchAllByIds([$taskEntity->getId()]); $this->scheduledTasksRepository->touchAllByIds([$queue->taskId]);
$this->processSending($queue, (int)$timer); $this->processSending($queue, (int)$timer);
} catch (\Exception $e) { } catch (\Exception $e) {
$this->stopProgress($task); $this->stopProgress($task);

7
mailpoet/tests/integration/Cron/Workers/SchedulerTest.php
View File

@@ -617,6 +617,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [ $scheduler = Stub::make(Scheduler::class, [
'processWelcomeNewsletter' => Expected::exactly(1), 'processWelcomeNewsletter' => Expected::exactly(1),
'cronHelper' => $this->cronHelper, 'cronHelper' => $this->cronHelper,
'scheduledTasksRepository' => $this->scheduledTasksRepository,
], $this); ], $this);
$scheduler->process(); $scheduler->process();
} }
@@ -629,6 +630,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [ $scheduler = Stub::make(Scheduler::class, [
'processPostNotificationNewsletter' => Expected::exactly(1), 'processPostNotificationNewsletter' => Expected::exactly(1),
'cronHelper' => $this->cronHelper, 'cronHelper' => $this->cronHelper,
'scheduledTasksRepository' => $this->scheduledTasksRepository,
], $this); ], $this);
$scheduler->process(); $scheduler->process();
} }
@@ -641,6 +643,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [ $scheduler = Stub::make(Scheduler::class, [
'processScheduledStandardNewsletter' => Expected::exactly(1), 'processScheduledStandardNewsletter' => Expected::exactly(1),
'cronHelper' => $this->cronHelper, 'cronHelper' => $this->cronHelper,
'scheduledTasksRepository' => $this->scheduledTasksRepository,
], $this); ], $this);
$scheduler->process(); $scheduler->process();
} }
@@ -655,6 +658,7 @@ class SchedulerTest extends \MailPoetTest {
'cronHelper' => $this->make(CronHelper::class, [ 'cronHelper' => $this->make(CronHelper::class, [
'enforceExecutionLimit' => Expected::exactly(2), // call at start + during processing 'enforceExecutionLimit' => Expected::exactly(2), // call at start + during processing
]), ]),
'scheduledTasksRepository' => $this->scheduledTasksRepository,
], $this); ], $this);
$scheduler->process(); $scheduler->process();
} }
@@ -668,6 +672,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [ $scheduler = Stub::make(Scheduler::class, [
'processScheduledStandardNewsletter' => Expected::never(), 'processScheduledStandardNewsletter' => Expected::never(),
'cronHelper' => $this->cronHelper, 'cronHelper' => $this->cronHelper,
'scheduledTasksRepository' => $this->scheduledTasksRepository,
], $this); ], $this);
// scheduled job is not processed // scheduled job is not processed
$scheduler->process(); $scheduler->process();
@@ -682,6 +687,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [ $scheduler = Stub::make(Scheduler::class, [
'processScheduledStandardNewsletter' => Expected::once(), 'processScheduledStandardNewsletter' => Expected::once(),
'cronHelper' => $this->cronHelper, 'cronHelper' => $this->cronHelper,
'scheduledTasksRepository' => $this->scheduledTasksRepository,
], $this); ], $this);
// scheduled job is processed // scheduled job is processed
$scheduler->process(); $scheduler->process();
@@ -712,6 +718,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler = Stub::make(Scheduler::class, [ $scheduler = Stub::make(Scheduler::class, [
'processScheduledStandardNewsletter' => Expected::once(), 'processScheduledStandardNewsletter' => Expected::once(),
'cronHelper' => $this->cronHelper, 'cronHelper' => $this->cronHelper,
'scheduledTasksRepository' => $this->scheduledTasksRepository,
], $this); ], $this);
// scheduled job is processed // scheduled job is processed
$scheduler->process(); $scheduler->process();