From 9b78699f0a94fb0d5c7dc340cee3644e9553d859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Mon, 12 Sep 2022 17:14:03 +0200
Subject: [PATCH] Migrate TagMapper to QBMapper instead of deprecated Mapper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 lib/private/Tagging/TagMapper.php | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/private/Tagging/TagMapper.php b/lib/private/Tagging/TagMapper.php
index f6179331e11..7609347967a 100644
--- a/lib/private/Tagging/TagMapper.php
+++ b/lib/private/Tagging/TagMapper.php
@@ -26,14 +26,14 @@
 namespace OC\Tagging;
 
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCP\AppFramework\Db\Mapper;
+use OCP\AppFramework\Db\QBMapper;
 use OCP\IDBConnection;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**
  * Mapper for Tag entity
  */
-class TagMapper extends Mapper {
-
+class TagMapper extends QBMapper {
 	/**
 	 * Constructor.
 	 *
@@ -50,14 +50,18 @@ class TagMapper extends Mapper {
 	 * @param string $type The type of item for which we are loading tags.
 	 * @return array An array of Tag objects.
 	 */
-	public function loadTags($owners, $type) {
+	public function loadTags($owners, string $type): array {
 		if (!is_array($owners)) {
 			$owners = [$owners];
 		}
 
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners) - 1) . '?) AND `type` = ? ORDER BY `category`';
-		return $this->findEntities($sql, array_merge($owners, [$type]));
+		$qb = $this->db->getQueryBuilder();
+		$qb->select(['id', 'uid', 'type', 'category'])
+			->from($this->getTableName())
+			->where($qb->expr()->in('uid', $qb->createNamedParameter($owners, IQueryBuilder::PARAM_STR_ARRAY)))
+			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
+			->orderBy('category');
+		return $this->findEntities($qb);
 	}
 
 	/**
@@ -67,10 +71,14 @@ class TagMapper extends Mapper {
 	 * @return bool
 	 */
 	public function tagExists($tag) {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
+		$qb = $this->db->getQueryBuilder();
+		$qb->select(['id', 'uid', 'type', 'category'])
+			->from($this->getTableName())
+			->where($qb->expr()->eq('uid', $qb->createNamedParameter($tag->getOwner(), IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($tag->getType(), IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('category', $qb->createNamedParameter($tag->getName(), IQueryBuilder::PARAM_STR)));
 		try {
-			$this->findEntity($sql, [$tag->getOwner(), $tag->getType(), $tag->getName()]);
+			$this->findEntity($qb);
 		} catch (DoesNotExistException $e) {
 			return false;
 		}