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

Move automatic emails to own scheduler

Browse Source 
[MAILPOET-2348]
This commit is contained in:
Pavel Dohnal
2019-09-09 13:28:05 +02:00
committed by Jack Kitterhing
parent 493e16606c
commit 41c01ca230
4 changed files with 332 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
tests/integration/Newsletter/Scheduler/SchedulerTest.php
View File

@@ -67,172 +67,6 @@ class SchedulerTest extends \MailPoetTest {
->equals('2016-04-20 16:00:00');
}
function testItCreatesScheduledAutomaticEmailSendingTaskForUser() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC);
$this->_createNewsletterOptions(
$newsletter->id,
Newsletter::TYPE_AUTOMATIC,
[
'sendTo' => 'user',
'afterTimeType' => 'hours',
'afterTimeNumber' => 2,
]
);
$newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_AUTOMATIC)->findOne($newsletter->id);
$subscriber = Subscriber::create();
$subscriber->hydrate(Fixtures::get('subscriber_template'));
$subscriber->save();
Scheduler::createAutomaticEmailSendingTask($newsletter, $subscriber->id, $meta = null);
// new scheduled task should be created
$task = SendingTask::getByNewsletterId($newsletter->id);
$current_time = Carbon::createFromTimestamp(current_time('timestamp'));
Carbon::setTestNow($current_time); // mock carbon to return current time
expect($task->id)->greaterOrEquals(1);
expect($task->priority)->equals(SendingQueue::PRIORITY_MEDIUM);
expect($task->status)->equals(SendingQueue::STATUS_SCHEDULED);
expect(Carbon::parse($task->scheduled_at)->format('Y-m-d H:i'))
->equals($current_time->addHours(2)->format('Y-m-d H:i'));
// task should have 1 associated user
$subscribers = $task->subscribers()->findMany();
expect($subscribers)->count(1);
expect($subscribers[0]->id)->equals($subscriber->id);
}
function testItAddsMetaToSendingQueueWhenCreatingAutomaticEmailSendingTask() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC);
$this->_createNewsletterOptions(
$newsletter->id,
Newsletter::TYPE_AUTOMATIC,
[
'sendTo' => 'user',
'afterTimeType' => 'hours',
'afterTimeNumber' => 2,
]
);
$newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_AUTOMATIC)->findOne($newsletter->id);
$subscriber = Subscriber::create();
$subscriber->hydrate(Fixtures::get('subscriber_template'));
$subscriber->save();
$meta = ['some' => 'value'];
Scheduler::createAutomaticEmailSendingTask($newsletter, $subscriber->id, $meta);
// new queue record should be created with meta data
$queue = SendingQueue::where('newsletter_id', $newsletter->id)->findOne();
expect($queue->getMeta())->equals($meta);
}
function testItCreatesAutomaticEmailSendingTaskForSegment() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC);
$this->_createNewsletterOptions(
$newsletter->id,
Newsletter::TYPE_AUTOMATIC,
[
'sendTo' => 'segment',
'afterTimeType' => 'hours',
'afterTimeNumber' => 2,
]
);
$newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_AUTOMATIC)->findOne($newsletter->id);
Scheduler::createAutomaticEmailSendingTask($newsletter, $subscriber = null, $meta = null);
// new scheduled task should be created
$task = SendingTask::getByNewsletterId($newsletter->id);
$current_time = Carbon::createFromTimestamp(current_time('timestamp'));
Carbon::setTestNow($current_time); // mock carbon to return current time
expect($task->id)->greaterOrEquals(1);
expect($task->priority)->equals(SendingQueue::PRIORITY_MEDIUM);
expect($task->status)->equals(SendingQueue::STATUS_SCHEDULED);
expect(Carbon::parse($task->scheduled_at)->format('Y-m-d H:i'))
->equals($current_time->addHours(2)->format('Y-m-d H:i'));
// task should not have any subscribers
$subscribers = $task->subscribers()->findMany();
expect($subscribers)->count(0);
}
function testItDoesNotScheduleAutomaticEmailWhenGroupDoesNotMatch() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC);
$this->_createNewsletterOptions(
$newsletter->id,
Newsletter::TYPE_AUTOMATIC,
[
'group' => 'some_group',
'event' => 'some_event',
'sendTo' => 'user',
'afterTimeType' => 'hours',
'afterTimeNumber' => 2,
]
);
// email should not be scheduled when group is not matched
Scheduler::scheduleAutomaticEmail('group_does_not_exist', 'some_event');
expect(SendingQueue::findMany())->count(0);
}
function testItDoesNotScheduleAutomaticEmailWhenEventDoesNotMatch() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC);
$this->_createNewsletterOptions(
$newsletter->id,
Newsletter::TYPE_AUTOMATIC,
[
'group' => 'some_group',
'event' => 'some_event',
'sendTo' => 'user',
'afterTimeType' => 'hours',
'afterTimeNumber' => 2,
]
);
// email should not be scheduled when event is not matched
Scheduler::scheduleAutomaticEmail('some_group', 'event_does_not_exist');
expect(SendingQueue::findMany())->count(0);
}
function testItSchedulesAutomaticEmailWhenConditionMatches() {
$current_time = Carbon::createFromTimestamp(current_time('timestamp'));
Carbon::setTestNow($current_time); // mock carbon to return current time
$newsletter_1 = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC);
$this->_createNewsletterOptions(
$newsletter_1->id,
Newsletter::TYPE_AUTOMATIC,
[
'group' => 'some_group',
'event' => 'some_event',
'sendTo' => 'user',
'afterTimeType' => 'hours',
'afterTimeNumber' => 2,
]
);
$newsletter_2 = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC);
$this->_createNewsletterOptions(
$newsletter_2->id,
Newsletter::TYPE_AUTOMATIC,
[
'group' => 'some_group',
'event' => 'some_event',
'sendTo' => 'segment',
'afterTimeType' => 'hours',
'afterTimeNumber' => 2,
]
);
$condition = function($email) {
return $email->sendTo === 'segment';
};
// email should only be scheduled if it matches condition ("send to segment")
Scheduler::scheduleAutomaticEmail('some_group', 'some_event', $condition);
$result = SendingQueue::findMany();
expect($result)->count(1);
expect($result[0]->newsletter_id)->equals($newsletter_2->id);
// scheduled task should be created
$task = $result[0]->getTasks()->findOne();
expect($task->id)->greaterOrEquals(1);
expect($task->priority)->equals(SendingQueue::PRIORITY_MEDIUM);
expect($task->status)->equals(SendingQueue::STATUS_SCHEDULED);
expect(Carbon::parse($task->scheduled_at)->format('Y-m-d H:i'))
->equals($current_time->addHours(2)->format('Y-m-d H:i'));
}
private function _createNewsletter(
$type = Newsletter::TYPE_NOTIFICATION,
$status = Newsletter::STATUS_ACTIVE