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

Unify subscribers without segment queries for listing & export counting

Browse Source 
[MAILPOET-3462]
This commit is contained in:
wxa
2021-03-09 18:00:30 +03:00
committed by Veljko V
parent 19dd9180bd
commit 10bf0d006d
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Subscribers/SubscriberListingRepository.php
View File

@@ -130,15 +130,7 @@ class SubscriberListingRepository extends ListingRepository {
return;
}
if ($filters['segment'] === self::FILTER_WITHOUT_LIST) {
$queryBuilder->leftJoin('s.subscriberSegments', 'ssg')
->leftJoin('ssg.segment', 'sg')
->leftJoin(SubscriberEntity::class, 's2', Join::WITH, (string)$queryBuilder->expr()->eq('s.id', 's2.id'))
->leftJoin('s2.subscriberSegments', 'ssg2', Join::WITH, 'ssg2.status = :statusSubscribed AND sg.id <> ssg2.segment')
->leftJoin('ssg2.segment', 'sg2', Join::WITH, (string)$queryBuilder->expr()->isNull('sg2.deletedAt'))
->andWhere('s.deletedAt IS NULL')
->andWhere('(ssg.status != :statusSubscribed OR ssg.id IS NULL OR sg.deletedAt IS NOT NULL)')
->andWhere('sg2.id IS NULL')
->setParameter('statusSubscribed', SubscriberEntity::STATUS_SUBSCRIBED);
$this->segmentSubscribersRepository->addConstraintsForSubscribersWithoutSegment($queryBuilder);
return;
}
$segment = $this->entityManager->find(SegmentEntity::class, (int)$filters['segment']);