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

Merge pull request #1422 from mailpoet/tasks-pausing

Browse Source 
Pause scheduled tasks for deactivated emails [MAILPOET-1442]
This commit is contained in:
Michelle Shull
2018-07-10 09:59:03 -04:00
committed by GitHub
parent 90bdcd2213 bd08a529db
commit b44fe6d522
3 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RoboFile.php
View File

@ -273,7 +273,7 @@ class RoboFile extends \Robo\Tasks {
->taskExec(
'./vendor/bin/phpcs '.
'--standard=./tasks/code_sniffer/MailPoet '.
'--runtime-set testVersion 5.3-7.0 '.
'--runtime-set testVersion 5.4-7.2 '.
'--ignore=./lib/Util/Sudzy/*,./lib/Util/CSS.php,./lib/Util/XLSXWriter.php,'.
'./lib/Util/pQuery/*,./lib/Config/PopulatorData/Templates/* '.
'lib/ '.
@ -282,7 +282,7 @@ class RoboFile extends \Robo\Tasks {
->taskExec(
'./vendor/bin/phpcs '.
'--standard=./tasks/code_sniffer/MailPoet '.
'--runtime-set testVersion 5.4-7.0 '.
'--runtime-set testVersion 5.4-7.2 '.
'--ignore=./tests/unit/_bootstrap.php '.
'tests/unit/ '.
$severityFlag

7
lib/Models/Newsletter.php
View File

@ -325,10 +325,13 @@ class Newsletter extends Model {
$this->set('status', $status);
$this->save();
}
if(($status === self::STATUS_DRAFT) && ($this->type === self::TYPE_NOTIFICATION)) {
$types_with_activation = [self::TYPE_NOTIFICATION, self::TYPE_WELCOME, self::TYPE_AUTOMATIC];
if(($status === self::STATUS_DRAFT) && in_array($this->type, $types_with_activation)) {
ScheduledTask::pauseAllByNewsletter($this);
}
if(($status === self::STATUS_ACTIVE) && ($this->type === self::TYPE_NOTIFICATION)) {
if(($status === self::STATUS_ACTIVE) && in_array($this->type, $types_with_activation)) {
ScheduledTask::setScheduledAllByNewsletter($this);
}
return $this;

61
tests/unit/Models/NewsletterTest.php
View File

@ -875,36 +875,43 @@ class NewsletterTest extends \MailPoetTest {
expect($newsletter->getMeta())->equals($meta);
}
function testPausesTaskWhenPostNotificationIsDisabled() {
$newsletter = Newsletter::createOrUpdate(array(
'type' => Newsletter::TYPE_NOTIFICATION
));
$task = ScheduledTask::createOrUpdate(array('status' => ScheduledTask::STATUS_SCHEDULED));
SendingQueue::createOrUpdate(array(
'newsletter_id' => $newsletter->id(),
'task_id' => $task->id(),
));
$newsletter->setStatus(Newsletter::STATUS_DRAFT);
$task_found = ScheduledTask::findOne($task->id());
expect($task_found->status)->equals(ScheduledTask::STATUS_PAUSED);
function testPausesTaskWhenNewsletterWithActivationIsDisabled() {
$newsletters_with_activation = [Newsletter::TYPE_NOTIFICATION, Newsletter::TYPE_WELCOME, Newsletter::TYPE_AUTOMATIC];
foreach($newsletters_with_activation as $type) {
$newsletter = Newsletter::createOrUpdate(array(
'type' => $type
));
$task = ScheduledTask::createOrUpdate(array('status' => ScheduledTask::STATUS_SCHEDULED));
SendingQueue::createOrUpdate(array(
'newsletter_id' => $newsletter->id(),
'task_id' => $task->id(),
));
$newsletter->setStatus(Newsletter::STATUS_DRAFT);
$task_found = ScheduledTask::findOne($task->id());
expect($task_found->status)->equals(ScheduledTask::STATUS_PAUSED);
}
}
function testUnpausesTaskWhenPostNotificationIsEnabled() {
$newsletter = Newsletter::createOrUpdate(array(
'type' => Newsletter::TYPE_NOTIFICATION
));
$task = ScheduledTask::createOrUpdate(array(
'status' => ScheduledTask::STATUS_PAUSED,
'scheduled_at' => Carbon::createFromTimestamp(current_time('timestamp'))->addDays(10)->format('Y-m-d H:i:s'),
));
SendingQueue::createOrUpdate(array(
'newsletter_id' => $newsletter->id(),
'task_id' => $task->id(),
));
$newsletter->setStatus(Newsletter::STATUS_ACTIVE);
$task_found = ScheduledTask::findOne($task->id());
expect($task_found->status)->equals(ScheduledTask::STATUS_SCHEDULED);
function testUnpausesTaskWhenNewsletterWithActivationIsEnabled() {
$newsletters_with_activation = [Newsletter::TYPE_NOTIFICATION, Newsletter::TYPE_WELCOME, Newsletter::TYPE_AUTOMATIC];
foreach($newsletters_with_activation as $type) {
$newsletter = Newsletter::createOrUpdate(array(
'type' => $type
));
$task = ScheduledTask::createOrUpdate(array(
'status' => ScheduledTask::STATUS_PAUSED,
'scheduled_at' => Carbon::createFromTimestamp(current_time('timestamp'))->addDays(10)->format('Y-m-d H:i:s'),
));
SendingQueue::createOrUpdate(array(
'newsletter_id' => $newsletter->id(),
'task_id' => $task->id(),
));
$newsletter->setStatus(Newsletter::STATUS_ACTIVE);
$task_found = ScheduledTask::findOne($task->id());
expect($task_found->status)->equals(ScheduledTask::STATUS_SCHEDULED);
}
}
function _after() {
\ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table);
\ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);