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

Handle errors when filtering dynamic segments

Browse Source 
When a segment has an invalid filter we don't want that error to
break other pages in the MailPoet admin.

MAILPOET-5538
This commit is contained in:
John Oleksowicz
2023-10-25 16:38:11 -05:00
committed by Aschepikov
parent 2a1245bd8a
commit 5972db6a47
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mailpoet/lib/Segments/SegmentSubscribersRepository.php
View File

@ -9,6 +9,7 @@ use MailPoet\Entities\SubscriberEntity;
use MailPoet\Entities\SubscriberSegmentEntity; use MailPoet\Entities\SubscriberSegmentEntity;
use MailPoet\InvalidStateException; use MailPoet\InvalidStateException;
use MailPoet\NotFoundException; use MailPoet\NotFoundException;
use MailPoet\Segments\DynamicSegments\Exceptions\InvalidFilterException;
use MailPoet\Segments\DynamicSegments\FilterHandler; use MailPoet\Segments\DynamicSegments\FilterHandler;
use MailPoetVendor\Doctrine\DBAL\Connection; use MailPoetVendor\Doctrine\DBAL\Connection;
use MailPoetVendor\Doctrine\DBAL\Driver\Statement; use MailPoetVendor\Doctrine\DBAL\Driver\Statement;
@ -420,7 +421,13 @@ class SegmentSubscribersRepository {
if (count($filters) === 0) { if (count($filters) === 0) {
return $queryBuilder->andWhere('0 = 1'); return $queryBuilder->andWhere('0 = 1');
} elseif ($segment instanceof SegmentEntity) { } elseif ($segment instanceof SegmentEntity) {
$queryBuilder = $this->filterHandler->apply($queryBuilder, $segment); try {
$queryBuilder = $this->filterHandler->apply($queryBuilder, $segment);
} catch (InvalidFilterException $e) {
// If a segment has an invalid filter, we should simply consider it empty instead of throwing
// an unhandled error. Unhandled errors here can break many admin pages.
$queryBuilder->andWhere('0 = 1');
}
} }
$subscribersTable = $this->entityManager->getClassMetadata(SubscriberEntity::class)->getTableName(); $subscribersTable = $this->entityManager->getClassMetadata(SubscriberEntity::class)->getTableName();
$queryBuilder = $queryBuilder->andWhere("$subscribersTable.deleted_at IS NULL"); $queryBuilder = $queryBuilder->andWhere("$subscribersTable.deleted_at IS NULL");

16
mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php
View File

@ -229,6 +229,22 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
verify($countWithFilter)->equals(2); verify($countWithFilter)->equals(2);
} }
public function testSubscriberCountIsZeroIfItHasAnInvalidFilter(): void {
$segment = new SegmentEntity('Segment' . rand(0, 10000), SegmentEntity::TYPE_DYNAMIC, 'Segment description');
$filterData = new DynamicSegmentFilterData(
'typeThatDefinitelyDoesNotExist',
'theActionDoesNotExistEither'
);
$dynamicFilter = new DynamicSegmentFilterEntity($segment, $filterData);
$segment->getDynamicFilters()->add($dynamicFilter);
$this->entityManager->persist($segment);
$this->entityManager->persist($dynamicFilter);
$this->entityManager->flush();
$count = $this->repository->getSubscribersCountBySegmentIds([$segment->getId()]);
$this->assertEquals(0, $count);
}
public function _after() { public function _after() {
parent::_after(); parent::_after();
$this->cleanup(); $this->cleanup();