unique emails

src/Sender/MailToFileSender.php

@@ -8,6 +8,8 @@
 use Buggregator\Trap\Proto\Frame\Smtp;
 use Buggregator\Trap\Sender;
 use Buggregator\Trap\Support\FileSystem;
+use Buggregator\Trap\Traffic\Message;
+use Buggregator\Trap\Traffic\Message\Smtp\Contact;
 
 /**
  * @internal
@@ -31,11 +33,8 @@ public function send(iterable $frames): void
                 continue;
             }
 
-            foreach ($frame->message->getBcc() as $bcc) {
-                $email = self::normalizeEmail($bcc->email);
-                if ($email === null) {
-                    continue;
-                }
+            foreach ($this->collectUniqueEmails($frame->message) as $email) {
+                $email = self::normalizeEmail($email);
 
                 $path = $this->path . DIRECTORY_SEPARATOR . $email;
                 FileSystem::mkdir($path);
@@ -50,11 +49,28 @@ public function send(iterable $frames): void
     /**
      * Get normalized email address for file or directory name.
      *
-     * @return null|non-empty-string
+     * @return non-empty-string
      */
-    private static function normalizeEmail(?string $email): ?string
+    private static function normalizeEmail(string $email): string
     {
-        $email = \str_replace('@', '[at]', \trim((string) $email));
-        return $email === '' ? null : $email;
+        return \str_replace('@', '[at]', \trim($email));
+    }
+
+    /**
+     * @return list<non-empty-string>
+     */
+    private function collectUniqueEmails(Message\Smtp $message): array
+    {
+        $fn = static fn(Contact $c) => $c->email;
+
+        return \array_unique(
+            \array_filter(
+                \array_merge(
+                    \array_map($fn, $message->getBcc()),
+                    \array_map($fn, $message->getTo()),
+                ),
+                static fn(string $email): bool => false !== \filter_var($email, \FILTER_VALIDATE_EMAIL)
+            ),
+        );
     }
 }

tests/Unit/Sender/MailToFileSenderTest.php

@@ -25,11 +25,19 @@ public function testForSmtp(): void
         $message = SmtpMessage::create(
             protocol: [
                 'FROM' => ['<[email protected]>'],
-                'BCC' => ['<[email protected]>', '<[email protected]>'],
+                'BCC' => [
+                    '<[email protected]>',
+                    '<[email protected]>',
+                    '', // must be ignored
+                ],
             ],
             headers: [
                 'From' => ['Some User <[email protected]>'],
-                'To' => ['User1 <[email protected]>'],
+                'To' => [
+                    'User1 <[email protected]>',
+                    'User3 <[email protected]>',
+                    'User without email', // no email
+                ],
                 'Subject' => ['Very important theme'],
                 'Content-Type' => ['text/plain'],
             ],
@@ -38,15 +46,24 @@ public function testForSmtp(): void
         $sender = new MailToFileSender($root);
         $sender->send([$frame]);
 
-        $this->assertRecipient("$root/[email protected]");
-        $this->assertRecipient("$root/[email protected]");
+        $this->assertRecipient("$root/user1[at]company.tld");
+        $this->assertRecipient("$root/user2[at]company.tld");
+        $this->assertRecipient("$root/user3[at]company.tld");
+    }
+
+    protected function tearDown(): void
+    {
+        foreach ($this->cleanupFolders as $folder) {
+            \array_map('unlink', \glob("$folder/*/*.*"));
+            \array_map('rmdir', \glob("$folder/*"));
+            \rmdir($folder);
+        }
     }
 
     private function assertRecipient(string $folder): void
     {
         self::assertDirectoryExists($folder);
         $files = \glob(\str_replace('[', '[[]', "$folder/*.json"));
-        $files = glob("$folder/*.json");
         self::assertCount(1, $files);
         $arr = \json_decode(\file_get_contents($files[0]), true, \JSON_THROW_ON_ERROR);
         self::assertArrayHasKey('protocol', $arr);