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

Refactor pause/resume to doctrine

Browse Source 
[MAILPOET-3876]
This commit is contained in:
Pavel Dohnal
2021-11-04 10:43:55 +01:00
committed by Veljko V
parent f5614ed2bd
commit ee00f03ed3
2 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/API/JSON/v1/SendingQueue.php
View File

@ -8,10 +8,12 @@ use MailPoet\API\JSON\Response;
use MailPoet\Config\AccessControl;
use MailPoet\Cron\Triggers\WordPress;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue as SendingQueueModel;
use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Scheduler\Scheduler;
use MailPoet\Newsletter\Sending\SendingQueuesRepository;
use MailPoet\Segments\SubscribersFinder;
use MailPoet\Services\Bridge;
use MailPoet\Tasks\Sending as SendingTask;
@ -34,9 +36,13 @@ class SendingQueue extends APIEndpoint {
/** @var Bridge */
private $bridge;
/** @var SendingQueuesRepository */
private $sendingQueuesRepository;
public function __construct(
SubscribersFeature $subscribersFeature,
NewslettersRepository $newsletterRepository,
SendingQueuesRepository $sendingQueuesRepository,
Bridge $bridge,
SubscribersFinder $subscribersFinder
) {
@ -44,6 +50,7 @@ class SendingQueue extends APIEndpoint {
$this->subscribersFinder = $subscribersFinder;
$this->newsletterRepository = $newsletterRepository;
$this->bridge = $bridge;
$this->sendingQueuesRepository = $sendingQueuesRepository;
}
public function add($data = []) {
@ -65,7 +72,7 @@ class SendingQueue extends APIEndpoint {
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet'),
]);
}
$newsletterEntity = $this->newsletterRepository->findOneById($newsletter->id);
$newsletterEntity = $this->newsletterRepository->findOneById($newsletterId);
if (!$newsletterEntity instanceof NewsletterEntity) {
return $this->errorResponse([
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet'),
@ -177,20 +184,18 @@ class SendingQueue extends APIEndpoint {
? (int)$data['newsletter_id']
: false
);
$newsletter = Newsletter::findOne($newsletterId);
$newsletter = $this->newsletterRepository->findOneById($newsletterId);
if ($newsletter instanceof Newsletter) {
$queue = $newsletter->getQueue();
if ($newsletter instanceof NewsletterEntity) {
$queue = $newsletter->getLatestQueue();
if ($queue === false) {
if (!$queue instanceof SendingQueueEntity) {
return $this->errorResponse([
APIError::UNKNOWN => __('This newsletter has not been sent yet.', 'mailpoet'),
]);
} else {
$queue->pause();
return $this->successResponse(
$newsletter->getQueue()->asArray()
);
$this->sendingQueuesRepository->pause($queue);
return $this->successResponse();
}
} else {
return $this->errorResponse([
@ -209,19 +214,18 @@ class SendingQueue extends APIEndpoint {
? (int)$data['newsletter_id']
: false
);
$newsletter = Newsletter::findOne($newsletterId);
if ($newsletter instanceof Newsletter) {
$queue = $newsletter->getQueue();
$newsletter = $this->newsletterRepository->findOneById($newsletterId);
if ($queue === false) {
if ($newsletter instanceof NewsletterEntity) {
$queue = $newsletter->getLatestQueue();
if (!$queue instanceof SendingQueueEntity) {
return $this->errorResponse([
APIError::UNKNOWN => __('This newsletter has not been sent yet.', 'mailpoet'),
]);
} else {
$queue->resume();
return $this->successResponse(
$newsletter->getQueue()->asArray()
);
$this->sendingQueuesRepository->resume($queue);
return $this->successResponse();
}
} else {
return $this->errorResponse([

33
lib/Newsletter/Sending/SendingQueuesRepository.php
View File

@ -7,6 +7,7 @@ use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\SendingQueueEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Doctrine\ORM\EntityManager;
/**
@ -16,12 +17,17 @@ class SendingQueuesRepository extends Repository {
/** @var ScheduledTaskSubscribersRepository */
private $scheduledTaskSubscribersRepository;
/** @var WPFunctions */
private $wp;
public function __construct(
EntityManager $entityManager,
WPFunctions $wp,
ScheduledTaskSubscribersRepository $scheduledTaskSubscribersRepository
) {
parent::__construct($entityManager);
$this->scheduledTaskSubscribersRepository = $scheduledTaskSubscribersRepository;
$this->wp = $wp;
}
protected function getEntityClassName() {
@ -77,4 +83,31 @@ class SendingQueuesRepository extends Repository {
}
return $qb->getQuery()->getResult();
}
public function pause(SendingQueueEntity $queue): void {
if ($queue->getCountProcessed() !== $queue->getCountTotal()) {
$task = $queue->getTask();
if ($task instanceof ScheduledTaskEntity) {
$task->setStatus(ScheduledTaskEntity::STATUS_PAUSED);
$this->flush();
}
}
}
public function resume(SendingQueueEntity $queue): void {
$task = $queue->getTask();
if (!$task instanceof ScheduledTaskEntity) return;
if ($queue->getCountProcessed() === $queue->getCountTotal()) {
$task->setProcessedAt($this->wp->currentTime('mysql'));
$task->setStatus(ScheduledTaskEntity::STATUS_COMPLETED);
$this->flush();
} else {
$newsletter = $queue->getNewsletter();
if (!$newsletter instanceof NewsletterEntity) return;
$newsletter->setStatus(NewsletterEntity::STATUS_SENDING);
$task->setStatus(null);
$this->flush();
}
}
}