After review 1

Author: tatevikg1

src/Domain/Messaging/Service/AttachmentAdder.php

@@ -58,7 +58,7 @@ public function add(Email $email, int $campaignId, OutputFormat $format, bool $f
 
                 case OutputFormat::Text:
                     $hash = $forwarded ? Attachment::FORWARD : $email->getTo()[0]->getAddress();
-                    $viewUrl = $this->attachmentDownloadUrl . '/' . $att->getId() . '/?uid=' . $hash;
+                    $viewUrl = $this->attachmentDownloadUrl . '/' . $att->getId() . '/?uid=' . urlencode($hash);
 
                     $email->text(
                         $email->getTextBody()

src/Domain/Messaging/Service/AttachmentDownloadService.php

@@ -6,7 +6,7 @@
 
 use GuzzleHttp\Psr7\Utils;
 use PhpList\Core\Domain\Messaging\Exception\AttachmentFileNotFoundException;
-use PhpList\Core\Domain\Messaging\Exception\MessageNotReceivedException;
+use PhpList\Core\Domain\Messaging\Exception\SubscriberNotFoundException;
 use PhpList\Core\Domain\Messaging\Model\Attachment;
 use PhpList\Core\Domain\Messaging\Model\Dto\DownloadableAttachment;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
@@ -27,6 +27,9 @@ public function getDownloadable(Attachment $attachment, string $uid): Downloadab
         $this->validateUid($uid);
 
         $original = $attachment->getFilename();
+        if ($original === null || $original === '') {
+            throw new AttachmentFileNotFoundException('Attachment has no filename.');
+        }
         $filename = basename($original);
         $filePath = $this->validateFilePath($filename, $original);
 
@@ -50,11 +53,13 @@ public function getDownloadable(Attachment $attachment, string $uid): Downloadab
 
     private function validateUid(string $uid): void
     {
-        if ($uid !== Attachment::FORWARD) {
-            $subscriber = $this->subscriberRepository->findOneByEmail($uid);
-            if ($subscriber === null) {
-                throw new MessageNotReceivedException();
-            }
+        if ($uid === Attachment::FORWARD) {
+            return;
+        }
+
+        $subscriber = $this->subscriberRepository->findOneByEmail($uid);
+        if ($subscriber === null) {
+            throw new SubscriberNotFoundException();
         }
     }
 

tests/Unit/Domain/Messaging/Service/AttachmentAdderTest.php

@@ -91,7 +91,7 @@ public function testTextModePrependsNoticeAndLinks(): void
         );
         $this->assertStringContainsString('Doc description', $body);
         $this->assertStringContainsString('Location', $body);
-        $this->assertStringContainsString('https://dl.example/42/?uid=user@example.com', $body);
+        $this->assertStringContainsString('https://dl.example/42/?uid=' . urlencode('user@example.com'), $body);
     }
 
     public function testHtmlUsesRepositoryFileIfExists(): void