Skip to content

Commit 8e63f1a

Browse files
committed
Add sync
1 parent 85d580b commit 8e63f1a

File tree

9 files changed

+34
-10
lines changed

9 files changed

+34
-10
lines changed

config/packages/messenger.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ framework:
2929
'PhpList\Core\Domain\Messaging\Message\SubscriptionConfirmationMessage': async_email
3030
'PhpList\Core\Domain\Messaging\Message\PasswordResetMessage': async_email
3131
'PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage': async_email
32+
'PhpList\Core\Domain\Messaging\Message\SyncCampaignProcessorMessage': sync
33+

config/services/messenger.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
$passwordResetUrl: '%app.password_reset_url%'
2525

2626
PhpList\Core\Domain\Messaging\MessageHandler\SubscriptionConfirmationMessageHandler:
27-
autowire: true
28-
autoconfigure: true
29-
tags: [ 'messenger.message_handler' ]
27+
autowire: true
28+
autoconfigure: true
29+
tags: [ 'messenger.message_handler' ]
3030

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace PhpList\Core\Domain\Messaging\Message;
6+
7+
class SyncCampaignProcessorMessage
8+
{
9+
private int $messageId;
10+
11+
public function __construct(int $messageId)
12+
{
13+
$this->messageId = $messageId;
14+
}
15+
16+
public function getMessageId(): int
17+
{
18+
return $this->messageId;
19+
}
20+
}

src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
2121
use PhpList\Core\Domain\Subscription\Service\Provider\SubscriberProvider;
2222
use Psr\Log\LoggerInterface;
23+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
2324
use Symfony\Contracts\Translation\TranslatorInterface;
2425
use Throwable;
2526

@@ -28,6 +29,7 @@
2829
* @SuppressWarnings(PHPMD.StaticAccess)
2930
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
3031
*/
32+
#[AsMessageHandler]
3133
class CampaignProcessorMessageHandler
3234
{
3335
private RateLimitedCampaignMailer $mailer;
@@ -68,7 +70,7 @@ public function __construct(
6870
$this->messageRepository = $messageRepository;
6971
}
7072

71-
public function __invoke(CampaignProcessorMessage $message): void
73+
public function __invoke(CampaignProcessorMessage|SyncCampaignProcessorMessage $message): void
7274
{
7375
$campaign = $this->messageRepository->findByIdAndStatus($message->getMessageId(), MessageStatus::Submitted);
7476
if (!$campaign) {

tests/Integration/Domain/Identity/Repository/AdministratorRepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public function testRemoveRemovesModel(): void
177177
$this->assertNotEmpty($allModels);
178178

179179
$model = $allModels[0];
180-
$this->repository->remove($model);
180+
$this->repository->delete($model);
181181

182182
$remainingModels = $this->repository->findAll();
183183
$this->assertCount(count($allModels) - 1, $remainingModels);

tests/Integration/Domain/Identity/Repository/AdministratorTokenRepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testRemoveRemovesModel()
146146
$numberOfModelsBeforeRemove = count($allModels);
147147
$firstModel = $allModels[0];
148148

149-
$this->repository->remove($firstModel);
149+
$this->repository->delete($firstModel);
150150

151151
$numberOfModelsAfterRemove = count($this->repository->findAll());
152152
self::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);

tests/Integration/Domain/Messaging/Repository/SubscriberListRepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public function testRemoveRemovesModel()
206206
$numberOfModelsBeforeRemove = count($allModels);
207207
$firstModel = $allModels[0];
208208

209-
$this->subscriberListRepository->remove($firstModel);
209+
$this->subscriberListRepository->delete($firstModel);
210210

211211
$numberOfModelsAfterRemove = count($this->subscriberListRepository->findAll());
212212
self::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);

tests/Integration/Domain/Subscription/Repository/SubscriberRepositoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public function testRemoveAlsoRemovesAssociatedSubscriptions()
227227
$numberOfAssociatedSubscriptions = count($model->getSubscriptions());
228228
self::assertGreaterThan(0, $numberOfAssociatedSubscriptions);
229229

230-
$this->subscriberRepository->remove($model);
230+
$this->subscriberRepository->delete($model);
231231

232232
$newNumberOfSubscriptions = count($this->subscriptionRepository->findAll());
233233
$numberOfRemovedSubscriptions = $initialNumberOfSubscriptions - $newNumberOfSubscriptions;
@@ -246,7 +246,7 @@ public function testRemoveRemovesModel()
246246
$numberOfModelsBeforeRemove = count($allModels);
247247
$firstModel = $allModels[0];
248248

249-
$this->subscriberRepository->remove($firstModel);
249+
$this->subscriberRepository->delete($firstModel);
250250

251251
$numberOfModelsAfterRemove = count($this->subscriberRepository->findAll());
252252
self::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);

tests/Integration/Domain/Subscription/Repository/SubscriptionRepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public function testRemoveRemovesModel()
161161
$numberOfModelsBeforeRemove = count($allModels);
162162
$firstModel = $allModels[0];
163163

164-
$this->subscriptionRepository->remove($firstModel);
164+
$this->subscriptionRepository->delete($firstModel);
165165

166166
$numberOfModelsAfterRemove = count($this->subscriptionRepository->findAll());
167167
self::assertSame(1, $numberOfModelsBeforeRemove - $numberOfModelsAfterRemove);

0 commit comments

Comments
 (0)