Add Deck resources to Team Activity

lib/Teams/DeckTeamResourceProvider.php

@@ -1,3 +1,3 @@
 <?php
 
 declare(strict_types=1);
@@ -7,18 +7,22 @@
 use OCA\Deck\AppInfo\Application;
 use OCA\Deck\Db\Board;
 use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\CardMapper;
 use OCP\IURLGenerator;
+use OCP\Teams\ITeamActivityResourceProvider;
+use OCP\Teams\TeamActivityScope;
 use OCP\Teams\TeamResource;
 
 /**
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-class DeckTeamResourceProvider implements \OCP\Teams\ITeamResourceProvider {
+class DeckTeamResourceProvider implements ITeamActivityResourceProvider {
 
 	public function __construct(
 		private BoardMapper $boardMapper,
+		private CardMapper $cardMapper,
 		private IURLGenerator $urlGenerator,
 	) {
 	}
@@ -57,6 +61,28 @@
 		return $this->boardMapper->findTeamsForBoard((int)$resourceId);
 	}
 
+	public function getActivityScopes(array $resources, string $userId): array {
+		// Read access and deleted objects are checked by DeckProvider via canSee*Activity(), so $userId is not used here.
+		$boardIds = array_values(array_unique(array_filter(array_map(
+			static fn (TeamResource $resource): ?int => ctype_digit($resource->getId()) && (int)$resource->getId() > 0 ? (int)$resource->getId() : null,
+			$resources,
+		))));
+		if ($boardIds === []) {
+			return [];
+		}
+
+		$query = $this->cardMapper->queryCardsByBoards($boardIds);
+		$query->select('c.id');
+		$result = $query->executeQuery();
+		$cardIds = array_map('intval', $result->fetchFirstColumn());
+		$result->closeCursor();
+
+		return [
+			new TeamActivityScope('deck_board', $boardIds),
+			new TeamActivityScope('deck_card', $cardIds),
+		];
+	}
+
 	public function getBoardBulletIcon(Board $board): string {
 		return '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><g fill="#' . $board->getColor() . '"><rect ry="15" height="14" width="14" y="1" x="1"/></g></svg>';
 	}

tests/unit/Teams/DeckTeamResourceProviderTest.php

@@ -0,0 +1,108 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Deck\Teams;
+
+use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\CardMapper;
+use OCP\DB\IResult;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IURLGenerator;
+use OCP\Teams\ITeamResourceProvider;
+use OCP\Teams\TeamResource;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class DeckTeamResourceProviderTest extends TestCase {
+	private CardMapper&MockObject $cardMapper;
+	private ITeamResourceProvider&MockObject $resourceProvider;
+	private DeckTeamResourceProvider $provider;
+
+	protected function setUp(): void {
+		parent::setUp();
+		$this->cardMapper = $this->createMock(CardMapper::class);
+		$this->resourceProvider = $this->createMock(ITeamResourceProvider::class);
+		$this->provider = new DeckTeamResourceProvider(
+			$this->createMock(BoardMapper::class),
+			$this->cardMapper,
+			$this->createMock(IURLGenerator::class),
+		);
+	}
+
+	private function resource(string $id): TeamResource {
+		return new TeamResource($this->resourceProvider, $id, 'Board ' . $id, '/deck/' . $id);
+	}
+
+	private function expectCardIds(array $boardIds, array $cardIds): void {
+		$query = $this->createMock(IQueryBuilder::class);
+		$result = $this->createMock(IResult::class);
+		$this->cardMapper->expects($this->once())->method('queryCardsByBoards')->with($boardIds)->willReturn($query);
+		$query->expects($this->once())->method('select')->with('c.id')->willReturnSelf();
+		$query->expects($this->once())->method('executeQuery')->willReturn($result);
+		$result->expects($this->once())->method('fetchFirstColumn')->willReturn($cardIds);
+		$result->expects($this->once())->method('closeCursor');
+	}
+
+	public function testActivityScopesContainBoardsAndTheirCards(): void {
+		$this->expectCardIds([7, 8], [70, 71, 80]);
+
+		$scopes = $this->provider->getActivityScopes([
+			$this->resource('7'),
+			$this->resource('8'),
+			$this->resource('not-a-board-id'),
+		], 'alice');
+
+		self::assertCount(2, $scopes);
+		self::assertSame('deck_board', $scopes[0]->getObjectType());
+		self::assertSame([7, 8], $scopes[0]->getObjectIds());
+		self::assertSame('deck_card', $scopes[1]->getObjectType());
+		self::assertSame([70, 71, 80], $scopes[1]->getObjectIds());
+	}
+
+	public function testActivityScopesWithoutResources(): void {
+		$this->cardMapper->expects($this->never())->method('queryCardsByBoards');
+
+		self::assertSame([], $this->provider->getActivityScopes([], 'alice'));
+	}
+
+	public function testActivityScopesIgnoreInvalidBoardIds(): void {
+		$this->cardMapper->expects($this->never())->method('queryCardsByBoards');
+
+		$scopes = $this->provider->getActivityScopes([
+			$this->resource('0'),
+			$this->resource('abc'),
+			$this->resource('-1'),
+			$this->resource(''),
+		], 'alice');
+
+		self::assertSame([], $scopes);
+	}
+
+	public function testActivityScopesDeduplicateBoardIds(): void {
+		$this->expectCardIds([7], [70]);
+
+		$scopes = $this->provider->getActivityScopes([
+			$this->resource('7'),
+			$this->resource('7'),
+		], 'alice');
+
+		self::assertSame([7], $scopes[0]->getObjectIds());
+	}
+
+	public function testActivityScopesForBoardWithoutCards(): void {
+		$this->expectCardIds([7], []);
+
+		$scopes = $this->provider->getActivityScopes([$this->resource('7')], 'alice');
+
+		self::assertCount(2, $scopes);
+		self::assertSame([7], $scopes[0]->getObjectIds());
+		self::assertSame('deck_card', $scopes[1]->getObjectType());
+		self::assertSame([], $scopes[1]->getObjectIds());
+	}
+}