rest of flushes

Author: tatevikg1

config/services/managers.yml

@@ -80,7 +80,7 @@ services:
     autowire: true
     autoconfigure: true
 
-  PhpList\Core\Domain\Messaging\Service\Manager\BounceManager:
+  PhpList\Core\Bounce\Service\Manager\BounceManager:
     autowire: true
     autoconfigure: true
 

src/Bounce/Service/Handler/DecreaseCountConfirmUserAndDeleteBounceHandler.php

@@ -7,26 +7,22 @@
 use PhpList\Core\Bounce\Service\Manager\BounceManager;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
-use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DecreaseCountConfirmUserAndDeleteBounceHandler implements BounceActionHandlerInterface
 {
     private SubscriberHistoryManager $subscriberHistoryManager;
-    private SubscriberManager $subscriberManager;
     private BounceManager $bounceManager;
     private SubscriberRepository $subscriberRepository;
     private TranslatorInterface $translator;
 
     public function __construct(
         SubscriberHistoryManager $subscriberHistoryManager,
-        SubscriberManager $subscriberManager,
         BounceManager $bounceManager,
         SubscriberRepository $subscriberRepository,
         TranslatorInterface $translator,
     ) {
         $this->subscriberHistoryManager = $subscriberHistoryManager;
-        $this->subscriberManager = $subscriberManager;
         $this->bounceManager = $bounceManager;
         $this->subscriberRepository = $subscriberRepository;
         $this->translator = $translator;
@@ -40,7 +36,7 @@ public function supports(string $action): bool
     public function handle(array $closureData): void
     {
         if (!empty($closureData['subscriber'])) {
-            $this->subscriberManager->decrementBounceCount($closureData['subscriber']);
+            $this->subscriberRepository->decrementBounceCount($closureData['subscriber']);
             if (!$closureData['confirmed']) {
                 $this->subscriberRepository->markConfirmed($closureData['userId']);
                 $this->subscriberHistoryManager->addHistory(

src/Bounce/Service/Processor/BounceDataProcessor.php

@@ -26,12 +26,13 @@ class BounceDataProcessor
     private EntityManagerInterface $entityManager;
 
     public function __construct(
-        BounceManager            $bounceManager,
-        SubscriberRepository     $subscriberRepository,
-        MessageRepository        $messageRepository,
-        LoggerInterface          $logger,
-        SubscriberManager        $subscriberManager,
-        SubscriberHistoryManager $subscriberHistoryManager, EntityManagerInterface $entityManager,
+        BounceManager $bounceManager,
+        SubscriberRepository $subscriberRepository,
+        MessageRepository $messageRepository,
+        LoggerInterface $logger,
+        SubscriberManager $subscriberManager,
+        SubscriberHistoryManager $subscriberHistoryManager,
+        EntityManagerInterface $entityManager,
     ) {
         $this->bounceManager = $bounceManager;
         $this->subscriberRepository = $subscriberRepository;

src/Bounce/Service/SubscriberBlacklistService.php

@@ -54,6 +54,7 @@ public function blacklist(Subscriber $subscriber, string $reason): void
                     name: $item,
                     data: $request->server->get($item)
                 );
+                $this->entityManager->flush();
             }
         }
 

src/Domain/Subscription/Repository/SubscriberRepository.php

@@ -188,4 +188,15 @@ public function distinctUsersWithBouncesConfirmedNotBlacklisted(): array
             ->getQuery()
             ->getScalarResult();
     }
+
+    public function decrementBounceCount(Subscriber $subscriber): void
+    {
+        $this->createQueryBuilder('s')
+            ->update()
+            ->set('s.bounceCount', 's.bounceCount - 1')
+            ->where('s.id = :subscriberId')
+            ->setParameter('subscriberId', $subscriber->getId())
+            ->getQuery()
+            ->execute();
+    }
 }

src/Domain/Subscription/Service/Manager/SubscriberBlacklistManager.php

@@ -63,7 +63,6 @@ public function addBlacklistData(string $email, string $name, string $data): voi
         $blacklistData->setName($name);
         $blacklistData->setData($data);
         $this->entityManager->persist($blacklistData);
-        $this->entityManager->flush();
     }
 
     public function removeEmailFromBlacklist(string $email): void

src/Domain/Subscription/Service/Manager/SubscriberManager.php

@@ -96,7 +96,6 @@ public function markAsConfirmedByUniqueId(string $uniqueId): Subscriber
         }
 
         $subscriber->setConfirmed(true);
