MAGE-1151: fix queue merging

Author: damcou

Model/Job.php

@@ -124,35 +124,47 @@ public function canMerge(Job $job, $maxJobDataSize)
 
         $decodedData = $this->getDecodedData();
 
+        // @todo Remove legacy checks on 3.16.0
         if ((!isset($decodedData['product_ids']) || count($decodedData['product_ids']) <= 0)
             && (!isset($decodedData['category_ids']) || count($decodedData['category_ids']) < 0)
+            && (!isset($decodedData['ids']) || count($decodedData['ids']) < 0)
             && (!isset($decodedData['page_ids']) || count($decodedData['page_ids']) < 0)) {
             return false;
         }
 
         $candidateDecodedData = $job->getDecodedData();
 
+        // @todo Remove legacy checks on 3.16.0
         if ((!isset($candidateDecodedData['product_ids']) || count($candidateDecodedData['product_ids']) <= 0)
             && (!isset($candidateDecodedData['category_ids']) || count($candidateDecodedData['category_ids']) < 0)
+            && (!isset($candidateDecodedData['ids']) || count($candidateDecodedData['ids']) < 0)
             && (!isset($candidateDecodedData['page_ids']) || count($candidateDecodedData['page_ids']) < 0)) {
             return false;
         }
 
+        // @todo Remove on 3.16.0
         if (isset($decodedData['product_ids'])
             && count($decodedData['product_ids']) + count($candidateDecodedData['product_ids']) > $maxJobDataSize) {
             return false;
         }
 
+        // @todo Remove on 3.16.0
         if (isset($decodedData['category_ids'])
             && count($decodedData['category_ids']) + count($candidateDecodedData['category_ids']) > $maxJobDataSize) {
             return false;
         }
 
+        // @todo Remove on 3.16.0
         if (isset($decodedData['page_ids'])
             && count($decodedData['page_ids']) + count($candidateDecodedData['page_ids']) > $maxJobDataSize) {
             return false;
         }
 
+        if (isset($decodedData['ids'])
+            && count($decodedData['ids']) + count($candidateDecodedData['ids']) > $maxJobDataSize) {
+            return false;
+        }
+
         return true;
     }
 
@@ -173,6 +185,7 @@ public function merge(Job $mergedJob)
 
         $dataSize = $this->getDataSize();
 
+        // @todo Remove useless code on 3.16.0
         if (isset($decodedData['product_ids'])) {
             $decodedData['product_ids'] = array_unique(array_merge(
                 $decodedData['product_ids'],
@@ -194,6 +207,13 @@ public function merge(Job $mergedJob)
             ));
 
             $dataSize = count($decodedData['page_ids']);
+        } elseif (isset($decodedData['ids'])) {
+            $decodedData['ids'] = array_unique(array_merge(
+                $decodedData['ids'],
+                $mergedJobDecodedData['ids']
+            ));
+
+            $dataSize = count($decodedData['ids']);
         }
 
         $this->setDecodedData($decodedData);