Skip to content

Commit 32a7dc9

Browse files
committed
remove sorting
1 parent 589d85f commit 32a7dc9

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ class SubscriberFilter implements FilterRequestInterface
2020
private ?bool $isConfirmed;
2121
private ?bool $isBlacklisted;
2222
private array $columns;
23-
private ?string $sortBy;
24-
private ?string $sortDirection;
2523
private ?string $findColumn;
2624
private ?string $findValue;
2725

@@ -36,8 +34,6 @@ public function __construct(
3634
?bool $isConfirmed = null,
3735
?bool $isBlacklisted = null,
3836
array $columns = [],
39-
?string $sortBy = null,
40-
?string $sortDirection = null,
4137
?string $findColumn = null,
4238
?string $findValue = null,
4339
) {
@@ -51,8 +47,6 @@ public function __construct(
5147
$this->isConfirmed = $isConfirmed;
5248
$this->isBlacklisted = $isBlacklisted;
5349
$this->columns = $columns;
54-
$this->sortBy = $sortBy;
55-
$this->sortDirection = $sortDirection;
5650
$this->findColumn = $findColumn;
5751
$this->findValue = $findValue;
5852
}
@@ -107,16 +101,6 @@ public function getColumns(): array
107101
return $this->columns;
108102
}
109103

110-
public function getSortBy(): ?string
111-
{
112-
return $this->sortBy;
113-
}
114-
115-
public function getSortDirection(): ?string
116-
{
117-
return $this->sortDirection;
118-
}
119-
120104
public function getFindColumn(): ?string
121105
{
122106
return $this->findColumn;

src/Domain/Subscription/Repository/SubscriberAttributeValueRepository.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ public function getFilteredAfterId(
6464

6565
$countQb = clone $queryBuilder;
6666
$total = (int) $countQb
67-
->select('COUNT(DISTINCT sav.id)')
67+
->select('COUNT(DISTINCT ad.id)')
6868
->getQuery()
6969
->getSingleScalarResult();
7070

7171
/** @var list<SubscriberAttributeValue> $items */
7272
$items = $queryBuilder
73-
->andWhere('sav.id > :lastId')
73+
->andWhere('ad.id > :lastId')
7474
->setParameter('lastId', $lastId)
75-
->orderBy('sav.id', 'ASC')
75+
->orderBy('ad.id', 'ASC')
7676
->setMaxResults($limit)
7777
->getQuery()
7878
->getResult();

src/Domain/Subscription/Repository/SubscriberRepository.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ public function getFilteredAfterId(
114114
$queryBuilder->andWhere('subscriber.blacklisted = :isBlacklisted')
115115
->setParameter('isBlacklisted', $filter->getIsBlacklisted());
116116
}
117-
if ($filter->getSortBy() !== null) {
118-
$queryBuilder->orderBy('subscriber.' . $filter->getSortBy(), $filter->getSortDirection() ?? 'ASC');
119-
}
120117
if ($filter->getFindColumn() && $filter->getFindValue()) {
121118
$queryBuilder->andWhere('subscriber.' . $filter->getFindColumn() . ' LIKE :search')
122119
->setParameter('search', '%' . $filter->getFindValue() . '%');

0 commit comments

Comments
 (0)