Skip to content

Commit 742ae52

Browse files
committed
addHistory for unconfirmed
1 parent 4af4d8f commit 742ae52

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

resources/translations/messages.en.xlf

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,14 +692,22 @@ Thank you.</target>
692692
<source>No user details changed</source>
693693
<target>__No user details changed</target>
694694
</trans-unit>
695-
<trans-unit id="1R4L28q" resname="%field% = %new% *changed* from %old%">
695+
<trans-unit id="qdTR5bi" resname="%field% = %new% *changed* from %old%">
696696
<source>%field% = %new% *changed* from %old%</source>
697697
<target>__%field% = %new% *changed* from %old%</target>
698698
</trans-unit>
699699
<trans-unit id="rns1KOG" resname="Subscribed to %list%">
700700
<source>Subscribed to %list%</source>
701701
<target>__Subscribed to %list%</target>
702702
</trans-unit>
703+
<trans-unit id="eXllcQa" resname="Subscriber marked unconfirmed for invalid email address">
704+
<source>Subscriber marked unconfirmed for invalid email address</source>
705+
<target>__Subscriber marked unconfirmed for invalid email address</target>
706+
</trans-unit>
707+
<trans-unit id="oY0Gck3" resname="Marked unconfirmed while sending campaign %message_id%">
708+
<source>Marked unconfirmed while sending campaign %message_id%</source>
709+
<target>__Marked unconfirmed while sending campaign %message_id%</target>
710+
</trans-unit>
703711
</body>
704712
</file>
705713
</xliff>

src/Domain/Messaging/Service/Processor/CampaignProcessor.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PhpList\Core\Domain\Messaging\Service\RateLimitedCampaignMailer;
1515
use PhpList\Core\Domain\Messaging\Service\MaxProcessTimeLimiter;
1616
use PhpList\Core\Domain\Messaging\Service\MessageProcessingPreparator;
17+
use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
1718
use PhpList\Core\Domain\Subscription\Service\Provider\SubscriberProvider;
1819
use PhpList\Core\Domain\Subscription\Model\Subscriber;
1920
use Psr\Log\LoggerInterface;
@@ -35,6 +36,7 @@ class CampaignProcessor
3536
private MaxProcessTimeLimiter $timeLimiter;
3637
private RequeueHandler $requeueHandler;
3738
private TranslatorInterface $translator;
39+
private SubscriberHistoryManager $subscriberHistoryManager;
3840

3941
public function __construct(
4042
RateLimitedCampaignMailer $mailer,
@@ -46,6 +48,7 @@ public function __construct(
4648
MaxProcessTimeLimiter $timeLimiter,
4749
RequeueHandler $requeueHandler,
4850
TranslatorInterface $translator,
51+
SubscriberHistoryManager $subscriberHistoryManager,
4952
) {
5053
$this->mailer = $mailer;
5154
$this->entityManager = $entityManager;
@@ -56,6 +59,7 @@ public function __construct(
5659
$this->timeLimiter = $timeLimiter;
5760
$this->requeueHandler = $requeueHandler;
5861
$this->translator = $translator;
62+
$this->subscriberHistoryManager = $subscriberHistoryManager;
5963
}
6064

6165
public function process(Message $campaign, ?OutputInterface $output = null): void
@@ -89,6 +93,14 @@ public function process(Message $campaign, ?OutputInterface $output = null): voi
8993
$output?->writeln($this->translator->trans('Invalid email, marking unconfirmed: %email%', [
9094
'%email%' => $subscriber->getEmail(),
9195
]));
96+
$this->subscriberHistoryManager->addHistory(
97+
subscriber: $subscriber,
98+
message: $this->translator->trans('Subscriber marked unconfirmed for invalid email address'),
99+
details: $this->translator->trans(
100+
'Marked unconfirmed while sending campaign %message_id%',
101+
['%message_id%' => $campaign->getId()]
102+
)
103+
);
92104
continue;
93105
}
94106

0 commit comments

Comments
 (0)