Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add where conditions instead of replacing

Browse Source 
[MAILPOET-2657]
This commit is contained in:
Pavel Dohnal
2020-08-04 16:19:47 +02:00
committed by Veljko V
parent dd542f9440
commit 986642c865
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Subscribers/SubscriberListingRepository.php
View File

@@ -46,9 +46,7 @@ class SubscriberListingRepository extends ListingRepository {
protected function applySearch(QueryBuilder $queryBuilder, string $search) { protected function applySearch(QueryBuilder $queryBuilder, string $search) {
$search = str_replace(['\\', '%', '_'], ['\\\\', '\\%', '\\_'], trim($search)); // escape for 'LIKE' $search = str_replace(['\\', '%', '_'], ['\\\\', '\\%', '\\_'], trim($search)); // escape for 'LIKE'
$queryBuilder $queryBuilder
->andWhere('s.email LIKE :search') ->andWhere('s.email LIKE :search or s.firstName LIKE :search or s.lastName LIKE :search')
->orWhere('s.firstName LIKE :search')
->orWhere('s.lastName LIKE :search')
->setParameter('search', "%$search%"); ->setParameter('search', "%$search%");
} }
@@ -144,8 +142,8 @@ class SubscriberListingRepository extends ListingRepository {
->select('COUNT(s) AS subscribersCount') ->select('COUNT(s) AS subscribersCount')
->leftJoin('s.subscriberSegments', 'ssg', Join::WITH, (string)$queryBuilderNoSegment->expr()->eq('ssg.status', ':statusSubscribed')) ->leftJoin('s.subscriberSegments', 'ssg', Join::WITH, (string)$queryBuilderNoSegment->expr()->eq('ssg.status', ':statusSubscribed'))
->leftJoin('ssg.segment', 'sg', Join::WITH, (string)$queryBuilderNoSegment->expr()->isNull('sg.deletedAt')) ->leftJoin('ssg.segment', 'sg', Join::WITH, (string)$queryBuilderNoSegment->expr()->isNull('sg.deletedAt'))
->where('deletedAt IS NULL') ->andWhere('s.deletedAt IS NULL')
->where('sg.id IS NULL') ->andWhere('sg.id IS NULL')
->setParameter('statusSubscribed', SubscriberEntity::STATUS_SUBSCRIBED) ->setParameter('statusSubscribed', SubscriberEntity::STATUS_SUBSCRIBED)
->getQuery()->getSingleScalarResult(); ->getQuery()->getSingleScalarResult();
@@ -159,7 +157,7 @@ class SubscriberListingRepository extends ListingRepository {
->leftJoin('s.subscriberSegments', 'ssg', Join::WITH, (string)$queryBuilderNoSegment->expr()->eq('ssg.status', ':statusSubscribed')) ->leftJoin('s.subscriberSegments', 'ssg', Join::WITH, (string)$queryBuilderNoSegment->expr()->eq('ssg.status', ':statusSubscribed'))
->join('ssg.segment', 'sg') ->join('ssg.segment', 'sg')
->groupBy('sg.id') ->groupBy('sg.id')
->where('sg.deletedAt IS NULL') ->andWhere('sg.deletedAt IS NULL')
->andWhere('s.deletedAt IS NULL') ->andWhere('s.deletedAt IS NULL')
->andWhere('s.status = :statusSubscribed') ->andWhere('s.status = :statusSubscribed')
->orderBy('sg.name') ->orderBy('sg.name')