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

Fix counts in segment filter in subscriber listing

Browse Source 
[MAILPOET-3132]
This commit is contained in:
Rostislav Wolny
2020-09-07 16:20:30 +02:00
committed by Veljko V
parent ea16dc7925
commit 65fd596f71
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Subscribers/SubscriberListingRepository.php
View File

@ -154,15 +154,13 @@ class SubscriberListingRepository extends ListingRepository {
$queryBuilder $queryBuilder
->select('sg.id, sg.name, COUNT(s) AS subscribersCount') ->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') ->join('ssg.segment', 'sg')
->groupBy('sg.id') ->groupBy('sg.id')
->andWhere('sg.deletedAt IS NULL') ->andWhere('sg.deletedAt IS NULL')
->andWhere('s.deletedAt IS NULL') ->andWhere('s.deletedAt IS NULL')
->andWhere('s.status = :statusSubscribed')
->orderBy('sg.name') ->orderBy('sg.name')
->having('subscribersCount > 0') ->having('subscribersCount > 0');
->setParameter('statusSubscribed', SubscriberEntity::STATUS_SUBSCRIBED);
// format segment list // format segment list
$segmentList = [ $segmentList = [

2
tests/integration/Subscribers/SubscriberListingRepositoryTest.php
View File

@ -59,7 +59,7 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
expect($filters['segment'])->count(3); expect($filters['segment'])->count(3);
expect($filters['segment'][0]['label'])->equals('All Lists'); expect($filters['segment'][0]['label'])->equals('All Lists');
expect($filters['segment'][1]['label'])->equals('Subscribers without a list (3)'); 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() { public function testItBuildsGroups() {