From bf3adf6ef79b5c47573bfaf1d9064c64a162af69 Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Thu, 3 Oct 2019 10:48:43 +0200 Subject: [PATCH] Fix Newsletter/SendingQueue association mapping [MAILPOET-2428] --- lib/Entities/NewsletterEntity.php | 13 +++++++------ lib/Entities/SendingQueueEntity.php | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/Entities/NewsletterEntity.php b/lib/Entities/NewsletterEntity.php index 6432b3231f..bd43634216 100644 --- a/lib/Entities/NewsletterEntity.php +++ b/lib/Entities/NewsletterEntity.php @@ -130,14 +130,15 @@ class NewsletterEntity { private $options; /** - * @OneToOne(targetEntity="MailPoet\Entities\SendingQueueEntity", mappedBy="newsletter") - * @var SendingQueueEntity|null + * @OneToMany(targetEntity="MailPoet\Entities\SendingQueueEntity", mappedBy="newsletter") + * @var SendingQueueEntity[]|Collection */ - private $queue; + private $queues; function __construct() { $this->newsletter_segments = new ArrayCollection(); $this->options = new ArrayCollection(); + $this->queues = new ArrayCollection(); } /** @@ -344,10 +345,10 @@ class NewsletterEntity { } /** - * @return SendingQueueEntity|null + * @return SendingQueueEntity[]|Collection */ - function getQueue() { - return $this->queue; + function getQueues() { + return $this->queues; } /** diff --git a/lib/Entities/SendingQueueEntity.php b/lib/Entities/SendingQueueEntity.php index 3e70ada0a0..24516425cd 100644 --- a/lib/Entities/SendingQueueEntity.php +++ b/lib/Entities/SendingQueueEntity.php @@ -73,7 +73,7 @@ class SendingQueueEntity { private $task; /** - * @OneToOne(targetEntity="MailPoet\Entities\NewsletterEntity", inversedBy="sending_queue") + * @ManyToOne(targetEntity="MailPoet\Entities\NewsletterEntity", inversedBy="queues") * @var NewsletterEntity */ private $newsletter;