Fix: tests

Author: tatevikg1

src/Bounce/Service/NativeBounceProcessingService.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Bounce\Service;
 
+use Doctrine\ORM\EntityManagerInterface;
 use IMAP\Connection;
 use PhpList\Core\Bounce\Exception\OpenMboxFileException;
 use PhpList\Core\Bounce\Service\Processor\BounceDataProcessor;
@@ -21,13 +22,15 @@ class NativeBounceProcessingService implements BounceProcessingServiceInterface
     private LoggerInterface $logger;
     private bool $purgeProcessed;
     private bool $purgeUnprocessed;
+    private EntityManagerInterface $entityManager;
 
     public function __construct(
         BounceManager $bounceManager,
         NativeImapMailReader $mailReader,
         MessageParser $messageParser,
         BounceDataProcessor $bounceDataProcessor,
         LoggerInterface $logger,
+        EntityManagerInterface $entityManager,
         bool $purgeProcessed,
         bool $purgeUnprocessed
     ) {
@@ -36,6 +39,7 @@ public function __construct(
         $this->messageParser = $messageParser;
         $this->bounceDataProcessor = $bounceDataProcessor;
         $this->logger = $logger;
+        $this->entityManager = $entityManager;
         $this->purgeProcessed = $purgeProcessed;
         $this->purgeUnprocessed = $purgeUnprocessed;
     }
@@ -135,7 +139,7 @@ private function processImapBounce($link, int $num, string $header): bool
         $userId = $this->messageParser->findUserId($body);
 
         $bounce = $this->bounceManager->create($bounceDate, $header, $body);
-
+        $this->entityManager->flush();
         return $this->bounceDataProcessor->process($bounce, $msgId, $userId, $bounceDate);
     }
 }

src/Domain/Messaging/Service/Manager/BounceManager.php

@@ -53,7 +53,8 @@ public function create(
             comment: $comment
         );
 
-        $this->bounceRepository->save($bounce);
+        $this->bounceRepository->persist($bounce);
+        $this->entityManager->flush();
 
         return $bounce;
     }
@@ -62,14 +63,15 @@ public function update(Bounce $bounce, ?string $status = null, ?string $comment
     {
         $bounce->setStatus($status);
         $bounce->setComment($comment);
-        $this->bounceRepository->save($bounce);
+        $this->entityManager->flush();
 
         return $bounce;
     }
 
     public function delete(Bounce $bounce): void
     {
         $this->bounceRepository->remove($bounce);
+        $this->entityManager->flush();
     }
 
     /** @return Bounce[] */

tests/Unit/Bounce/Command/ProcessBouncesCommandTest.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Tests\Unit\Bounce\Command;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use PhpList\Core\Bounce\Command\ProcessBouncesCommand;
 use PhpList\Core\Bounce\Service\ConsecutiveBounceHandler;
@@ -48,6 +49,7 @@ protected function setUp(): void
             unidentifiedReprocessor: $this->unidentifiedReprocessor,
             consecutiveBounceHandler: $this->consecutiveBounceHandler,
             translator: $this->translator,
+            entityManager: $this->createMock(EntityManagerInterface::class),
         );
 
         $this->commandTester = new CommandTester($command);

tests/Unit/Domain/Messaging/Service/Manager/BounceManagerTest.php

@@ -49,7 +49,7 @@ public function testCreatePersistsAndReturnsBounce(): void
         $comment = 'created by test';
 
         $this->repository->expects($this->once())
-            ->method('save')
+            ->method('persist')
             ->with($this->isInstanceOf(Bounce::class));
 
         $bounce = $this->manager->create(
@@ -115,9 +115,8 @@ public function testGetByIdReturnsNullWhenNotFound(): void
     public function testUpdateChangesFieldsAndSaves(): void
     {
         $bounce = new Bounce();
-        $this->repository->expects($this->once())
-            ->method('save')
-            ->with($bounce);
+        $this->entityManager->expects($this->once())
+            ->method('flush');
 
         $updated = $this->manager->update($bounce, 'processed', 'done');
         $this->assertSame($bounce, $updated);
@@ -130,8 +129,6 @@ public function testLinkUserMessageBounceFlushesAndSetsFields(): void
         $bounce = $this->createMock(Bounce::class);
         $bounce->method('getId')->willReturn(77);
 
-        $this->entityManager->expects($this->once())->method('flush');
-
         $dt = new DateTimeImmutable('2024-05-01 12:34:56');
         $umb = $this->manager->linkUserMessageBounce($bounce, $dt, 123, 456);
 

tests/Unit/Domain/Messaging/Service/Manager/SendProcessManagerTest.php

@@ -29,7 +29,6 @@ protected function setUp(): void
     public function testCreatePersistsEntityAndSetsFields(): void
     {
         $this->em->expects($this->once())->method('persist')->with($this->isInstanceOf(SendProcess::class));
-        $this->em->expects($this->once())->method('flush');
 
         $sp = $this->manager->create('pageA', 'proc-1');
         $this->assertInstanceOf(SendProcess::class, $sp);

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

@@ -218,10 +218,6 @@ public function testSetPageDataCreatesNewWhenMissingAndPersistsAndFlushes(): voi
             ->method('persist')
             ->with($this->isInstanceOf(SubscribePageData::class));
 
-        $this->entityManager
-            ->expects($this->once())
-            ->method('flush');
-
         $result = $this->manager->setPageData($page, 'greeting', 'hello');
 
         $this->assertInstanceOf(SubscribePageData::class, $result);

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

@@ -106,10 +106,6 @@ public function testAddEmailToBlacklistAddsEntryAndReason(): void
                 [$this->isInstanceOf(UserBlacklistData::class)]
             );
 
-        $this->entityManager
-            ->expects($this->once())
-            ->method('flush');
-
         $this->manager->addEmailToBlacklist('[email protected]', 'test reason');
     }
 
@@ -126,10 +122,6 @@ public function testAddEmailToBlacklistAddsEntryWithoutReason(): void
             ->method('persist')
             ->with($this->isInstanceOf(UserBlacklist::class));
 
-        $this->entityManager
-            ->expects($this->once())
-            ->method('flush');
-
         $this->manager->addEmailToBlacklist('[email protected]');
     }
 
@@ -166,10 +158,6 @@ public function testRemoveEmailFromBlacklistRemovesAllRelatedData(): void
 
         $subscriber->expects($this->once())->method('setBlacklisted')->with(false);
 
-        $this->entityManager
-            ->expects($this->once())
-            ->method('flush');
-
         $this->manager->removeEmailFromBlacklist('[email protected]');
     }
 

tests/Unit/Processor/BounceDataProcessorTest.php

@@ -5,6 +5,7 @@
 namespace PhpList\Core\Tests\Unit\Processor;
 
 use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Bounce\Service\Processor\BounceDataProcessor;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Repository\MessageRepository;
@@ -47,6 +48,7 @@ private function makeProcessor(): BounceDataProcessor
             logger: $this->logger,
             subscriberManager: $this->subscriberManager,
             subscriberHistoryManager: $this->historyManager,
+            entityManager: $this->createMock(EntityManagerInterface::class),
         );
     }