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

Refactor sendingQueue to distinguish bulk/individual sending method

Browse Source 
[MAILPOET-1154]
This commit is contained in:
Rostislav Wolny
2018-09-11 16:56:26 +02:00
parent 3ae8763837
commit ea4c5f46fb
4 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Cron/Workers/SendingQueue/SendingQueue.php
View File

@ -129,12 +129,12 @@ class SendingQueue {
'queue_id' => $queue->id
);
if($processing_method === 'individual') {
$queue = $this->sendNewsletters(
$queue = $this->sendNewsletter(
$queue,
$prepared_subscribers_ids,
$prepared_subscribers_ids[0],
$prepared_newsletters[0],
$prepared_subscribers[0],
$statistics,
$statistics[0],
array('unsubscribe_url' => $unsubscribe_urls[0])
);
$prepared_newsletters = array();
@ -157,16 +157,37 @@ class SendingQueue {
return $queue;
}
function sendNewsletter(
SendingTask $sending_task, $prepared_subscriber_id, $prepared_newsletter,
$prepared_subscriber, $statistics, $extra_params = array()
) {
// send newsletter
$send_result = $this->mailer_task->send(
$prepared_newsletter,
$prepared_subscriber,
$extra_params
);
return $this->processSendResult($sending_task, $send_result, [$prepared_subscriber_id], [$statistics]);
}
function sendNewsletters(
SendingTask $sending_task, $prepared_subscribers_ids, $prepared_newsletters,
$prepared_subscribers, $statistics, $extra_params = array()
) {
// send newsletter
$send_result = $this->mailer_task->send(
// send newsletters
$send_result = $this->mailer_task->sendBulk(
$prepared_newsletters,
$prepared_subscribers,
$extra_params
);
return $this->processSendResult($sending_task, $send_result, $prepared_subscribers_ids, $statistics);
}
private function processSendResult(
SendingTask $sending_task,
$send_result,
array $prepared_subscribers_ids, array $statistics
) {
// log error message and schedule retry/pause sending
if($send_result['response'] === false) {
$error = $send_result['error'];

16
lib/Cron/Workers/SendingQueue/Tasks/Mailer.php
View File

@ -54,11 +54,25 @@ class Mailer {
return $this->mailer->formatSubscriberNameAndEmailAddress($subscriber);
}
function send($prepared_newsletters, $prepared_subscribers, $extra_params = array()) {
function sendBulk($prepared_newsletters, $prepared_subscribers, $extra_params = array()) {
if($this->getProcessingMethod() === 'individual') {
throw new \LogicException('Trying to send a batch with individual processing method');
}
return $this->mailer->mailer_instance->send(
$prepared_newsletters,
$prepared_subscribers,
$extra_params
);
}
function send($prepared_newsletter, $prepared_subscriber, $extra_params = array()) {
if($this->getProcessingMethod() === 'bulk') {
throw new \LogicException('Trying to send an individual email with a bulk processing method');
}
return $this->mailer->mailer_instance->send(
$prepared_newsletter,
$prepared_subscriber,
$extra_params
);
}
}