Check requirements when counting subscribers
[MAILPOET-2486]
This commit is contained in:
committed by
Jack Kitterhing
parent
5c706aaacf
commit
4f1ef835dc
@@ -2,11 +2,23 @@
|
|||||||
|
|
||||||
namespace MailPoet\DynamicSegments\Persistence\Loading;
|
namespace MailPoet\DynamicSegments\Persistence\Loading;
|
||||||
|
|
||||||
|
use MailPoet\DynamicSegments\RequirementsChecker;
|
||||||
use MailPoet\Models\DynamicSegment;
|
use MailPoet\Models\DynamicSegment;
|
||||||
use MailPoet\Models\Subscriber;
|
use MailPoet\Models\Subscriber;
|
||||||
|
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
|
||||||
|
|
||||||
class SubscribersCount {
|
class SubscribersCount {
|
||||||
|
|
||||||
|
/** @var RequirementsChecker */
|
||||||
|
private $requirements_checker;
|
||||||
|
|
||||||
|
function __construct(RequirementsChecker $requirements_checker = null) {
|
||||||
|
if (!$requirements_checker) {
|
||||||
|
$requirements_checker = new RequirementsChecker(new WooCommerceHelper());
|
||||||
|
}
|
||||||
|
$this->requirements_checker = $requirements_checker;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param DynamicSegment $dynamic_segment
|
* @param DynamicSegment $dynamic_segment
|
||||||
*
|
*
|
||||||
@@ -14,6 +26,9 @@ class SubscribersCount {
|
|||||||
*/
|
*/
|
||||||
function getSubscribersCount(DynamicSegment $dynamic_segment) {
|
function getSubscribersCount(DynamicSegment $dynamic_segment) {
|
||||||
$orm = Subscriber::selectExpr('count(distinct ' . Subscriber::$_table . '.id) as cnt');
|
$orm = Subscriber::selectExpr('count(distinct ' . Subscriber::$_table . '.id) as cnt');
|
||||||
|
if ($this->requirements_checker->shouldSkipSegment($dynamic_segment)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
foreach ($dynamic_segment->getFilters() as $filter) {
|
foreach ($dynamic_segment->getFilters() as $filter) {
|
||||||
$orm = $filter->toSql($orm);
|
$orm = $filter->toSql($orm);
|
||||||
}
|
}
|
||||||
|
@@ -5,9 +5,14 @@ namespace MailPoet\DynamicSegments\Persistence\Loading;
|
|||||||
require_once(ABSPATH . 'wp-admin/includes/user.php');
|
require_once(ABSPATH . 'wp-admin/includes/user.php');
|
||||||
|
|
||||||
use MailPoet\DynamicSegments\Filters\UserRole;
|
use MailPoet\DynamicSegments\Filters\UserRole;
|
||||||
|
use MailPoet\DynamicSegments\RequirementsChecker;
|
||||||
use MailPoet\Models\DynamicSegment;
|
use MailPoet\Models\DynamicSegment;
|
||||||
|
|
||||||
class SubscribersCountTest extends \MailPoetTest {
|
class SubscribersCountTest extends \MailPoetTest {
|
||||||
|
|
||||||
|
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $requirement_checker;
|
||||||
|
|
||||||
function _before() {
|
function _before() {
|
||||||
$this->cleanData();
|
$this->cleanData();
|
||||||
wp_insert_user([
|
wp_insert_user([
|
||||||
@@ -28,9 +33,14 @@ class SubscribersCountTest extends \MailPoetTest {
|
|||||||
'role' => 'editor',
|
'role' => 'editor',
|
||||||
'user_pass' => '12123154',
|
'user_pass' => '12123154',
|
||||||
]);
|
]);
|
||||||
|
$this->requirement_checker = $this
|
||||||
|
->getMockBuilder(RequirementsChecker::class)
|
||||||
|
->setMethods(['shouldSkipSegment'])
|
||||||
|
->getMock();
|
||||||
}
|
}
|
||||||
|
|
||||||
function testItConstructsQuery() {
|
function testItConstructsQuery() {
|
||||||
|
$this->requirement_checker->method('shouldSkipSegment')->willReturn(false);
|
||||||
$userRole = DynamicSegment::create();
|
$userRole = DynamicSegment::create();
|
||||||
$userRole->hydrate([
|
$userRole->hydrate([
|
||||||
'name' => 'segment',
|
'name' => 'segment',
|
||||||
@@ -38,11 +48,25 @@ class SubscribersCountTest extends \MailPoetTest {
|
|||||||
]);
|
]);
|
||||||
$userRole->setFilters([new UserRole('editor', 'and')]);
|
$userRole->setFilters([new UserRole('editor', 'and')]);
|
||||||
|
|
||||||
$loader = new SubscribersCount();
|
$loader = new SubscribersCount($this->requirement_checker);
|
||||||
$count = $loader->getSubscribersCount($userRole);
|
$count = $loader->getSubscribersCount($userRole);
|
||||||
expect($count)->equals(2);
|
expect($count)->equals(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function testItSkipsIfRequirementNotMet() {
|
||||||
|
$this->requirement_checker->method('shouldSkipSegment')->willReturn(true);
|
||||||
|
$userRole = DynamicSegment::create();
|
||||||
|
$userRole->hydrate([
|
||||||
|
'name' => 'segment',
|
||||||
|
'description' => 'description',
|
||||||
|
]);
|
||||||
|
$userRole->setFilters([new UserRole('editor', 'and')]);
|
||||||
|
|
||||||
|
$loader = new SubscribersCount($this->requirement_checker);
|
||||||
|
$count = $loader->getSubscribersCount($userRole);
|
||||||
|
expect($count)->equals(0);
|
||||||
|
}
|
||||||
|
|
||||||
function _after() {
|
function _after() {
|
||||||
$this->cleanData();
|
$this->cleanData();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user