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

Mark newsletter in sending queue nullable

Browse Source 
[MAILPOET-2818]
This commit is contained in:
Rostislav Wolny
2020-04-06 17:19:45 +02:00
committed by Veljko V
parent 98bc18c8de
commit 66d4a5caac
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ class NewslettersResponseBuilder {
'deleted_at' => ($deletedAt = $queue->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'meta' => $queue->getMeta(),
'task_id' => (string)$task->getId(), // (string) for BC
'newsletter_id' => (string)$queue->getNewsletter()->getId(), // (string) for BC
'newsletter_id' => ($queue->getNewsletter() instanceof NewsletterEntity) ? (string)$queue->getNewsletter()->getId() : null, // (string) for BC
'newsletter_rendered_subject' => $queue->getNewsletterRenderedSubject(),
'count_total' => (string)$queue->getCountTotal(), // (string) for BC
'count_processed' => (string)$queue->getCountProcessed(), // (string) for BC

4
lib/Entities/SendingQueueEntity.php
View File

@ -79,7 +79,7 @@ class SendingQueueEntity {
/**
* @ORM\ManyToOne(targetEntity="MailPoet\Entities\NewsletterEntity", inversedBy="queues")
* @var NewsletterEntity
* @var NewsletterEntity|null
*/
private $newsletter;
@ -194,7 +194,7 @@ class SendingQueueEntity {
}
/**
* @return NewsletterEntity
* @return NewsletterEntity|null
*/
public function getNewsletter() {
$this->safelyLoadToOneAssociation('newsletter');