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

Set as invalid only for non-campaign email types

Browse Source 
For non-campaign emails, we use scheduled tasks to display processed stats.
The invalid tasks are no longer processed, and they don't block the queue
and are not counted in the stats.
For campaign emails (bulk emails), we just mark them as sent to zero recipients.
[MAILPOET-5881]
This commit is contained in:
Rostislav Wolny
2024-05-31 09:43:18 +02:00
committed by Aschepikov
parent e4cff6c14f
commit 9dd808a070
2 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@@ -840,7 +840,7 @@ class SendingQueueTest extends \MailPoetTest {
verify($sendingQueue->getCountToProcess())->equals(0);
}
public function testItCompletesEverythingProperlyWhenThereIsNoOneToSendTo() {
public function testItCompletesEverythingProperlyWhenThereIsNoSubscribedSubscriberToSendTo() {
// Set the only scheduled task subscriber to unsubscribed
$this->subscriber->setStatus(SubscriberEntity::STATUS_UNSUBSCRIBED);
$this->entityManager->flush();
@@ -873,6 +873,41 @@ class SendingQueueTest extends \MailPoetTest {
verify($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
}
public function testItCompletesEverythingProperlyWhenThereIsNoOneToSendTo() {
// No subscribers in queue
$this->scheduledTaskSubscribersRepository->setSubscribers(
$this->scheduledTask,
[]
);
$sendingQueueWorker = $this->getSendingQueueWorker(
$this->construct(
MailerTask::class,
[$this->diContainer->get(MailerFactory::class)],
[
'send' => Expected::never(),
]
)
);
$sendingQueueWorker->process();
// queue status is set to completed
$sendingQueue = $this->sendingQueuesRepository->findOneById($this->sendingQueue->getId());
$this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
$scheduledTask = $this->scheduledTasksRepository->findOneBySendingQueue($sendingQueue);
$this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
$this->sendingQueuesRepository->refresh($sendingQueue);
$this->scheduledTasksRepository->refresh($scheduledTask);
$newsletter = $sendingQueue->getNewsletter();
$this->assertInstanceOf(NewsletterEntity::class, $newsletter);
verify($sendingQueue->getCountTotal())->equals(0);
verify($sendingQueue->getCountProcessed())->equals(0);
verify($sendingQueue->getCountToProcess())->equals(0);
verify($scheduledTask->getStatus())->equals(SendingQueueEntity::STATUS_COMPLETED);
verify($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
}
public function testItRemovesSubscribersFromProcessingListWhenNewsletterHasSegmentAndSubscriberIsNotPartOfIt() {
$subscriberNotPartOfNewsletterSegment = $this->createSubscriber('subscriber1@mailpoet.com', 'Subscriber', 'One');
@@ -1405,8 +1440,8 @@ class SendingQueueTest extends \MailPoetTest {
}
}
public function testSendingGetsStuckWhenSubscribersAreUnsubscribed() {
$newsletter = $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, 'Subject With Deleted', NewsletterEntity::STATUS_SENDING);
public function testItMarksNonCampaignEmailWithNoSubscribersToSendToAsInvalid() {
$newsletter = $this->createNewsletter(NewsletterEntity::TYPE_WELCOME, 'Subject With Deleted', NewsletterEntity::STATUS_SENDING);
[$segment, $subscriber] = $this->createListWithSubscriber();
$this->addSegmentToNewsletter($newsletter, $segment);
$queue = $this->createQueueWithTask($newsletter, null, ['html' => 'Hello', 'text' => 'Hello']);