release: dev → main (improve message workflow, draft copying, permission handling, bounce regex management)

src/Domain/Analytics/Service/LinkTrackService.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Analytics\Service;
 
+use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Core\ParameterProvider;
 use PhpList\Core\Domain\Analytics\Exception\MissingMessageIdException;
 use PhpList\Core\Domain\Analytics\Model\LinkTrack;
@@ -12,13 +13,11 @@
 
 class LinkTrackService
 {
-    private LinkTrackRepository $linkTrackRepository;
-    private ParameterProvider $paramProvider;
-
-    public function __construct(LinkTrackRepository $linkTrackRepository, ParameterProvider $paramProvider)
-    {
-        $this->linkTrackRepository = $linkTrackRepository;
-        $this->paramProvider = $paramProvider;
+    public function __construct(
+        private readonly LinkTrackRepository $linkTrackRepository,
+        private readonly ParameterProvider $paramProvider,
+        private readonly EntityManagerInterface $entityManager
+    ) {
     }
 
     public function getUrlById(int $id): ?string
@@ -58,6 +57,7 @@ public function extractAndSaveLinks(MessagePrecacheDto $content, int $userId, ?i
         $links = array_unique($links);
 
         $savedLinks = [];
+        $newLinksPersisted = false;
 
         foreach ($links as $url) {
             $existingLinkTrack = $this->linkTrackRepository->findByUrlUserIdAndMessageId($url, $userId, $messageId);
@@ -71,9 +71,14 @@ public function extractAndSaveLinks(MessagePrecacheDto $content, int $userId, ?i
             $linkTrack->setUrl($url);
 
             $this->linkTrackRepository->persist($linkTrack);
+            $newLinksPersisted = true;
             $savedLinks[] = $linkTrack;
         }
 
+        if ($newLinksPersisted) {
+            $this->entityManager->flush();
+        }
+
         return $savedLinks;
     }
 

src/Domain/Messaging/Service/MessageDataLoader.php

@@ -148,7 +148,7 @@ private function normaliseScheduleFields(array &$messageData): void
     private function populateTargetLists(array &$messageData, Message $message): void
     {
         foreach ($message->getListMessages() as $listMessage) {
-            $messageData['targetlist'][$listMessage->getListId()] = 1;
+            $messageData['targetlist'][$listMessage->getList()->getId()] = 1;
         }
     }
 

src/Domain/Messaging/Service/MessagePrecacheService.php

@@ -71,7 +71,7 @@ public function precacheMessage(Message $campaign, array $loadedMessageData, ?bo
             return false;
         }
 
-        $messagePrecacheDto->googleTrack = $loadedMessageData['google_track'];
+        $messagePrecacheDto->googleTrack = (bool) $loadedMessageData['google_track'];
 
         $this->applyBasicReplacements($messagePrecacheDto, $loadedMessageData);
         $this->populateAdminAttributes($messagePrecacheDto, $campaign);

tests/Unit/Domain/Analytics/Service/LinkTrackServiceTest.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Tests\Unit\Domain\Analytics\Service;
 
+use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Core\ParameterProvider;
 use PhpList\Core\Domain\Analytics\Exception\MissingMessageIdException;
 use PhpList\Core\Domain\Analytics\Model\LinkTrack;
@@ -29,7 +30,11 @@ protected function setUp(): void
             ->with('click_track', false)
             ->willReturn(true);
 
-        $this->subject = new LinkTrackService($this->linkTrackRepository, $paramProvider);
+        $this->subject = new LinkTrackService(
+            $this->linkTrackRepository,
+            $paramProvider,
+            $this->createMock(EntityManagerInterface::class)
+        );
     }
 
     public function testExtractAndSaveLinksWithNoLinks(): void
@@ -209,7 +214,11 @@ public function testIsExtractAndSaveLinksApplicableWhenClickTrackIsFalse(): void
             ->with('click_track', false)
             ->willReturn(false);
 
-        $subject = new LinkTrackService($this->linkTrackRepository, $paramProvider);
+        $subject = new LinkTrackService(
+            $this->linkTrackRepository,
+            $paramProvider,
+            $this->createMock(EntityManagerInterface::class)
+        );
 
         self::assertFalse($subject->isExtractAndSaveLinksApplicable());
     }