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

Add newsletter links cleanup to newsletter bulk delete

Browse Source 
[MAILPOET-2898]
This commit is contained in:
Rostislav Wolny
2020-06-09 16:45:09 +02:00
committed by Veljko V
parent 5dbc8d8a8c
commit b99416785c
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Newsletter/NewslettersRepository.php
View File

@ -9,6 +9,7 @@ use MailPoet\AutomaticEmails\WooCommerce\Events\PurchasedInCategory;
use MailPoet\AutomaticEmails\WooCommerce\Events\PurchasedProduct;
use MailPoet\Doctrine\Repository;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterLinkEntity;
use MailPoet\Entities\NewsletterOptionFieldEntity;
use MailPoet\Entities\NewsletterSegmentEntity;
use MailPoet\Entities\ScheduledTaskEntity;
@ -220,6 +221,13 @@ class NewslettersRepository extends Repository {
$sendingQueueTable = $this->entityManager->getClassMetadata(SendingQueueEntity::class)->getTableName();
$scheduledTaskSubscribersTable = $this->entityManager->getClassMetadata(ScheduledTaskSubscriberEntity::class)->getTableName();
// Delete newsletter links
$linksTable = $this->entityManager->getClassMetadata(NewsletterLinkEntity::class)->getTableName();
$this->entityManager->getConnection()->executeUpdate("
DELETE nl FROM $linksTable nl
WHERE nl.`newsletter_id` IN (:ids)
", ['ids' => $ids], ['ids' => Connection::PARAM_INT_ARRAY]);
// Delete stats notifications
$statsNotificationsTable = $this->entityManager->getClassMetadata(StatsNotificationEntity::class)->getTableName();
$this->entityManager->getConnection()->executeUpdate("

17
tests/integration/Newsletter/NewsletterRepositoryTest.php
View File

@ -4,6 +4,7 @@ namespace MailPoet\Newsletter;
use Codeception\Util\Fixtures;
use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\NewsletterLinkEntity;
use MailPoet\Entities\NewsletterSegmentEntity;
use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\ScheduledTaskSubscriberEntity;
@ -131,6 +132,8 @@ class NewsletterRepositoryTest extends \MailPoetTest {
assert($childrenScheduledTaskSubscriber instanceof ScheduledTaskSubscriberEntity);
$newsletter1StatsNotification = $this->createStatNotification($newsletter1, $scheduledTask1);
$childNewsletterStatsNotification = $this->createStatNotification($newsletter2Child1, $childrenScheduledTask);
$newsletter1Link = $this->createNewsletterLink($newsletter1, $newsletter1Queue);
$childLink = $this->createNewsletterLink($newsletter2Child1, $childrenQueue);
// Trash
$this->repository->bulkTrash([$newsletter1->getId(), $newsletter2->getId()]);
@ -149,6 +152,8 @@ class NewsletterRepositoryTest extends \MailPoetTest {
$this->entityManager->detach($childSegment);
$this->entityManager->detach($newsletter1StatsNotification);
$this->entityManager->detach($childNewsletterStatsNotification);
$this->entityManager->detach($newsletter1Link);
$this->entityManager->detach($childLink);
// Check they were all deleted
// Newsletters
@ -175,6 +180,10 @@ class NewsletterRepositoryTest extends \MailPoetTest {
// Newsletter stats notifications
expect($this->entityManager->find(StatsNotificationEntity::class, $newsletter1StatsNotification->getId()))->null();
expect($this->entityManager->find(StatsNotificationEntity::class, $childNewsletterStatsNotification->getId()))->null();
// Newsletter links
expect($this->entityManager->find(NewsletterLinkEntity::class, $newsletter1Link->getId()))->null();
expect($this->entityManager->find(NewsletterLinkEntity::class, $childLink->getId()))->null();
}
public function _after() {
@ -233,6 +242,13 @@ class NewsletterRepositoryTest extends \MailPoetTest {
return $statsNotification;
}
private function createNewsletterLink(NewsletterEntity $newsletter, SendingQueueEntity $queue): NewsletterLinkEntity {
$link = new NewsletterLinkEntity($newsletter, $queue, 'http://example.com', 'abcd');
$this->entityManager->persist($link);
$this->entityManager->flush();
return $link;
}
private function cleanup() {
$this->truncateEntity(NewsletterEntity::class);
$this->truncateEntity(ScheduledTaskEntity::class);
@ -242,5 +258,6 @@ class NewsletterRepositoryTest extends \MailPoetTest {
$this->truncateEntity(SubscriberEntity::class);
$this->truncateEntity(ScheduledTaskSubscriberEntity::class);
$this->truncateEntity(StatsNotificationEntity::class);
$this->truncateEntity(NewsletterLinkEntity::class);
}
}