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

Handle nullable task on sending queue

Browse Source 
[MAILPOET-2818]
This commit is contained in:
Rostislav Wolny
2020-04-06 16:53:42 +02:00
committed by Veljko V
parent 63a2bed8bf
commit edddaa789b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/API/JSON/ResponseBuilders/NewslettersResponseBuilder.php
View File

@ -181,7 +181,9 @@ class NewslettersResponseBuilder {
private function buildQueue(SendingQueueEntity $queue) { private function buildQueue(SendingQueueEntity $queue) {
$task = $queue->getTask(); $task = $queue->getTask();
if ($task === null) {
return null;
}
// the following crazy mix of '$queue' and '$task' comes from 'array_merge($task, $queue)' // the following crazy mix of '$queue' and '$task' comes from 'array_merge($task, $queue)'
// (MailPoet\Tasks\Sending) which means all equal-named fields will be taken from '$queue' // (MailPoet\Tasks\Sending) which means all equal-named fields will be taken from '$queue'
return [ return [
@ -195,7 +197,7 @@ class NewslettersResponseBuilder {
'updated_at' => $queue->getUpdatedAt()->format(self::DATE_FORMAT), 'updated_at' => $queue->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $queue->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null, 'deleted_at' => ($deletedAt = $queue->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'meta' => $queue->getMeta(), 'meta' => $queue->getMeta(),
'task_id' => (string)$queue->getTask()->getId(), // (string) for BC 'task_id' => (string)$task->getId(), // (string) for BC
'newsletter_id' => (string)$queue->getNewsletter()->getId(), // (string) for BC 'newsletter_id' => (string)$queue->getNewsletter()->getId(), // (string) for BC
'newsletter_rendered_subject' => $queue->getNewsletterRenderedSubject(), 'newsletter_rendered_subject' => $queue->getNewsletterRenderedSubject(),
'count_total' => (string)$queue->getCountTotal(), // (string) for BC 'count_total' => (string)$queue->getCountTotal(), // (string) for BC

4
lib/Entities/SendingQueueEntity.php
View File

@ -73,7 +73,7 @@ class SendingQueueEntity {
/** /**
* @ORM\OneToOne(targetEntity="MailPoet\Entities\ScheduledTaskEntity") * @ORM\OneToOne(targetEntity="MailPoet\Entities\ScheduledTaskEntity")
* @var ScheduledTaskEntity * @var ScheduledTaskEntity|null
*/ */
private $task; private $task;
@ -182,7 +182,7 @@ class SendingQueueEntity {
} }
/** /**
* @return ScheduledTaskEntity * @return ScheduledTaskEntity|null
*/ */
public function getTask() { public function getTask() {
$this->safelyLoadToOneAssociation('task'); $this->safelyLoadToOneAssociation('task');