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

Replace Newsletter delete,trash,replace by new bulkMethods

Browse Source 
[MAILPOET-2898][MAILPOET-2758]
This commit is contained in:
Rostislav Wolny
2020-06-10 12:54:59 +02:00
committed by Veljko V
parent 3a462a7a6c
commit a8d11bf045
7 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@ -12,6 +12,7 @@ use MailPoet\Models\Newsletter as NewsletterModel;
use MailPoet\Models\NewsletterSegment as NewsletterSegmentModel;
use MailPoet\Models\SendingQueue as SendingQueueModel;
use MailPoet\Newsletter\Links\Links as NewsletterLinks;
use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Renderer\PostProcess\OpenTracking;
use MailPoet\Newsletter\Renderer\Renderer;
use MailPoet\Settings\SettingsController;
@ -39,6 +40,9 @@ class Newsletter {
/** @var Renderer */
private $renderer;
/** @var NewslettersRepository */
private $newslettersRepository;
/** @var Emoji */
private $emoji;
@ -63,6 +67,7 @@ class Newsletter {
}
$this->emoji = $emoji;
$this->renderer = ContainerWrapper::getInstance()->get(Renderer::class);
$this->newslettersRepository = ContainerWrapper::getInstance()->get(NewslettersRepository::class);
}
public function getNewsletterFromQueue($queue) {
@ -137,7 +142,7 @@ class Newsletter {
'no posts in post notification, deleting it',
['newsletter_id' => $newsletter->id, 'task_id' => $sendingTask->taskId]
);
$newsletter->delete();
$this->newslettersRepository->bulkDelete([(int)$newsletter->id]);
return false;
}
// extract and save newsletter posts