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

Sending queue refactoring WIP [MAILPOET-903]

Browse Source
This commit is contained in:
stoletniy
2017-12-21 23:50:43 +03:00
parent bf8b0c81df
commit c0c57f6b67
17 changed files with 684 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Cron/Workers/Scheduler.php
View File

@ -4,10 +4,10 @@ namespace MailPoet\Cron\Workers;
use Carbon\Carbon;
use MailPoet\Cron\CronHelper;
use MailPoet\Models\Newsletter;
use MailPoet\Models\SendingQueue;
use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberSegment;
use MailPoet\Segments\SubscribersFinder;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Util\Helpers;
use MailPoet\Newsletter\Scheduler\Scheduler as NewsletterScheduler;
@ -46,12 +46,12 @@ class Scheduler {
}
function processWelcomeNewsletter($newsletter, $queue) {
$subscriber = unserialize($queue->subscribers);
if(empty($subscriber['to_process'][0])) {
$subscribers = $queue->getSubscribers();
if(empty($subscribers[0])) {
$queue->delete();
return false;
}
$subscriber_id = (int)$subscriber['to_process'][0];
$subscriber_id = (int)$subscribers[0];
if($newsletter->event === 'segment') {
if($this->verifyMailpoetSubscriber($subscriber_id, $newsletter, $queue) === false) {
return false;
@ -91,12 +91,7 @@ class Scheduler {
// queue newsletter for delivery
$queue->newsletter_id = $notification_history->id;
$queue->subscribers = serialize(
array(
'to_process' => $subscribers
)
);
$queue->count_total = $queue->count_to_process = count($subscribers);
$queue->setSubscribers($subscribers);
$queue->status = null;
$queue->save();
// update notification status
@ -110,12 +105,7 @@ class Scheduler {
$subscribers = $finder->getSubscribersByList($segments);
$subscribers = Helpers::flattenArray($subscribers);
// update current queue
$queue->subscribers = serialize(
array(
'to_process' => $subscribers
)
);
$queue->count_total = $queue->count_to_process = count($subscribers);
$queue->setSubscribers($subscribers);
$queue->status = null;
$queue->save();
// update newsletter status
@ -189,9 +179,6 @@ class Scheduler {
}
static function getScheduledQueues() {
return SendingQueue::where('status', SendingQueue::STATUS_SCHEDULED)
->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))
->whereNull('type')
->findMany();
return SendingTask::getScheduledQueues();
}
}