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

- Extracts subscriber recalculation into a spearate method

Browse Source 
- Updates subscriber recalculation logic
This commit is contained in:
Vlad
2016-04-22 09:47:53 -04:00
parent 909ad86e33
commit 5f45c6cc74
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,11 +55,16 @@ class SendingQueue {
$subscribers_ids) {
$subscribers = Subscriber::whereIn('id', $subscribers_ids)
->findArray();
// recalculate the number of subscribers if the total to process count
// does not match the number of subscribers in the database
if (count($subscribers_ids) !== count($subscribers)) {
$subscibers_to_exclude = array_diff($subscribers_ids, Helpers::arrayColumn($subscribers, 'id'));
$queue->subscribers->to_process = array_diff($queue->subscribers->to_process, $subscibers_to_exclude);
$queue->subscribers->to_process = $this->recalculateSubscriberCount(
Helpers::arrayColumn($subscribers, 'id'),
$subscribers_ids,
$queue->subscribers->to_process
);
}
if (!count($queue->subscribers->to_process)) {
$this->updateQueue($queue);
continue;
}
$queue->subscribers = call_user_func_array(
array(
@@ -356,6 +361,12 @@ class SendingQueue {
return;
}
function recalculateSubscriberCount(
$found_subscriber, $existing_subscribers, $subscribers_to_process) {
$subscibers_to_exclude = array_diff($existing_subscribers, $found_subscriber);
return array_diff($subscribers_to_process, $subscibers_to_exclude);
}
private function joinObject($object = array()) {
return implode($this->divider, $object);
}