From 0c610bd991f3390dc7bed2661e97766ed74fb171 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 1 Feb 2022 22:43:10 -0800
Subject: [PATCH] (REF) CRM_Queue_Queue_Sql* - Dedupe `createItem()` function

Consolidate duplicate implementations. Move to trait.
---
 CRM/Queue/Queue/Sql.php         | 18 ------------------
 CRM/Queue/Queue/SqlParallel.php | 18 ------------------
 CRM/Queue/Queue/SqlTrait.php    | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/CRM/Queue/Queue/Sql.php b/CRM/Queue/Queue/Sql.php
index 28b55be9b2..1cee3894c3 100644
--- a/CRM/Queue/Queue/Sql.php
+++ b/CRM/Queue/Queue/Sql.php
@@ -34,24 +34,6 @@ class CRM_Queue_Queue_Sql extends CRM_Queue_Queue {
     parent::__construct($queueSpec);
   }
 
-  /**
-   * Add a new item to the queue.
-   *
-   * @param mixed $data
-   *   Serializable PHP object or array.
-   * @param array $options
-   *   Queue-dependent options; for example, if this is a
-   *   priority-queue, then $options might specify the item's priority.
-   */
-  public function createItem($data, $options = []) {
-    $dao = new CRM_Queue_DAO_QueueItem();
-    $dao->queue_name = $this->getName();
-    $dao->submit_time = CRM_Utils_Time::getTime('YmdHis');
-    $dao->data = serialize($data);
-    $dao->weight = CRM_Utils_Array::value('weight', $options, 0);
-    $dao->save();
-  }
-
   /**
    * Get the next item.
    *
diff --git a/CRM/Queue/Queue/SqlParallel.php b/CRM/Queue/Queue/SqlParallel.php
index 93f13f0ec4..bf48d45e93 100644
--- a/CRM/Queue/Queue/SqlParallel.php
+++ b/CRM/Queue/Queue/SqlParallel.php
@@ -34,24 +34,6 @@ class CRM_Queue_Queue_SqlParallel extends CRM_Queue_Queue {
     parent::__construct($queueSpec);
   }
 
-  /**
-   * Add a new item to the queue.
-   *
-   * @param mixed $data
-   *   Serializable PHP object or array.
-   * @param array $options
-   *   Queue-dependent options; for example, if this is a
-   *   priority-queue, then $options might specify the item's priority.
-   */
-  public function createItem($data, $options = []) {
-    $dao = new CRM_Queue_DAO_QueueItem();
-    $dao->queue_name = $this->getName();
-    $dao->submit_time = CRM_Utils_Time::getTime('YmdHis');
-    $dao->data = serialize($data);
-    $dao->weight = CRM_Utils_Array::value('weight', $options, 0);
-    $dao->save();
-  }
-
   /**
    * Get the next item.
    *
diff --git a/CRM/Queue/Queue/SqlTrait.php b/CRM/Queue/Queue/SqlTrait.php
index 0aadbd6416..4c93e2d320 100644
--- a/CRM/Queue/Queue/SqlTrait.php
+++ b/CRM/Queue/Queue/SqlTrait.php
@@ -65,6 +65,24 @@ trait CRM_Queue_Queue_SqlTrait {
     ]);
   }
 
+  /**
+   * Add a new item to the queue.
+   *
+   * @param mixed $data
+   *   Serializable PHP object or array.
+   * @param array $options
+   *   Queue-dependent options; for example, if this is a
+   *   priority-queue, then $options might specify the item's priority.
+   */
+  public function createItem($data, $options = []) {
+    $dao = new CRM_Queue_DAO_QueueItem();
+    $dao->queue_name = $this->getName();
+    $dao->submit_time = CRM_Utils_Time::getTime('YmdHis');
+    $dao->data = serialize($data);
+    $dao->weight = CRM_Utils_Array::value('weight', $options, 0);
+    $dao->save();
+  }
+
   /**
    * Remove an item from the queue.
    *
-- 
2.25.1