Load the entity for validation
[MAILPOET-3857]
This commit is contained in:
@ -7,8 +7,10 @@ use MailPoet\API\JSON\Error as APIError;
|
||||
use MailPoet\API\JSON\Response;
|
||||
use MailPoet\Config\AccessControl;
|
||||
use MailPoet\Cron\Triggers\WordPress;
|
||||
use MailPoet\Entities\NewsletterEntity;
|
||||
use MailPoet\Models\Newsletter;
|
||||
use MailPoet\Models\SendingQueue as SendingQueueModel;
|
||||
use MailPoet\Newsletter\NewslettersRepository;
|
||||
use MailPoet\Newsletter\Scheduler\Scheduler;
|
||||
use MailPoet\Segments\SubscribersFinder;
|
||||
use MailPoet\Tasks\Sending as SendingTask;
|
||||
@ -25,12 +27,17 @@ class SendingQueue extends APIEndpoint {
|
||||
/** @var SubscribersFinder */
|
||||
private $subscribersFinder;
|
||||
|
||||
/** @var NewslettersRepository */
|
||||
private $newsletterRepository;
|
||||
|
||||
public function __construct(
|
||||
SubscribersFeature $subscribersFeature,
|
||||
NewslettersRepository $newsletterRepository,
|
||||
SubscribersFinder $subscribersFinder
|
||||
) {
|
||||
$this->subscribersFeature = $subscribersFeature;
|
||||
$this->subscribersFinder = $subscribersFinder;
|
||||
$this->newsletterRepository = $newsletterRepository;
|
||||
}
|
||||
|
||||
public function add($data = []) {
|
||||
@ -52,6 +59,19 @@ class SendingQueue extends APIEndpoint {
|
||||
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet'),
|
||||
]);
|
||||
}
|
||||
$newsletterEntity = $this->newsletterRepository->findOneById($newsletter->id);
|
||||
if (!$newsletterEntity instanceof NewsletterEntity) {
|
||||
return $this->errorResponse([
|
||||
APIError::NOT_FOUND => __('This newsletter does not exist.', 'mailpoet'),
|
||||
]);
|
||||
}
|
||||
|
||||
$validationError = $this->validateNewsletter($newsletterEntity);
|
||||
if ($validationError) {
|
||||
return $this->errorResponse([
|
||||
APIError::BAD_REQUEST => $validationError,
|
||||
]);
|
||||
}
|
||||
|
||||
// check that the sending method has been configured properly
|
||||
try {
|
||||
@ -65,7 +85,7 @@ class SendingQueue extends APIEndpoint {
|
||||
|
||||
// add newsletter to the sending queue
|
||||
$queue = SendingQueueModel::joinWithTasks()
|
||||
->where('queues.newsletter_id', $newsletter->id)
|
||||
->where('queues.newsletter_id', $newsletterEntity->getId())
|
||||
->whereNull('tasks.status')
|
||||
->findOne();
|
||||
|
||||
@ -76,14 +96,14 @@ class SendingQueue extends APIEndpoint {
|
||||
}
|
||||
|
||||
$scheduledQueue = SendingQueueModel::joinWithTasks()
|
||||
->where('queues.newsletter_id', $newsletter->id)
|
||||
->where('queues.newsletter_id', $newsletterEntity->getId())
|
||||
->where('tasks.status', SendingQueueModel::STATUS_SCHEDULED)
|
||||
->findOne();
|
||||
if ($scheduledQueue instanceof SendingQueueModel) {
|
||||
$queue = SendingTask::createFromQueue($scheduledQueue);
|
||||
} else {
|
||||
$queue = SendingTask::create();
|
||||
$queue->newsletterId = $newsletter->id;
|
||||
$queue->newsletterId = $newsletterEntity->getId();
|
||||
}
|
||||
|
||||
WordPress::resetRunInterval();
|
||||
@ -122,6 +142,10 @@ class SendingQueue extends APIEndpoint {
|
||||
}
|
||||
}
|
||||
|
||||
private function validateNewsletter(NewsletterEntity $newsletterEntity): ?string {
|
||||
return null;
|
||||
}
|
||||
|
||||
public function pause($data = []) {
|
||||
$newsletterId = (isset($data['newsletter_id'])
|
||||
? (int)$data['newsletter_id']
|
||||
|
Reference in New Issue
Block a user