ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: Use user display name cache

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2023-07-11 15:33:45 +02:00
parent 683ae36b8b
commit 4a9e399cc9
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Db/User.php
View File

@@ -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
];
}

3
lib/Service/CommentService.php
View File

@@ -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(),

3
lib/Service/SearchService.php
View File

@@ -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);
}

12
tests/unit/Db/UserTest.php
View File

@@ -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',