Add getSubscriberDetails method

Author: tatevikg1

src/Domain/Subscription/Model/Subscriber.php

@@ -20,6 +20,8 @@
  * @author Oliver Klee <oliver@phplist.com>
  * @author Tatevik Grigoryan <tatevik@phplist.com>
  * @SuppressWarnings(TooManyFields)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  */
 #[ORM\Entity(repositoryClass: SubscriberRepository::class)]
 #[ORM\Table(name: 'phplist_user_user')]
@@ -109,6 +111,9 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     #[ORM\Column(name: 'foreignkey', type: 'string', length: 100, nullable: true)]
     private ?string $foreignKey = null;
 
+    /** @var SubscriberHistory[] */
+    private array $history = [];
+
     public function __construct(string $email)
     {
         $this->email = $email;
@@ -377,4 +382,20 @@ public function setForeignKey(?string $foreignKey): void
     {
         $this->foreignKey = $foreignKey;
     }
+
+    /**
+     * @return SubscriberHistory[]
+     */
+    public function getHistory(): array
+    {
+        return $this->history;
+    }
+
+    /**
+     * @param SubscriberHistory[] $history
+     */
+    public function setHistory(array $history): void
+    {
+        $this->history = $history;
+    }
 }

src/Domain/Subscription/Repository/SubscriberHistoryRepository.php

@@ -11,6 +11,7 @@
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
 use PhpList\Core\Domain\Subscription\Model\Filter\SubscriberHistoryFilter;
+use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Model\SubscriberHistory;
 
 class SubscriberHistoryRepository extends AbstractRepository implements PaginatableRepositoryInterface
@@ -74,4 +75,15 @@ public function getFilteredAfterId(
             lastId: $lastId,
         );
     }
+
+    /** @return SubscriberHistory[] */
+    public function getBySubscriber(Subscriber $subscriber): array
+    {
+        return $this->createQueryBuilder('sh')
+            ->andWhere('sh.subscriber = :subscriberId')
+            ->setParameter('subscriberId', $subscriber->getId())
+            ->orderBy('sh.id', 'DESC')
+            ->getQuery()
+            ->getResult();
+    }
 }

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

@@ -11,31 +11,22 @@
 use PhpList\Core\Domain\Subscription\Model\Dto\ImportSubscriberDto;
 use PhpList\Core\Domain\Subscription\Model\Dto\UpdateSubscriberDto;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
+use PhpList\Core\Domain\Subscription\Repository\SubscriberHistoryRepository;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\SubscriberDeletionService;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SubscriberManager
 {
-    private SubscriberRepository $subscriberRepository;
-    private EntityManagerInterface $entityManager;
-    private SubscriberDeletionService $subscriberDeletionService;
-    private TranslatorInterface $translator;
-    private SubscriberHistoryManager $subscriberHistoryManager;
-
     public function __construct(
-        SubscriberRepository $subscriberRepository,
-        EntityManagerInterface $entityManager,
-        SubscriberDeletionService $subscriberDeletionService,
-        TranslatorInterface $translator,
-        SubscriberHistoryManager $subscriberHistoryManager,
+        private readonly SubscriberRepository $subscriberRepository,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly SubscriberDeletionService $subscriberDeletionService,
+        private readonly TranslatorInterface $translator,
+        private readonly SubscriberHistoryManager $subscriberHistoryManager,
+        private readonly SubscriberHistoryRepository $subscriberHistoryRepository,
     ) {
-        $this->subscriberRepository = $subscriberRepository;
-        $this->entityManager = $entityManager;
-        $this->subscriberDeletionService = $subscriberDeletionService;
-        $this->translator = $translator;
-        $this->subscriberHistoryManager = $subscriberHistoryManager;
     }
 
     public function createSubscriber(CreateSubscriberDto $subscriberDto): Subscriber
@@ -57,6 +48,19 @@ public function getSubscriberById(int $subscriberId): ?Subscriber
         return $this->subscriberRepository->find($subscriberId);
     }
 
+    public function getSubscriberDetails(int $subscriberId): ?Subscriber
+    {
+        $subscriber = $this->getSubscriberById($subscriberId);
+        if ($subscriber === null) {
+            return null;
+        }
+
+        $history = $this->subscriberHistoryRepository->getBySubscriber($subscriber);
+        $subscriber->setHistory($history);
+
+        return $subscriber;
+    }
+
     public function updateSubscriber(
         Subscriber $subscriber,
         UpdateSubscriberDto $subscriberDto,

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

@@ -7,6 +7,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Domain\Subscription\Model\Dto\CreateSubscriberDto;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
+use PhpList\Core\Domain\Subscription\Repository\SubscriberHistoryRepository;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberHistoryManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
@@ -31,7 +32,8 @@ protected function setUp(): void
             entityManager: $entityManager,
             subscriberDeletionService: $subscriberDeletionService,
             translator: new Translator('en'),
-            subscriberHistoryManager: $this->createMock(SubscriberHistoryManager::class)
+            subscriberHistoryManager: $this->createMock(SubscriberHistoryManager::class),
+            subscriberHistoryRepository: $this->createMock(SubscriberHistoryRepository::class),
         );
     }