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

Categorize (un)subscribed users of a list correctly

Browse Source 
To evaluate whether a user is subscribed to a list or unsubscribed you need to take into account
the status of the current subscription and not only the global status. To be unsubscribed you are
either globally or per list unsubscribed. To be subscribed you need to be globally and per list
subscribed

[MAILPOET-4487]
This commit is contained in:
David Remer
2023-08-15 09:00:03 +03:00
committed by Aschepikov
parent fc27d59817
commit ec987b133d
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mailpoet/lib/Subscribers/SubscriberListingRepository.php
View File

@ -41,6 +41,9 @@ class SubscriberListingRepository extends ListingRepository {
/** @var SubscribersCountsController */ /** @var SubscribersCountsController */
private $subscribersCountsController; private $subscribersCountsController;
/** @var null | ListingDefinition */
private $definition = null;
public function __construct( public function __construct(
EntityManager $entityManager, EntityManager $entityManager,
FilterHandler $dynamicSegmentsFilter, FilterHandler $dynamicSegmentsFilter,
@ -55,6 +58,7 @@ class SubscriberListingRepository extends ListingRepository {
} }
public function getData(ListingDefinition $definition): array { public function getData(ListingDefinition $definition): array {
$this->definition = $definition;
$dynamicSegment = $this->getDynamicSegmentFromFilters($definition); $dynamicSegment = $this->getDynamicSegmentFromFilters($definition);
if ($dynamicSegment === null) { if ($dynamicSegment === null) {
return parent::getData($definition); return parent::getData($definition);
@ -63,6 +67,7 @@ class SubscriberListingRepository extends ListingRepository {
} }
public function getCount(ListingDefinition $definition): int { public function getCount(ListingDefinition $definition): int {
$this->definition = $definition;
$dynamicSegment = $this->getDynamicSegmentFromFilters($definition); $dynamicSegment = $this->getDynamicSegmentFromFilters($definition);
if ($dynamicSegment === null) { if ($dynamicSegment === null) {
return parent::getCount($definition); return parent::getCount($definition);
@ -78,6 +83,7 @@ class SubscriberListingRepository extends ListingRepository {
} }
public function getActionableIds(ListingDefinition $definition): array { public function getActionableIds(ListingDefinition $definition): array {
$this->definition = $definition;
$ids = $definition->getSelection(); $ids = $definition->getSelection();
if (!empty($ids)) { if (!empty($ids)) {
return $ids; return $ids;
@ -118,8 +124,24 @@ class SubscriberListingRepository extends ListingRepository {
return; return;
} }
if (!in_array($group, [SubscriberEntity::STATUS_SUBSCRIBED, SubscriberEntity::STATUS_UNSUBSCRIBED])) {
$queryBuilder
->andWhere('s.status = :status')
->setParameter('status', $group);
return;
}
$segment = $this->definition && array_key_exists('segment', $this->definition->getFilters()) ? $this->entityManager->find(SegmentEntity::class, (int)$this->definition->getFilters()['segment']) : null;
if (!$segment instanceof SegmentEntity || !$segment->isStatic()) {
$queryBuilder
->andWhere('s.status = :status')
->setParameter('status', $group);
return;
}
$operator = $group === SubscriberEntity::STATUS_SUBSCRIBED ? 'AND' : 'OR';
$queryBuilder $queryBuilder
->andWhere('s.status = :status') ->andWhere('(s.status = :status ' . $operator . ' ss.status = :status)')
->setParameter('status', $group); ->setParameter('status', $group);
} }