From 4a9e399cc9c7b3077a93335d1defa5135c020d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 11 Jul 2023 15:33:45 +0200
Subject: [PATCH] feat: Use user display name cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Db/User.php                |  2 +-
 lib/Service/CommentService.php |  3 +--
 lib/Service/SearchService.php  |  3 +--
 tests/unit/Db/UserTest.php     | 12 ++++++------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/Db/User.php b/lib/Db/User.php
index b33e264d9..7f38dd067 100644
--- a/lib/Db/User.php
+++ b/lib/Db/User.php
@@ -37,7 +37,7 @@ class User extends RelationalObject {
 	public function getObjectSerialization() {
 		return [
 			'uid' => $this->getObject()->getUID(),
-			'displayname' => $this->getObject()->getDisplayName(),
+			'displayname' => $this->getDisplayName(),
 			'type' => Acl::PERMISSION_TYPE_USER
 		];
 	}
diff --git a/lib/Service/CommentService.php b/lib/Service/CommentService.php
index b33f84342..45baaec42 100644
--- a/lib/Service/CommentService.php
+++ b/lib/Service/CommentService.php
@@ -197,8 +197,7 @@ class CommentService {
 	}
 
 	private function formatComment(IComment $comment, $addReplyTo = false): array {
-		$user = $this->userManager->get($comment->getActorId());
-		$actorDisplayName = $user !== null ? $user->getDisplayName() : $comment->getActorId();
+		$actorDisplayName = $this->userManager->getDisplayName($comment->getActorId()) ?? $comment->getActorId();
 
 		$formattedComment = [
 			'id' => (int)$comment->getId(),
diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php
index 421747403..50a891e21 100644
--- a/lib/Service/SearchService.php
+++ b/lib/Service/SearchService.php
@@ -115,8 +115,7 @@ class SearchService {
 			$card = Card::fromRow($cardRow);
 			// TODO: Only perform one enrich call here
 			$self->cardService->enrichCards([$card]);
-			$user = $this->userManager->get($comment->getActorId());
-			$displayName = $user ? $user->getDisplayName() : '';
+			$displayName = $this->userManager->getDisplayName($comment->getActorId()) ?? '';
 			return new CommentSearchResultEntry($comment->getId(), $comment->getMessage(), $displayName, $card, $this->urlGenerator, $this->l10n);
 		}, $matchedComments);
 	}
diff --git a/tests/unit/Db/UserTest.php b/tests/unit/Db/UserTest.php
index 290331f6d..2a13c207f 100644
--- a/tests/unit/Db/UserTest.php
+++ b/tests/unit/Db/UserTest.php
@@ -33,13 +33,13 @@ class UserTest extends \Test\TestCase {
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('myuser');
-		$user->expects($this->any())
-			->method('getDisplayName')
-			->willReturn('myuser displayname');
 		$userManager = $this->createMock(IUserManager::class);
 		$userManager->expects($this->any())
 			->method('get')
 			->willReturn($user);
+		$userManager->expects($this->any())
+			->method('getDisplayName')
+			->willReturn('myuser displayname');
 		$userRelationalObject = new User('myuser', $userManager);
 		$expected = [
 			'uid' => 'myuser',
@@ -55,13 +55,13 @@ class UserTest extends \Test\TestCase {
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn('myuser');
-		$user->expects($this->any())
-			->method('getDisplayName')
-			->willReturn('myuser displayname');
 		$userManager = $this->createMock(IUserManager::class);
 		$userManager->expects($this->any())
 			->method('get')
 			->willReturn($user);
+		$userManager->expects($this->any())
+			->method('getDisplayName')
+			->willReturn('myuser displayname');
 		$userRelationalObject = new User('myuser', $userManager);
 		$expected = [
 			'uid' => 'myuser',