ISSUE-345: subscriber filter

Author: tatevikg1

src/Domain/Filter/SubscriberFilter.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\Core\Domain\Filter;
+
+class SubscriberFilter
+{
+    private ?int $listId = null;
+
+    public function setListId(?int $listId): self
+    {
+        $this->listId = $listId;
+        return $this;
+    }
+
+    public function getListId(): ?int
+    {
+        return $this->listId;
+    }
+}

src/Domain/Repository/CursorPaginationTrait.php

@@ -28,9 +28,9 @@ public function getAfterId(QueryBuilder $queryBuilder, int $lastId, int $limit):
         $alias = $this->getAlias();
 
         return $queryBuilder
-            ->andWhere("$alias.id > :lastId")
+            ->andWhere($alias . '.id > :lastId')
             ->setParameter('lastId', $lastId)
-            ->orderBy("$alias.id", 'ASC')
+            ->orderBy($alias . '.id', 'ASC')
             ->setMaxResults($limit)
             ->getQuery()
             ->getResult();

src/Domain/Repository/Messaging/MessageRepository.php

@@ -28,10 +28,10 @@ public function getByOwnerId(int $ownerId): array
 
     public function getFilteredAfterId(int $lastId, int $limit, ?FilterRequestInterface $filter = null): array
     {
-        $queryBuilder = $this->createQueryBuilder($this->getAlias());;
+        $queryBuilder = $this->createQueryBuilder($this->getAlias());
 
         if ($filter instanceof MessageFilter && $filter->getOwner() !== null) {
-            $queryBuilder->andWhere("IDENTITY({$this->getAlias()}.owner) = :ownerId")
+            $queryBuilder->andWhere('IDENTITY(' . $this->getAlias() . '.owner) = :ownerId')
                 ->setParameter('ownerId', $filter->getOwner()->getId());
         }
 

src/Domain/Repository/Subscription/SubscriberRepository.php

@@ -4,6 +4,9 @@
 
 namespace PhpList\Core\Domain\Repository\Subscription;
 
+use InvalidArgumentException;
+use PhpList\Core\Domain\Filter\FilterRequestInterface;
+use PhpList\Core\Domain\Filter\SubscriberFilter;
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
 use PhpList\Core\Domain\Repository\AbstractRepository;
 use PhpList\Core\Domain\Repository\CursorPaginationTrait;
@@ -44,6 +47,29 @@ public function getSubscribersBySubscribedListId(int $listId): array
             ->getResult();
     }
 
+    /**
+     * @return Subscriber[]
+     * @throws InvalidArgumentException
+     */
+    public function getFilteredAfterId(int $lastId, int $limit, ?FilterRequestInterface $filter = null): array
+    {
+        if (!$filter instanceof SubscriberFilter) {
+            throw new InvalidArgumentException('Expected SubscriberFilterRequest.');
+        }
+
+        $alias = $this->getAlias();
+
+        $queryBuilder = $this->createQueryBuilder($alias)
+            ->innerJoin($alias . '.subscriptions', 'subscription')
+            ->innerJoin('subscription.subscriberList', 'list');
+        if ($filter->getListId() !== null) {
+            $queryBuilder->where('list.id = :listId')
+                ->setParameter('listId', $filter->getListId());
+        }
+
+        return $this->getAfterId($queryBuilder, $lastId, $limit);
+    }
+
     public function findSubscriberWithSubscriptions(int $id): ?Subscriber
     {
         return $this->createQueryBuilder('s')

tests/Unit/Domain/Repository/DummyRepository.php

@@ -18,6 +18,11 @@ public function __construct(private readonly QueryBuilder $queryBuilder)
     {
     }
 
+    public function getAlias(): string
+    {
+        return 'dummy';
+    }
+
     /** Doctrine normally injects the QB through $this->createQueryBuilder(). */
     protected function createQueryBuilder(string $alias): QueryBuilder
     {