Mark the subscriber as confirmed

Author: tatevikg1

src/Domain/Messaging/MessageHandler/SubscriberConfirmationMessageHandler.php

@@ -62,6 +62,6 @@ public function __invoke(SubscriberConfirmationMessage $message): void
      */
     private function generateConfirmationLink(string $uniqueId): string
     {
-        return $this->confirmationUrl . $uniqueId;
+        return $this->confirmationUrl . '?uniqueId=' . urlencode($uniqueId);
     }
 }

src/Domain/Subscription/Repository/SubscriberRepository.php

@@ -36,6 +36,11 @@ public function findOneByEmail(string $email): ?Subscriber
         return $this->findOneBy(['email' => $email]);
     }
 
+    public function findOneByUniqueId(string $uniqueId): ?Subscriber
+    {
+        return $this->findOneBy(['uniqueId' => $uniqueId]);
+    }
+
     public function findSubscribersBySubscribedList(int $listId): ?Subscriber
     {
         return $this->createQueryBuilder('s')

src/Domain/Subscription/Service/Manager/SubscriberManager.php

@@ -92,6 +92,19 @@ public function updateSubscriber(UpdateSubscriberDto $subscriberDto): Subscriber
         return $subscriber;
     }
 
+    public function markAsConfirmedByUniqueId(string $uniqueId): Subscriber
+    {
+        $subscriber = $this->subscriberRepository->findOneByUniqueId($uniqueId);
+        if (!$subscriber) {
+            throw new NotFoundHttpException('Subscriber not found');
+        }
+
+        $subscriber->setConfirmed(true);
+        $this->entityManager->flush();
+
+        return $subscriber;
+    }
+
     public function deleteSubscriber(Subscriber $subscriber): void
     {
         $this->subscriberDeletionService->deleteLeavingBlacklist($subscriber);

tests/Unit/Domain/Messaging/MessageHandler/SubscriberConfirmationMessageHandlerTest.php

@@ -15,7 +15,7 @@ class SubscriberConfirmationMessageHandlerTest extends TestCase
 {
     private SubscriberConfirmationMessageHandler $handler;
     private EmailService&MockObject $emailService;
-    private string $confirmationUrl = 'https://example.com/confirm/';
+    private string $confirmationUrl = 'https://example.com/confirm';
 
     protected function setUp(): void
     {
@@ -37,7 +37,7 @@ public function testInvokeWithTextEmail(): void
 
                 $textContent = $email->getTextBody();
                 $this->assertStringContainsString('Thank you for subscribing', $textContent);
-                $this->assertStringContainsString($this->confirmationUrl . $uniqueId, $textContent);
+                $this->assertStringContainsString($this->confirmationUrl . '?uniqueId=' . $uniqueId, $textContent);
 
                 $this->assertEmpty($email->getHtmlBody());
 
@@ -61,11 +61,11 @@ public function testInvokeWithHtmlEmail(): void
 
                 $textContent = $email->getTextBody();
                 $this->assertStringContainsString('Thank you for subscribing', $textContent);
-                $this->assertStringContainsString($this->confirmationUrl . $uniqueId, $textContent);
+                $this->assertStringContainsString($this->confirmationUrl . '?uniqueId=' . $uniqueId, $textContent);
 
                 $htmlContent = $email->getHtmlBody();
                 $this->assertStringContainsString('<p>Thank you for subscribing!</p>', $htmlContent);
-                $linkStart = '<a href="' . $this->confirmationUrl . $uniqueId . '">';
+                $linkStart = '<a href="' . $this->confirmationUrl . '?uniqueId=' . $uniqueId . '">';
                 $this->assertStringContainsString($linkStart, $htmlContent);
 
                 return true;

tests/Unit/Domain/Subscription/Service/SubscriberManagerTest.php

@@ -21,21 +21,20 @@ class SubscriberManagerTest extends TestCase
     private SubscriberRepository|MockObject $subscriberRepository;
     private EntityManagerInterface|MockObject $entityManager;
     private MessageBusInterface|MockObject $messageBus;
-    private SubscriberDeletionService|MockObject $subscriberDeletionService;
     private SubscriberManager $subscriberManager;
 
     protected function setUp(): void
     {
         $this->subscriberRepository = $this->createMock(SubscriberRepository::class);
         $this->entityManager = $this->createMock(EntityManagerInterface::class);
         $this->messageBus = $this->createMock(MessageBusInterface::class);
-        $this->subscriberDeletionService = $this->createMock(SubscriberDeletionService::class);
+        $subscriberDeletionService = $this->createMock(SubscriberDeletionService::class);
 
         $this->subscriberManager = new SubscriberManager(
-            $this->subscriberRepository,
-            $this->entityManager,
-            $this->messageBus,
-            $this->subscriberDeletionService
+            subscriberRepository: $this->subscriberRepository,
+            entityManager: $this->entityManager,
+            messageBus: $this->messageBus,
+            subscriberDeletionService: $subscriberDeletionService
         );
     }
 
@@ -143,4 +142,29 @@ public function testCreateSubscriberWithoutConfirmationDoesNotSendConfirmationEm
         $dto = new CreateSubscriberDto(email: '[email protected]', requestConfirmation: false, htmlEmail: true);
         $this->subscriberManager->createSubscriber($dto);
     }
+
+    public function testMarkAsConfirmedByUniqueIdConfirmsSubscriber(): void
+    {
+        $uniqueId = 'some-unique-id-789';
+        $subscriber = $this->createMock(Subscriber::class);
+
+        $this->subscriberRepository
+            ->expects($this->once())
+            ->method('findOneByUniqueId')
+            ->with($uniqueId)
+            ->willReturn($subscriber);
+
+        $subscriber
+            ->expects($this->once())
+            ->method('setConfirmed')
+            ->with(true);
+
+        $this->entityManager
+            ->expects($this->once())
+            ->method('flush');
+
+        $result = $this->subscriberManager->markAsConfirmedByUniqueId($uniqueId);
+
+        $this->assertSame($subscriber, $result);
+    }
 }