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

Make sure types are correct in Sending Task

Browse Source 
[MAILPOET-2535]
This commit is contained in:
Pavel Dohnal
2019-11-19 10:41:05 +01:00
committed by Jack Kitterhing
parent 8e1628efe8
commit 5e44ef8af8
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/API/JSON/v1/SendingTaskSubscribers.php
View File

@ -80,12 +80,22 @@ class SendingTaskSubscribers extends APIEndpoint {
->findOne(); ->findOne();
$task = ScheduledTask::findOne($task_id); $task = ScheduledTask::findOne($task_id);
$sending_queue = SendingQueueModel::where('task_id', $task_id)->findOne(); $sending_queue = SendingQueueModel::where('task_id', $task_id)->findOne();
if (!$task || !$task_subscriber || !$sending_queue || $task_subscriber->failed != 1) { if (
!($task instanceof ScheduledTask)
|| !($task_subscriber instanceof ScheduledTaskSubscriber)
|| !($sending_queue instanceof SendingQueueModel)
|| $task_subscriber->failed != 1
) {
return $this->errorResponse([ return $this->errorResponse([
APIError::NOT_FOUND => __('Failed sending task not found!', 'mailpoet'), APIError::NOT_FOUND => __('Failed sending task not found!', 'mailpoet'),
]); ]);
} }
$newsletter = Newsletter::findOne($sending_queue->newsletter_id); $newsletter = Newsletter::findOne($sending_queue->newsletter_id);
if (!($newsletter instanceof Newsletter)) {
return $this->errorResponse([
APIError::NOT_FOUND => __('Newsletter not found!', 'mailpoet'),
]);
}
$task_subscriber->error = ''; $task_subscriber->error = '';
$task_subscriber->failed = 0; $task_subscriber->failed = 0;