Merge pull request #6722 from nextcloud/backport/6692/stable30

[stable30] fix: skip exporting a deleted card
nextcloud · Feb 4, 2025 · 5cb1afa · 5cb1afa
2 parents c22181c + 4bf0f33
commit 5cb1afa
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 12 deletions.
diff --git a/lib/Command/UserExport.php b/lib/Command/UserExport.php
@@ -61,20 +61,24 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			if ($board->getDeletedAt() > 0) {
 				continue;
 			}
+
 			$fullBoard = $this->boardMapper->find($board->getId(), true, true);
 			$data[$board->getId()] = $fullBoard->jsonSerialize();
 			$stacks = $this->stackMapper->findAll($board->getId());
 			foreach ($stacks as $stack) {
 				$data[$board->getId()]['stacks'][$stack->getId()] = $stack->jsonSerialize();
 				$cards = $this->cardMapper->findAllByStack($stack->getId());
 				foreach ($cards as $card) {
+					if ($card->getDeletedAt() > 0) {
+						continue;
+					}
 					$fullCard = $this->cardMapper->find($card->getId());
+
 					$assignedUsers = $this->assignedUsersMapper->findAll($card->getId());
 					$fullCard->setAssignedUsers($assignedUsers);
 
 					$cardDetails = new CardDetails($fullCard, $fullBoard);
 					$comments = $this->commentService->list($card->getId());
-
 					$cardDetails->setCommentsCount(count($comments->getData()));
 
 					$cardJson = $cardDetails->jsonSerialize();

diff --git a/tests/unit/Command/UserExportTest.php b/tests/unit/Command/UserExportTest.php
@@ -73,16 +73,23 @@ public function getBoard($id) {
 		$board->setTitle('Board ' . $id);
 		return $board;
 	}
+
 	public function getStack($id) {
 		$stack = new Stack();
 		$stack->setId($id);
 		$stack->setTitle('Stack ' . $id);
 		return $stack;
 	}
-	public function getCard($id) {
+
+	public function getCard($id, $deleted = false) {
 		$card = new Card();
 		$card->setId($id);
 		$card->setTitle('Card ' . $id);
+
+		if ($deleted) {
+			$card->setDeletedAt(time());
+		}
+
 		return $card;
 	}
 
@@ -92,6 +99,7 @@ public function getComment($id) {
 		$comment->setMessage("fake comment" . $id);
 		return $comment;
 	}
+
 	public function testExecute() {
 		$input = $this->createMock(InputInterface::class);
 		$input->expects($this->once())->method('getArgument')->with('user-id')->willReturn('admin');
@@ -101,19 +109,12 @@ public function testExecute() {
 			$this->getBoard(1),
 			$this->getBoard(2),
 		];
-		$this->boardService->expects($this->once())
-			->method('findAll')
-			->willReturn($boards);
-		$this->boardMapper->expects($this->exactly(count($boards)))
-			->method('find')
-			->willReturn($boards[0]);
+
 		$stacks = [
 			$this->getStack(1),
 			$this->getStack(2)
 		];
-		$this->stackMapper->expects($this->exactly(count($boards)))
-			->method('findAll')
-			->willReturn($stacks);
+
 		$cards = [
 			$this->getCard(1),
 			$this->getCard(2),
@@ -125,16 +126,89 @@ public function testExecute() {
 			$this->getComment(2),
 			$this->getComment(3),
 		];
-		$this->commentService->expects($this->exactly(count($cards) * count($stacks) * count($boards)))->method('list')->willReturn(new DataResponse($comments));
+
+		$this->boardService->expects($this->once())
+			->method('findAll')
+			->willReturn($boards);
+
+		$this->boardMapper->expects($this->exactly(count($boards)))
+			->method('find')
+			->willReturn($boards[0]);
+
+		$this->stackMapper->expects($this->exactly(count($boards)))
+			->method('findAll')
+			->willReturn($stacks);
+
+		$this->commentService->expects($this->exactly(count($cards) * count($stacks) * count($boards)))
+			->method('list')
+			->willReturn(new DataResponse($comments));
+
 		$this->cardMapper->expects($this->exactly(count($boards) * count($stacks)))
 			->method('findAllByStack')
 			->willReturn($cards);
+
 		$this->cardMapper->expects($this->exactly(count($boards) * count($stacks) * count($cards)))
 			->method('find')
 			->willReturn($cards[0]);
+
 		$this->assignedUserMapper->expects($this->exactly(count($boards) * count($stacks) * count($cards)))
 			->method('findAll')
 			->willReturn([]);
+
+		$result = $this->invokePrivate($this->userExport, 'execute', [$input, $output]);
+		self::assertEquals(0, $result);
+	}
+
+	public function testExecuteWithDeletedCard() {
+		$input = $this->createMock(InputInterface::class);
+		$input->expects($this->once())->method('getArgument')->with('user-id')->willReturn('admin');
+		$output = $this->createMock(OutputInterface::class);
+
+		$boards = [
+			$this->getBoard(1),
+		];
+
+		$stacks = [
+			$this->getStack(1),
+		];
+
+		$cards = [
+			$this->getCard(1),
+			$this->getCard(2, true),
+		];
+
+		$comments = [
+			$this->getComment(1),
+		];
+
+		$this->boardService->expects($this->once())
+			->method('findAll')
+			->willReturn($boards);
+
+		$this->boardMapper->expects($this->once())
+			->method('find')
+			->willReturn($boards[0]);
+
+		$this->stackMapper->expects($this->once())
+			->method('findAll')
+			->willReturn($stacks);
+
+		$this->commentService->expects($this->exactly(count($stacks) * count($boards)))
+			->method('list')
+			->willReturn(new DataResponse($comments));
+
+		$this->cardMapper->expects($this->once())
+			->method('findAllByStack')
+			->willReturn($cards);
+
+		$this->cardMapper->expects($this->once())
+			->method('find')
+			->willReturn($cards[0]);
+
+		$this->assignedUserMapper->expects($this->once())
+			->method('findAll')
+			->willReturn([]);
+
 		$result = $this->invokePrivate($this->userExport, 'execute', [$input, $output]);
 		self::assertEquals(0, $result);
 	}