From 612e75fc1b27471e9dd7590d891b24f8be94ae85 Mon Sep 17 00:00:00 2001
From: samin-z <samin.zavarkesh@gmail.com>
Date: Mon, 14 Sep 2026 14:59:09 +0200
Subject: [PATCH] fix: show team name as deck owner

Signed-off-by: samin-z <samin.zavarkesh@gmail.com>
---
 lib/Db/BoardMapper.php                     | 24 ++++++++++-----
 lib/Db/TeamOwner.php                       | 34 +++++++++++++++++++++
 src/components/board/SharingTabSidebar.vue |  7 ++++-
 src/components/boards/BoardItem.vue        |  7 ++++-
 src/views/BoardReferenceWidget.vue         |  7 ++++-
 tests/unit/Db/TeamOwnerTest.php            | 35 ++++++++++++++++++++++
 6 files changed, 103 insertions(+), 11 deletions(-)
 create mode 100644 lib/Db/TeamOwner.php
 create mode 100644 tests/unit/Db/TeamOwnerTest.php

diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index b334a03910..ff56a91442 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -207,7 +207,7 @@ public function findAllByUser(string $userId, ?int $limit = null, ?int $offset =
 		// FIXME this used to be a UNION to get boards owned by $userId and the user shares in one single query
 		// Is it possible with the query builder?
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
+		$qb->select('id', 'title', 'owner', 'team_id', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
 			// this does not work in MySQL/PostgreSQL
 			//->selectAlias('0', 'shared')
 			->from('deck_boards', 'b')
@@ -247,7 +247,7 @@ public function findAllByUser(string $userId, ?int $limit = null, ?int $offset =
 
 		// shared with user
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
+		$qb->select('b.id', 'title', 'owner', 'team_id', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
 			//->selectAlias('1', 'shared')
 			->from('deck_boards', 'b')
 			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
@@ -329,7 +329,7 @@ public function findAllByGroups(string $userId, array $groups, ?int $limit = nul
 			return [];
 		}
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
+		$qb->select('b.id', 'title', 'owner', 'team_id', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
 			//->selectAlias('2', 'shared')
 			->from('deck_boards', 'b')
 			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
@@ -385,7 +385,7 @@ public function findAllByCircles(string $userId, ?int $limit = null, ?int $offse
 		}
 
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
+		$qb->select('b.id', 'title', 'owner', 'team_id', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
 			//->selectAlias('2', 'shared')
 			->from('deck_boards', 'b')
 			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
@@ -435,7 +435,7 @@ public function findAllByCircles(string $userId, ?int $limit = null, ?int $offse
 
 	public function findAllByTeam(string $teamId): array {
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
+		$qb->select('b.id', 'title', 'owner', 'team_id', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
 			->from('deck_boards', 'b')
 			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
 			->where($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)))
@@ -463,7 +463,7 @@ public function findTeamsForBoard(int $boardId): array {
 
 	public function isSharedWithTeam(int $boardId, string $teamId): bool {
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
+		$qb->select('b.id', 'title', 'owner', 'team_id', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
 			->from('deck_boards', 'b')
 			->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
 			->where($qb->expr()->eq('b.id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
@@ -487,7 +487,7 @@ public function findAll(): array {
 
 	public function findToDelete(int $timeLimit) {
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
+		$qb->select('id', 'title', 'owner', 'team_id', 'color', 'archived', 'deleted_at', 'last_modified', 'external_id', 'share_token')
 			->from('deck_boards')
 			->where($qb->expr()->gt('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->lt('deleted_at', $qb->createNamedParameter($timeLimit, IQueryBuilder::PARAM_INT)));
@@ -570,8 +570,16 @@ public function mapAcl(Acl &$acl): void {
 	public function mapOwner(Board &$board) {
 		$userManager = $this->userManager;
 		$cloudIdManager = $this->cloudIdManager;
+		$circlesService = $this->circlesService;
 		$externalId = $board->getExternalId();
-		$board->resolveRelation('owner', function ($owner) use (&$userManager, &$cloudIdManager, $externalId) {
+		$teamId = $board->getTeamId();
+		$board->resolveRelation('owner', function ($owner) use (&$userManager, &$cloudIdManager, &$circlesService, $externalId, $teamId) {
+			if ($teamId !== null && $teamId !== '' && $circlesService->isCirclesEnabled()) {
+				$circle = $circlesService->getCircle($teamId);
+				if ($circle !== null) {
+					return new TeamOwner($owner, $circle);
+				}
+			}
 			if ($externalId !== null) {
 				$cloudId = $cloudIdManager->resolveCloudId($owner);
 				return new FederatedUser($cloudId);
diff --git a/lib/Db/TeamOwner.php b/lib/Db/TeamOwner.php
new file mode 100644
index 0000000000..ae7b37f163
--- /dev/null
+++ b/lib/Db/TeamOwner.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Db;
+
+use OCA\Circles\Model\Circle;
+
+/**
+ * Keeps the real user id as primary key and exposing the team display name in API responses.
+ */
+class TeamOwner extends RelationalObject {
+
+	/** @var Circle */
+	protected $object;
+
+	public function __construct(string $ownerUserId, Circle $circle) {
+		parent::__construct($ownerUserId, $circle);
+	}
+
+	public function getObjectSerialization(): array {
+		return [
+			'uid' => $this->getPrimaryKey(),
+			'displayname' => $this->object->getDisplayName(),
+			'type' => Acl::PERMISSION_TYPE_CIRCLE,
+			'teamId' => $this->object->getSingleId(),
+		];
+	}
+}
diff --git a/src/components/board/SharingTabSidebar.vue b/src/components/board/SharingTabSidebar.vue
index 0d218fb526..5b64c06e7e 100644
--- a/src/components/board/SharingTabSidebar.vue
+++ b/src/components/board/SharingTabSidebar.vue
@@ -12,9 +12,11 @@
 		<ul id="shareWithList"
 			class="shareWithList">
 			<li>
-				<NcAvatar :user="board.owner.uid" />
+				<div v-if="isTeamOwnedBoard" class="avatardiv icon icon-circles" />
+				<NcAvatar v-else :user="board.owner.uid" />
 				<span class="username">
 					{{ board.owner.displayname }}
+					<span v-if="isTeamOwnedBoard">{{ t('deck', '(Team)') }}</span>
 					<span class="board-owner-label">
 						{{ t('deck', 'Board owner') }}
 					</span>
@@ -135,6 +137,9 @@ export default {
 		isCurrentUser() {
 			return (uid) => uid === getCurrentUser().uid
 		},
+		isTeamOwnedBoard() {
+			return this.board?.owner?.type === 7 || !!this.board?.teamId
+		},
 		formatedSharees() {
 			const result = this.unallocatedSharees.map(item => {
 				const res = {
diff --git a/src/components/boards/BoardItem.vue b/src/components/boards/BoardItem.vue
index 86c174eb4c..be2ba2cd72 100644
--- a/src/components/boards/BoardItem.vue
+++ b/src/components/boards/BoardItem.vue
@@ -16,7 +16,9 @@
 			{{ board.title }}
 		</div>
 		<div class="board-list-avatars-cell" title="">
-			<NcAvatar :user="board.owner.uid"
+			<div v-if="isTeamOwnedBoard" class="avatardiv icon icon-circles board-list-avatar" />
+			<NcAvatar v-else
+				:user="board.owner.uid"
 				:display-name="board.owner.displayname"
 				class="board-list-avatar"
 				:hide-status="true" />
@@ -53,6 +55,9 @@ export default {
 				params: { id: this.board.id },
 			}
 		},
+		isTeamOwnedBoard() {
+			return this.board?.owner?.type === 7 || !!this.board?.teamId
+		},
 		limitedAcl() {
 			return [...this.board.acl].splice(0, 5)
 		},
diff --git a/src/views/BoardReferenceWidget.vue b/src/views/BoardReferenceWidget.vue
index a06731b87a..6089aba4e5 100644
--- a/src/views/BoardReferenceWidget.vue
+++ b/src/views/BoardReferenceWidget.vue
@@ -21,7 +21,9 @@
 		</div>
 		<div class="line">
 			{{ t('deck', 'Owner') + ': ' }}
-			<NcUserBubble :user="boardOwnerUserId"
+			<span v-if="isTeamOwnedBoard">{{ boardOwnerDisplayName }}</span>
+			<NcUserBubble v-else
+				:user="boardOwnerUserId"
 				:display-name="boardOwnerDisplayName" />
 		</div>
 	</div>
@@ -95,6 +97,9 @@ export default {
 		boardOwnerDisplayName() {
 			return this.board.owner?.displayname ?? this.boardOwnerUserId
 		},
+		isTeamOwnedBoard() {
+			return this.board?.owner?.type === 7 || !!this.board?.teamId
+		},
 	},
 
 	created() {
diff --git a/tests/unit/Db/TeamOwnerTest.php b/tests/unit/Db/TeamOwnerTest.php
new file mode 100644
index 0000000000..85f2ee086d
--- /dev/null
+++ b/tests/unit/Db/TeamOwnerTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Db;
+
+use OCA\Circles\Model\Circle;
+use PHPUnit\Framework\TestCase;
+
+class TeamOwnerTest extends TestCase {
+	public function testJsonSerializeUsesTeamDisplayNameAndKeepsUserId(): void {
+		if (!class_exists(Circle::class)) {
+			$this->markTestSkipped('Circles app is not available');
+		}
+
+		$circle = $this->createMock(Circle::class);
+		$circle->method('getDisplayName')->willReturn('toasted');
+		$circle->method('getSingleId')->willReturn('team-single-id');
+
+		$owner = new TeamOwner('user1', $circle);
+
+		$this->assertEquals([
+			'primaryKey' => 'user1',
+			'uid' => 'user1',
+			'displayname' => 'team board',
+			'type' => Acl::PERMISSION_TYPE_CIRCLE,
+			'teamId' => 'team-single-id',
+		], $owner->jsonSerialize());
+	}
+}