Ref: PaginatedFilter base class

Author: tatevikg1

…on/Model/Filter/PaginatedFilterTrait.php …/Common/Model/Filter/PaginatedFilter.phpsrc/Domain/Common/Model/Filter/PaginatedFilterTrait.php renamed to src/Domain/Common/Model/Filter/PaginatedFilter.php src/Domain/Common/Model/Filter/PaginatedFilterTrait.php renamed to src/Domain/Common/Model/Filter/PaginatedFilter.php

@@ -4,7 +4,7 @@
 
 namespace PhpList\Core\Domain\Common\Model\Filter;
 
-trait PaginatedFilterTrait
+class PaginatedFilter implements FilterRequestInterface
 {
     private int $lastId = 0;
     private int $limit = 50;

src/Domain/Common/Model/PaginatedResult.php

@@ -13,6 +13,7 @@ class PaginatedResult
     private array $items;
     private int $total;
     private int $limit;
+    // maybe $lastId not needed
     private int $lastId;
 
     /** @param list<T> $items */

src/Domain/Configuration/Model/Filter/EventLogFilter.php

@@ -6,12 +6,10 @@
 
 use DateTimeInterface;
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
-use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilterTrait;
+use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 
-class EventLogFilter implements FilterRequestInterface
+class EventLogFilter extends PaginatedFilter implements FilterRequestInterface
 {
-    use PaginatedFilterTrait;
-
     public function __construct(
         private readonly ?string $page = null,
         private readonly ?DateTimeInterface $dateFrom = null,

src/Domain/Identity/Model/Filter/AdminAttributeValueFilter.php

@@ -5,12 +5,10 @@
 namespace PhpList\Core\Domain\Identity\Model\Filter;
 
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
-use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilterTrait;
+use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 
-class AdminAttributeValueFilter implements FilterRequestInterface
+class AdminAttributeValueFilter extends PaginatedFilter implements FilterRequestInterface
 {
-    use PaginatedFilterTrait;
-
     private ?int $adminId = null;
 
     public function setAdminId(?int $adminId): self

src/Domain/Messaging/Model/Filter/MessageFilter.php

@@ -5,13 +5,11 @@
 namespace PhpList\Core\Domain\Messaging\Model\Filter;
 
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
-use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilterTrait;
+use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 use PhpList\Core\Domain\Identity\Model\Administrator;
 
-class MessageFilter implements FilterRequestInterface
+class MessageFilter extends PaginatedFilter implements FilterRequestInterface
 {
-    use PaginatedFilterTrait;
-
     private ?Administrator $owner = null;
 
     public function getOwner(): ?Administrator

src/Domain/Messaging/Model/Filter/SubscriberListFilter.php

@@ -5,13 +5,11 @@
 namespace PhpList\Core\Domain\Messaging\Model\Filter;
 
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
-use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilterTrait;
+use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 use PhpList\Core\Domain\Identity\Model\Administrator;
 
-class SubscriberListFilter implements FilterRequestInterface
+class SubscriberListFilter extends PaginatedFilter implements FilterRequestInterface
 {
-    use PaginatedFilterTrait;
-
     private ?Administrator $owner = null;
 
     public function getOwner(): ?Administrator

src/Domain/Subscription/Model/Filter/SubscriberAttributeValueFilter.php

@@ -5,11 +5,10 @@
 namespace PhpList\Core\Domain\Subscription\Model\Filter;
 
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
-use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilterTrait;
+use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 
-class SubscriberAttributeValueFilter implements FilterRequestInterface
+class SubscriberAttributeValueFilter extends PaginatedFilter implements FilterRequestInterface
 {
-    use PaginatedFilterTrait;
 
     private ?int $subscriberId = null;
 

src/Domain/Subscription/Model/Filter/SubscriberFilter.php

@@ -6,13 +6,11 @@
 
 use DateTimeImmutable;
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
-use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilterTrait;
+use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 
 /** @SuppressWarnings("ExcessiveParameterList") */
-class SubscriberFilter implements FilterRequestInterface
+class SubscriberFilter extends PaginatedFilter implements FilterRequestInterface
 {
-    use PaginatedFilterTrait;
-
     private ?int $listId;
     private ?DateTimeImmutable $subscribedDateFrom;
     private ?DateTimeImmutable $subscribedDateTo;

src/Domain/Subscription/Model/Filter/SubscriberHistoryFilter.php

@@ -6,13 +6,11 @@
 
 use DateTimeImmutable;
 use PhpList\Core\Domain\Common\Model\Filter\FilterRequestInterface;
-use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilterTrait;
+use PhpList\Core\Domain\Common\Model\Filter\PaginatedFilter;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 
-class SubscriberHistoryFilter implements FilterRequestInterface
+class SubscriberHistoryFilter extends PaginatedFilter implements FilterRequestInterface
 {
-    use PaginatedFilterTrait;
-
     private ?Subscriber $subscriber;
     private ?string $ip;
     private ?DateTimeImmutable $dateFrom;

src/Domain/Subscription/Repository/SubscriberListRepository.php

@@ -67,7 +67,14 @@ public function getFilteredAfterId(FilterRequestInterface $filter): PaginatedRes
 
         $queryBuilder = $this->createQueryBuilder('l');
 
-        return $queryBuilder
+        $countQb = clone $queryBuilder;
+        $total = (int) $countQb
+            ->select('COUNT(DISTINCT l.id)')
+            ->getQuery()
+            ->getSingleScalarResult();
+
+        /** @var list<SubscriberList> $items */
+        $items = $queryBuilder
             ->where($queryBuilder->expr()->orX('l.owner = :admin', 'l.public = true'))
             ->setParameter('admin', $filter->getOwner())
             ->andWhere('l.id > :id')
@@ -76,6 +83,13 @@ public function getFilteredAfterId(FilterRequestInterface $filter): PaginatedRes
             ->orderBy('l.id', 'ASC')
             ->getQuery()
             ->getResult();
+
+        return new PaginatedResult(
+            items: $items,
+            total: $total,
+            limit: $filter->getLimit(),
+            lastId: $filter->getLastId(),
+        );
     }
 
     public function getListNames(array $listIds): array