Refactor pause/resume to doctrine
[MAILPOET-3876]
This commit is contained in:
@ -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([
|
||||
|
Reference in New Issue
Block a user