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

Fix import step 2 list selection box tallying unconfirmed subscribers (item B from #476)

Browse Source 
Segments::getSegmentsForImport() was aliased to Segments::getSegmentsWithSubscriberCount()
This commit is contained in:
Alexey Stoletniy
2016-11-30 12:19:19 +03:00
parent f90ba712ee
commit b074b01b9f
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Models/Segment.php
View File

@ -174,31 +174,7 @@ class Segment extends Model {
} }
static function getSegmentsForImport() { static function getSegmentsForImport() {
$query = self::selectMany(array(self::$_table.'.id', self::$_table.'.name')) return self::getSegmentsWithSubscriberCount($type = false);
->selectExpr(
self::$_table.'.*, ' .
'COUNT(IF('.
MP_SUBSCRIBER_SEGMENT_TABLE.'.status="'.Subscriber::STATUS_SUBSCRIBED.'"'
.' AND '.
MP_SUBSCRIBERS_TABLE.'.deleted_at IS NULL'
.', 1, NULL)) `subscribers`'
)
->leftOuterJoin(
MP_SUBSCRIBER_SEGMENT_TABLE,
array(self::$_table.'.id', '=', MP_SUBSCRIBER_SEGMENT_TABLE.'.segment_id'))
->leftOuterJoin(
MP_SUBSCRIBERS_TABLE,
array(MP_SUBSCRIBER_SEGMENT_TABLE.'.subscriber_id', '=', MP_SUBSCRIBERS_TABLE.'.id'))
->groupBy(self::$_table.'.id')
->groupBy(self::$_table.'.name')
->orderByAsc(self::$_table.'.name')
->whereNull(self::$_table.'.deleted_at');
if(!empty($type)) {
$query->where(self::$_table.'.type', $type);
}
return $query->findArray();
} }
static function getSegmentsForExport($withConfirmedSubscribers = false) { static function getSegmentsForExport($withConfirmedSubscribers = false) {

12
tests/unit/Subscribers/ImportExport/ImportExportFactoryTest.php
View File

@ -22,7 +22,7 @@ class ImportExportFactoryTest extends MailPoetTest {
'first_name' => 'Mike', 'first_name' => 'Mike',
'last_name' => 'Smith', 'last_name' => 'Smith',
'status' => Subscriber::STATUS_SUBSCRIBED, 'status' => Subscriber::STATUS_SUBSCRIBED,
'email' => 'mike@maipoet.com' 'email' => 'mike@mailpoet.com'
)); ));
$association = SubscriberSegment::create(); $association = SubscriberSegment::create();
@ -50,27 +50,27 @@ class ImportExportFactoryTest extends MailPoetTest {
expect($segments[0]['name'])->equals('Confirmed Segment'); expect($segments[0]['name'])->equals('Confirmed Segment');
expect($segments[0]['subscriberCount'])->equals(1); expect($segments[0]['subscriberCount'])->equals(1);
expect($segments[1]['name'])->equals('Unconfirmed Segment'); expect($segments[1]['name'])->equals('Unconfirmed Segment');
expect($segments[1]['subscriberCount'])->equals(1); expect($segments[1]['subscriberCount'])->equals(0);
} }
function testItCanGetPublicSegmentsForImport() { function testItCanGetPublicSegmentsForImport() {
$segments = $this->importFactory->getSegments(); $segments = $this->importFactory->getSegments();
expect($segments[0]['subscriberCount'])->equals(1); expect($segments[0]['subscriberCount'])->equals(1);
expect($segments[1]['subscriberCount'])->equals(1); expect($segments[1]['subscriberCount'])->equals(0);
$subscriber = Subscriber::where( $subscriber = Subscriber::where(
'email', 'john@mailpoet.com' 'email', 'mike@mailpoet.com'
)->findOne(); )->findOne();
expect($subscriber->deleted_at)->null(); expect($subscriber->deleted_at)->null();
$subscriber->trash(); $subscriber->trash();
$subscriber = Subscriber::where( $subscriber = Subscriber::where(
'email', 'john@mailpoet.com' 'email', 'mike@mailpoet.com'
)->whereNull('deleted_at')->findOne(); )->whereNull('deleted_at')->findOne();
expect($subscriber)->false(); expect($subscriber)->false();
$segments = $this->importFactory->getSegments(); $segments = $this->importFactory->getSegments();
expect($segments[0]['subscriberCount'])->equals(1); expect($segments[0]['subscriberCount'])->equals(0);
expect($segments[1]['subscriberCount'])->equals(0); expect($segments[1]['subscriberCount'])->equals(0);
} }