to avoid conflict, filters failing instance when processing queue

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

2 files changed, 3 insertions, 12 deletions

diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index efe8b813..a87672d6 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -363,15 +363,6 @@ class CoreRequestBuilder {
 
 	/**
 	 * @param IQueryBuilder $qb
-	 * @param string $order
-	 */
-	protected function orderByPriority(IQueryBuilder &$qb, string $order = 'desc') {
-		$qb->orderBy('priority', $order);
-	}
-
-
-	/**
-	 * @param IQueryBuilder $qb
 	 * @param string $field
 	 * @param string $value
 	 * @param bool $cs - case sensitive
diff --git a/lib/Db/RequestQueueRequest.php b/lib/Db/RequestQueueRequest.php
index d358051e..4e07ffba 100644
--- a/lib/Db/RequestQueueRequest.php
+++ b/lib/Db/RequestQueueRequest.php
@@ -86,14 +86,14 @@ class RequestQueueRequest extends RequestQueueRequestBuilder {
 
 
 	/**
-	 * return Queue from database based on the status != 9
+	 * return Queue from database based on the status=0
 	 *
 	 * @return RequestQueue[]
 	 */
 	public function getStandby(): array {
 		$qb = $this->getQueueSelectSql();
 		$this->limitToStatus($qb, RequestQueue::STATUS_STANDBY);
-		$this->orderByPriority($qb, 'desc');
+		$qb->orderBy('id', 'asc');
 
 		$requests = [];
 		$cursor = $qb->execute();
@@ -122,7 +122,7 @@ class RequestQueueRequest extends RequestQueueRequestBuilder {
 			$this->limitToStatus($qb, $status);
 		}
 
-		$this->orderByPriority($qb);
+		$qb->orderBy('priority', 'desc');
 
 		$requests = [];
 		$cursor = $qb->execute();