perf(comments): Also cache the comments count

Since we now have an easy way to fetch the comments count and port away
from the deprecated method.

Signed-off-by: Carl Schwan <carl.schwan@nextclound.com>

Author: Carl Schwan

apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php

@@ -21,6 +21,7 @@ class CommentPropertiesPlugin extends ServerPlugin {
 
 	protected ?Server $server = null;
 	private array $cachedUnreadCount = [];
+	private array $cachedCount = [];
 
 	public function __construct(
 		private ICommentsManager $commentsManager,
@@ -44,7 +45,11 @@ public function initialize(\Sabre\DAV\Server $server) {
 		$this->server->on('propFind', [$this, 'handleGetProperties']);
 	}
 
-	private function cacheDirectory(Directory $directory): void {
+	private function cacheDirectory(Directory $directory, PropFind $propFind): void {
+		if (is_null($propFind->getStatus(self::PROPERTY_NAME_UNREAD)) && is_null($propFind->getStatus(self::PROPERTY_NAME_COUNT))) {
+			return;
+		}
+
 		$children = $directory->getChildren();
 
 		$ids = [];
@@ -62,11 +67,20 @@ private function cacheDirectory(Directory $directory): void {
 		}
 
 		$ids[] = (string)$directory->getId();
-		$unread = $this->commentsManager->getNumberOfUnreadCommentsForObjects('files', $ids, $this->userSession->getUser());
+		if (!is_null($propFind->getStatus(self::PROPERTY_NAME_UNREAD))) {
+			$unread = $this->commentsManager->getNumberOfUnreadCommentsForObjects('files', $ids, $this->userSession->getUser());
+			foreach ($unread as $id => $count) {
+				$this->cachedUnreadCount[(int)$id] = $count;
+			}
+		}
 
-		foreach ($unread as $id => $count) {
-			$this->cachedUnreadCount[(int)$id] = $count;
+		if (!is_null($propFind->getStatus(self::PROPERTY_NAME_COUNT))) {
+			$commentCounts = $this->commentsManager->getNumberOfCommentsForObjects('files', $ids);
+			foreach ($commentCounts as $id => $count) {
+				$this->cachedCount[(int)$id] = $count;
+			}
 		}
+
 	}
 
 	/**
@@ -86,15 +100,12 @@ public function handleGetProperties(
 		}
 
 		// need prefetch ?
-		if ($node instanceof Directory
-			&& $propFind->getDepth() !== 0
-			&& !is_null($propFind->getStatus(self::PROPERTY_NAME_UNREAD))
-		) {
-			$this->cacheDirectory($node);
+		if ($node instanceof Directory && $propFind->getDepth() !== 0) {
+			$this->cacheDirectory($node, $propFind);
 		}
 
 		$propFind->handle(self::PROPERTY_NAME_COUNT, function () use ($node): int {
-			return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId());
+			return $this->cachedCount[$node->getId()] ?? $this->commentsManager->getNumberOfCommentsForObjects('files', [(string)$node->getId()])[(string)$node->getId()];
 		});
 
 		$propFind->handle(self::PROPERTY_NAME_HREF, function () use ($node): ?string {
@@ -130,8 +141,9 @@ public function getUnreadCount(Node $node): ?int {
 			return null;
 		}
 
+		$objectId = (string)$node->getId();
 		$lastRead = $this->commentsManager->getReadMark('files', (string)$node->getId(), $user);
 
-		return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId(), $lastRead);
+		return $this->commentsManager->getNumberOfCommentsForObjects('files', [$objectId], $lastRead)[$objectId];
 	}
 }

apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php

@@ -104,8 +104,8 @@ public function testGetUnreadCount(?string $user): void {
 			->willReturn($user);
 
 		$this->commentsManager->expects($this->any())
-			->method('getNumberOfCommentsForObject')
-			->willReturn(42);
+			->method('getNumberOfCommentsForObjects')
+			->willReturn(['4567' => 42]);
 
 		$unread = $this->plugin->getUnreadCount($node);
 		if (is_null($user)) {

lib/private/Comments/Manager.php

@@ -625,33 +625,12 @@ public function searchForObjects(string $search, string $objectType, array $obje
 	 * @return Int
 	 * @since 9.0.0
 	 */
-	public function getNumberOfCommentsForObject($objectType, $objectId, ?\DateTime $notOlderThan = null, $verb = '') {
-		$qb = $this->dbConn->getQueryBuilder();
-		$query = $qb->select($qb->func()->count('id'))
-			->from('comments')
-			->where($qb->expr()->eq('object_type', $qb->createParameter('type')))
-			->andWhere($qb->expr()->eq('object_id', $qb->createParameter('id')))
-			->setParameter('type', $objectType)
-			->setParameter('id', $objectId);
-
-		if (!is_null($notOlderThan)) {
-			$query
-				->andWhere($qb->expr()->gt('creation_timestamp', $qb->createParameter('notOlderThan')))
-				->setParameter('notOlderThan', $notOlderThan, 'datetime');
-		}
-
-		if ($verb !== '') {
-			$query->andWhere($qb->expr()->eq('verb', $qb->createNamedParameter($verb)));
-		}
-
-		$resultStatement = $query->execute();
-		$data = $resultStatement->fetch(\PDO::FETCH_NUM);
-		$resultStatement->closeCursor();
-		return (int)$data[0];
+	public function getNumberOfCommentsForObject($objectType, $objectId, ?\DateTime $notOlderThan = null, $verb = ''): int {
+		return $this->getNumberOfCommentsForObjects($objectType, [$objectId], $notOlderThan, $verb)[$objectId];
 	}
 
 	/** @inheritDoc */
-	public function getNumberOfCommentsForObjects(string $objectType, array $objectIds, ?\DateTime $notOlderThan = null, string $verb = '') {
+	public function getNumberOfCommentsForObjects(string $objectType, array $objectIds, ?\DateTime $notOlderThan = null, string $verb = ''): array {
 		$qb = $this->dbConn->getQueryBuilder();
 		$query = $qb->select($qb->func()->count('id'), 'object_id')
 			->from('comments')

tests/lib/Comments/ManagerTest.php

@@ -326,11 +326,9 @@ public function testGetNumberOfCommentsForObject(): void {
 
 		$manager = $this->getManager();
 
-		$amount = $manager->getNumberOfCommentsForObject('untype', '00');
-		$this->assertSame(0, $amount);
-
-		$amount = $manager->getNumberOfCommentsForObject('files', 'file64');
-		$this->assertSame(4, $amount);
+		$amount = $manager->getNumberOfCommentsForObjects('untype', ['00', 'file64']);
+		$this->assertSame(0, $amount['00']);
+		$this->assertSame(4, $amount['64']);
 	}
 
 	public function testGetNumberOfUnreadCommentsForFolder(): void {