Use MessagePrecacheDto

Author: tatevikg1

config/parameters.yml.dist

@@ -96,3 +96,5 @@ parameters:
 
     phplist.upload_images_dir: '%%env(PHPLIST_UPLOADIMAGES_DIR)%%'
     env(PHPLIST_UPLOADIMAGES_DIR): 'images'
+    phplist.public_schema: '%%env(PUBLIC_SCHEMA)%%'
+    env(PUBLIC_SCHEMA): 'http'

src/Domain/Analytics/Service/LinkTrackService.php

@@ -8,8 +8,7 @@
 use PhpList\Core\Domain\Analytics\Exception\MissingMessageIdException;
 use PhpList\Core\Domain\Analytics\Model\LinkTrack;
 use PhpList\Core\Domain\Analytics\Repository\LinkTrackRepository;
-use PhpList\Core\Domain\Messaging\Model\Message;
-use PhpList\Core\Domain\Messaging\Model\Message\MessageContent;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 
 class LinkTrackService
 {
@@ -39,7 +38,7 @@ public function isExtractAndSaveLinksApplicable(): bool
      * @return LinkTrack[] The saved LinkTrack entities
      * @throws MissingMessageIdException
      */
-    public function extractAndSaveLinks(MessageContent $content, int $userId, ?int $messageId = null): array
+    public function extractAndSaveLinks(MessagePrecacheDto $content, int $userId, ?int $messageId = null): array
     {
         if (!$this->isExtractAndSaveLinksApplicable()) {
             return [];
@@ -49,10 +48,10 @@ public function extractAndSaveLinks(MessageContent $content, int $userId, ?int $
             throw new MissingMessageIdException();
         }
 
-        $links = $this->extractLinksFromHtml($content->getText() ?? '');
+        $links = $this->extractLinksFromHtml($content->content ?? '');
 
-        if ($content->getFooter() !== null) {
-            $links = array_merge($links, $this->extractLinksFromHtml($content->getFooter()));
+        if ($content->htmlFooter) {
+            $links = array_merge($links, $this->extractLinksFromHtml($content->htmlFooter));
         }
 
         $links = array_unique($links);

src/Domain/Identity/Repository/AdministratorRepository.php

@@ -55,4 +55,18 @@ public function findOneByLoginCredentials(string $loginName, string $plainTextPa
             ]
         );
     }
+
+    /** @return Administrator[] */
+    public function getMessageRelatedAdmins(int $messageId): array
+    {
+        return $this->createQueryBuilder('a')
+            ->select('DISTINCT a')
+            ->join('a.ownedLists', 'ag')
+            ->join('ag.listMessages', 'lm')
+            ->join('lm.message', 'm')
+            ->where('m.id = :messageId')
+            ->setParameter('messageId', $messageId)
+            ->getQuery()
+            ->getResult();
+    }
 }

src/Domain/Messaging/MessageHandler/CampaignProcessorMessageHandler.php

@@ -9,6 +9,7 @@
 use PhpList\Core\Domain\Messaging\Exception\MessageSizeLimitExceededException;
 use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
 use PhpList\Core\Domain\Messaging\Message\SyncCampaignProcessorMessage;
+use PhpList\Core\Domain\Messaging\Model\Dto\MessagePrecacheDto;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Domain\Messaging\Model\Message\MessageStatus;
 use PhpList\Core\Domain\Messaging\Model\Message\UserMessageStatus;
@@ -75,8 +76,8 @@ public function __invoke(CampaignProcessorMessage|SyncCampaignProcessorMessage $
             return;
         }
 
-        $messageContent = $this->precacheService->getOrCacheBaseMessageContent($campaign);
-        if (!$messageContent) {
+        $messagePrecacheDto = $this->precacheService->getOrCacheBaseMessageContent($campaign);
+        if (!$messagePrecacheDto) {
             $this->updateMessageStatus($campaign, MessageStatus::Suspended);
 
             return;
@@ -111,7 +112,7 @@ public function __invoke(CampaignProcessorMessage|SyncCampaignProcessorMessage $
                 continue;
             }
 
-            $this->handleEmailSending($campaign, $subscriber, $userMessage, $messageContent);
+            $this->handleEmailSending($campaign, $subscriber, $userMessage, $messagePrecacheDto);
         }
 
         if ($stoppedEarly && $this->requeueHandler->handle($campaign)) {
@@ -163,11 +164,11 @@ private function handleEmailSending(
         Message $campaign,
         Subscriber $subscriber,
         UserMessage $userMessage,
-        Message\MessageContent $precachedContent,
+        MessagePrecacheDto $precachedContent,
     ): void {
         $processed = $this->messagePreparator->processMessageLinks($campaign->getId(), $precachedContent, $subscriber);
-        $processed->setText($this->userPersonalizer->personalize($processed->getText(), $subscriber->getEmail()));
-        $processed->setFooter($this->userPersonalizer->personalize($processed->getFooter(), $subscriber->getEmail()));
+        $processed->textContent = $this->userPersonalizer->personalize($processed->textContent, $subscriber->getEmail());
+        $processed->footer = $this->userPersonalizer->personalize($processed->footer, $subscriber->getEmail());
 
         try {
             $email = $this->mailer->composeEmail($campaign, $subscriber, $processed);

src/Domain/Messaging/Model/Dto/MessagePrecacheDto.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Messaging\Model\Dto;
+
+class MessagePrecacheDto
+{
+    public string $replyToEmail;
+    public string $replyToName;
+    public string $fromName;
+    public string $fromEmail;
+    public string $to;
+    public string $subject;
+    public string $content;
+    public string $textContent = '';
+    public string $footer;
+    public string $textFooter;
+    public string $htmlFooter;
+    public bool $htmlFormatted;
+    public string $sendFormat;
+    public ?string $template = '';
+    public ?string $templateText = '';
+    public ?int $templateId = 0;
+    public string $htmlCharset= 'UTF-8';
+    public string $textCharset= 'UTF-8';
+    public bool $userSpecificUrl;
+    public string $googleTrack;
+    public array $adminAttributes = [];
+}