-        $this->entityManager->flush();
 
         return $subscriber;
     }
@@ -137,10 +136,4 @@ public function updateFromImport(Subscriber $existingSubscriber, ImportSubscribe
 
         return ChangeSetDto::fromDoctrineChangeSet($uow->getEntityChangeSet($existingSubscriber));
     }
-
-    public function decrementBounceCount(Subscriber $subscriber): void
-    {
-        $subscriber->addToBounceCount(-1);
-        $this->entityManager->flush();
-    }
 }

tests/Unit/Bounce/Service/Handler/DecreaseCountConfirmUserAndDeleteBounceHandlerTest.php

@@ -31,7 +31,6 @@ protected function setUp(): void
         $this->subscriberRepository = $this->createMock(SubscriberRepository::class);
         $this->handler = new DecreaseCountConfirmUserAndDeleteBounceHandler(
             subscriberHistoryManager: $this->historyManager,
-            subscriberManager: $this->subscriberManager,
             bounceManager: $this->bounceManager,
             subscriberRepository: $this->subscriberRepository,
             translator: new Translator('en'),
@@ -50,7 +49,7 @@ public function testHandleDecrementsMarksConfirmedAddsHistoryAndDeletesWhenNotCo
         $subscriber = $this->createMock(Subscriber::class);
         $bounce = $this->createMock(Bounce::class);
 
-        $this->subscriberManager->expects($this->once())->method('decrementBounceCount')->with($subscriber);
+        $this->subscriberRepository->expects($this->once())->method('decrementBounceCount')->with($subscriber);
         $this->subscriberRepository->expects($this->once())->method('markConfirmed')->with(11);
         $this->historyManager->expects($this->once())->method('addHistory')->with(
             $subscriber,
@@ -73,7 +72,7 @@ public function testHandleOnlyDecrementsAndDeletesWhenAlreadyConfirmed(): void
         $subscriber = $this->createMock(Subscriber::class);
         $bounce = $this->createMock(Bounce::class);
 
-        $this->subscriberManager->expects($this->once())->method('decrementBounceCount')->with($subscriber);
+        $this->subscriberRepository->expects($this->once())->method('decrementBounceCount')->with($subscriber);
         $this->subscriberRepository->expects($this->never())->method('markConfirmed');
         $this->historyManager->expects($this->never())->method('addHistory');
         $this->bounceManager->expects($this->once())->method('delete')->with($bounce);
@@ -91,7 +90,7 @@ public function testHandleDeletesBounceEvenWithoutSubscriber(): void
     {
         $bounce = $this->createMock(Bounce::class);
 
-        $this->subscriberManager->expects($this->never())->method('decrementBounceCount');
+        $this->subscriberRepository->expects($this->never())->method('decrementBounceCount');
         $this->subscriberRepository->expects($this->never())->method('markConfirmed');
         $this->historyManager->expects($this->never())->method('addHistory');
         $this->bounceManager->expects($this->once())->method('delete')->with($bounce);

tests/Unit/Domain/Subscription/Service/Manager/SubscriberManagerTest.php

@@ -133,10 +133,6 @@ public function testMarkAsConfirmedByUniqueIdConfirmsSubscriber(): void
             ->method('setConfirmed')
             ->with(true);
 
-        $this->entityManager
-            ->expects($this->once())
-            ->method('flush');
-
         $result = $this->subscriberManager->markAsConfirmedByUniqueId($uniqueId);
 
         $this->assertSame($subscriber, $result);