Merge pull request #69 from nextcloud-gmbh/small-fix

small fixes

4 files changed, 24 insertions, 25 deletions

diff --git a/lib/Db/ActorsRequest.php b/lib/Db/ActorsRequest.php
index 09b37e4b..00572296 100644
--- a/lib/Db/ActorsRequest.php
+++ b/lib/Db/ActorsRequest.php
@@ -60,32 +60,28 @@ class ActorsRequest extends ActorsRequestBuilder {
 	 * @param Person $actor
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws SocialAppConfigException
 	 */
 	public function create(Person $actor): string {
 
 		$id = $this->configService->getUrlSocial() . '@' . $actor->getPreferredUsername();
 
-		try {
-			$qb = $this->getActorsInsertSql();
+		$qb = $this->getActorsInsertSql();
 
-			$qb->setValue('id', $qb->createNamedParameter($id))
+		$qb->setValue('id', $qb->createNamedParameter($id))
 //			   ->setValue('type', $qb->createNamedParameter($actor->getType()))
-			   ->setValue('user_id', $qb->createNamedParameter($actor->getUserId()))
-			   ->setValue('name', $qb->createNamedParameter($actor->getName()))
-			   ->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
-			   ->setValue(
-				   'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
-			   )
-			   ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
-			   ->setValue('private_key', $qb->createNamedParameter($actor->getPrivateKey()));
-
-			$qb->execute();
-
-			return $id;
-		} catch (\Exception $e) {
-			throw $e;
-		}
+		   ->setValue('user_id', $qb->createNamedParameter($actor->getUserId()))
+		   ->setValue('name', $qb->createNamedParameter($actor->getName()))
+		   ->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
+		   ->setValue(
+			   'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername())
+		   )
+		   ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
+		   ->setValue('private_key', $qb->createNamedParameter($actor->getPrivateKey()));
+
+		$qb->execute();
+
+		return $id;
 	}
 
 
diff --git a/lib/Db/CacheDocumentsRequest.php b/lib/Db/CacheDocumentsRequest.php
index d71a113f..dcb153ad 100644
--- a/lib/Db/CacheDocumentsRequest.php
+++ b/lib/Db/CacheDocumentsRequest.php
@@ -151,7 +151,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
 		$this->limitToDBFieldEmpty($qb, 'local_copy');
 		$this->limitToCaching($qb, self::CACHE_TTL);
 		$this->limitToDBFieldInt($qb, 'error', 0);
-		
+
 		$documents = [];
 		$cursor = $qb->execute();
 		while ($data = $cursor->fetch()) {
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index e62d72fe..efe8b813 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -363,9 +363,10 @@ class CoreRequestBuilder {
 
 	/**
 	 * @param IQueryBuilder $qb
+	 * @param string $order
 	 */
-	protected function orderByPriority(IQueryBuilder &$qb) {
-		$qb->orderBy('priority', 'desc');
+	protected function orderByPriority(IQueryBuilder &$qb, string $order = 'desc') {
+		$qb->orderBy('priority', $order);
 	}
 
 
diff --git a/lib/Db/RequestQueueRequest.php b/lib/Db/RequestQueueRequest.php
index 33ca298c..045e9c16 100644
--- a/lib/Db/RequestQueueRequest.php
+++ b/lib/Db/RequestQueueRequest.php
@@ -180,9 +180,11 @@ class RequestQueueRequest extends RequestQueueRequestBuilder {
 	 */
 	public function setAsFailure(RequestQueue &$queue) {
 		$qb = $this->getQueueUpdateSql();
-		$qb->set('status', $qb->createNamedParameter(RequestQueue::STATUS_STANDBY));
-		// TODO - increment tries++
-//		   ->set('tries', 'tries+1');
+		$func = $qb->func();
+		$expr = $qb->expr();
+
+		$qb->set('status', $qb->createNamedParameter(RequestQueue::STATUS_STANDBY))
+		   ->set('tries', $func->add('tries', $expr->literal(1)));
 		$this->limitToId($qb, $queue->getId());
 		$this->limitToStatus($qb, RequestQueue::STATUS_RUNNING);