diff --git a/lib/Subscribers/SubscriberListingRepository.php b/lib/Subscribers/SubscriberListingRepository.php index 48daaca44d..dd50dea622 100644 --- a/lib/Subscribers/SubscriberListingRepository.php +++ b/lib/Subscribers/SubscriberListingRepository.php @@ -154,15 +154,13 @@ class SubscriberListingRepository extends ListingRepository { $queryBuilder ->select('sg.id, sg.name, COUNT(s) AS subscribersCount') - ->leftJoin('s.subscriberSegments', 'ssg', Join::WITH, (string)$queryBuilderNoSegment->expr()->eq('ssg.status', ':statusSubscribed')) + ->leftJoin('s.subscriberSegments', 'ssg') ->join('ssg.segment', 'sg') ->groupBy('sg.id') ->andWhere('sg.deletedAt IS NULL') ->andWhere('s.deletedAt IS NULL') - ->andWhere('s.status = :statusSubscribed') ->orderBy('sg.name') - ->having('subscribersCount > 0') - ->setParameter('statusSubscribed', SubscriberEntity::STATUS_SUBSCRIBED); + ->having('subscribersCount > 0'); // format segment list $segmentList = [ diff --git a/tests/integration/Subscribers/SubscriberListingRepositoryTest.php b/tests/integration/Subscribers/SubscriberListingRepositoryTest.php index 3fa5e7b79b..329b5a45cf 100644 --- a/tests/integration/Subscribers/SubscriberListingRepositoryTest.php +++ b/tests/integration/Subscribers/SubscriberListingRepositoryTest.php @@ -59,7 +59,7 @@ class SubscriberListingRepositoryTest extends \MailPoetTest { expect($filters['segment'])->count(3); expect($filters['segment'][0]['label'])->equals('All Lists'); expect($filters['segment'][1]['label'])->equals('Subscribers without a list (3)'); - expect($filters['segment'][2]['label'])->endsWith('(1)'); + expect($filters['segment'][2]['label'])->endsWith('(2)'); } public function testItBuildsGroups() {