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

Fix filtering subscribers without segment

Browse Source 
[MAILPOET-3197]
This commit is contained in:
Jan Lysý
2020-10-29 09:35:40 +01:00
committed by Veljko V
parent 6545e5a63c
commit 1c912f7b18
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Subscribers/SubscriberListingRepository.php
View File

@ -16,6 +16,8 @@ use MailPoetVendor\Doctrine\ORM\Query\Expr\Join;
use MailPoetVendor\Doctrine\ORM\QueryBuilder;
class SubscriberListingRepository extends ListingRepository {
public const FILTER_WITHOUT_LIST = 'without-list';
const DEFAULT_SORT_BY = 'createdAt';
private static $supportedStatuses = [
@ -88,6 +90,14 @@ class SubscriberListingRepository extends ListingRepository {
if (!$filters || !isset($filters['segment'])) {
return;
}
if ($filters['segment'] === self::FILTER_WITHOUT_LIST) {
$queryBuilder->leftJoin('s.subscriberSegments', 'ssg', Join::WITH, (string)$queryBuilder->expr()->eq('ssg.status', ':statusSubscribed'))
->leftJoin('ssg.segment', 'sg', Join::WITH, (string)$queryBuilder->expr()->isNull('sg.deletedAt'))
->andWhere('s.deletedAt IS NULL')
->andWhere('sg.id IS NULL')
->setParameter('statusSubscribed', SubscriberEntity::STATUS_SUBSCRIBED);
return;
}
$segment = $this->entityManager->find(SegmentEntity::class, (int)$filters['segment']);
if (!$segment instanceof SegmentEntity) {
return;
@ -218,7 +228,7 @@ class SubscriberListingRepository extends ListingRepository {
$withoutSegmentList = [
'label' => $subscribersWithoutSegmentLabel,
'value' => 'none',
'value' => self::FILTER_WITHOUT_LIST,
];
$segmentList = [];