transfer deleted-user team boards in listener by highest member level

Signed-off-by: samin-z <samin.zavarkesh@gmail.com>

Author: samin-z

lib/Listeners/ParticipantCleanupListener.php

@@ -13,6 +13,8 @@
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\AclMapper;
 use OCA\Deck\Db\AssignmentMapper;
+use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Service\CirclesService;
 use OCA\Deck\Service\TeamBoardService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
@@ -24,14 +26,28 @@ class ParticipantCleanupListener implements IEventListener {
 	public function __construct(
 		private AclMapper $aclMapper,
 		private AssignmentMapper $assignmentMapper,
+		private BoardMapper $boardMapper,
+		private CirclesService $circlesService,
 		private TeamBoardService $teamBoardService,
 	) {
 	}
 
 	public function handle(Event $event): void {
 		if ($event instanceof UserDeletedEvent) {
 			$userId = $event->getUser()->getUID();
-			$this->teamBoardService->handleBoardsOwnedByDeletedUser($userId);
+			$boards = $this->boardMapper->findAllByOwner($userId);
+			foreach ($boards as $board) {
+				$teamId = $board->getTeamId();
+				if ($teamId !== null && $teamId !== '') {
+					$nextOwner = $this->circlesService->findNextMemberUserId($teamId, $userId);
+					if ($nextOwner !== null) {
+						$this->boardMapper->transferOwnership($userId, $nextOwner, $board->getId());
+						continue;
+					}
+				}
+				$this->boardMapper->delete($board);
+			}
+
 			$this->cleanupByParticipant(Acl::PERMISSION_TYPE_USER, $userId);
 		}
 

lib/Service/CirclesService.php

@@ -107,7 +107,7 @@ public function getUserCircles(string $userId): array {
 	}
 
 	/**
-	 * Find a remaining team owner or admin to take over board ownership.
+	 * Find a remaining team member with the highest level to take over board ownership.
 	 */
 	public function findNextMemberUserId(string $circleId, ?string $excludeUserId = null): ?string {
 		if (!$this->circlesEnabled) {
@@ -118,7 +118,8 @@ public function findNextMemberUserId(string $circleId, ?string $excludeUserId =
 			$circlesManager = Server::get(CirclesManager::class);
 			$circlesManager->startSuperSession();
 			$circle = $circlesManager->getCircle($circleId);
-			$adminUserId = null;
+			$maxUserId = null;
+			$maxLevel = -1;
 			foreach ($circle->getMembers() as $member) {
 				if ($member->getUserType() !== Member::TYPE_USER) {
 					continue;
@@ -129,12 +130,13 @@ public function findNextMemberUserId(string $circleId, ?string $excludeUserId =
 				if ($member->getLevel() === Member::LEVEL_OWNER) {
 					return $member->getUserId();
 				}
-				if ($adminUserId === null && $member->getLevel() >= Member::LEVEL_ADMIN) {
-					$adminUserId = $member->getUserId();
+				if ($member->getLevel() > $maxLevel) {
+					$maxLevel = $member->getLevel();
+					$maxUserId = $member->getUserId();
 				}
 			}
 
-			return $adminUserId;
+			return $maxUserId;
 		} catch (Throwable $e) {
 		}
 

lib/Service/TeamBoardService.php

@@ -18,24 +18,6 @@ public function __construct(
 	) {
 	}
 
-	/**
-	 * When user is deleted transfer team boards to another owner/admin when possible,otherwise delete them.
-	 */
-	public function handleBoardsOwnedByDeletedUser(string $userId): void {
-		foreach ($this->boardMapper->findAllByOwner($userId) as $board) {
-			$teamId = $board->getTeamId();
-			if ($teamId !== null && $teamId !== '') {s
-				$nextOwner = $this->circlesService->findNextMemberUserId($teamId, $userId);
-				if ($nextOwner !== null) {
-					$this->boardMapper->transferOwnership($userId, $nextOwner, $board->getId());
-					continue;
-				}
-			}
-
-			$this->boardMapper->delete($board);
-		}
-	}
-
 	/**
 	 * When a user leaves the team,transfer ownership, or delete board
 	 */

tests/unit/Service/TeamBoardServiceTest.php

@@ -33,45 +33,6 @@ public function setUp(): void {
 		);
 	}
 
-	public function testHandleBoardsOwnedByDeletedUser(): void {
-		$personalBoard = new Board();
-		$personalBoard->setId(1);
-		$personalBoard->setOwner($this->userId1);
-		$personalBoard->setTeamId(null);
-
-		$orphanedTeamBoard = new Board();
-		$orphanedTeamBoard->setId(2);
-		$orphanedTeamBoard->setOwner($this->userId1);
-		$orphanedTeamBoard->setTeamId('team-a');
-
-		$transferableBoard = new Board();
-		$transferableBoard->setId(3);
-		$transferableBoard->setOwner($this->userId1);
-		$transferableBoard->setTeamId('team-b');
-
-		$this->boardMapper->expects($this->once())
-			->method('findAllByOwner')
-			->with($this->userId1)
-			->willReturn([$personalBoard, $orphanedTeamBoard, $transferableBoard]);
-
-		$this->circlesService->expects($this->exactly(2))
-			->method('findNextMemberUserId')
-			->willReturnMap([
-				['team-a', $this->userId1, null],
-				['team-b', $this->userId1, $this->userId2],
-			]);
-
-		$this->boardMapper->expects($this->once())
-			->method('transferOwnership')
-			->with($this->userId1, $this->userId2, 3);
-
-		$this->boardMapper->expects($this->exactly(2))
-			->method('delete')
-			->withConsecutive([$personalBoard], [$orphanedTeamBoard]);
-
-		$this->service->handleBoardsOwnedByDeletedUser($this->userId1);
-	}
-
 	public function testHandleMemberLeftTeamTransfersOwnership(): void {
 		$board = new Board();
 		$board->setId(10);