Merge pull request #7735 from nextcloud/fix/7536/set-done-value-on-import

fix(import): done state is not kept on importing a board

Author: grnd-alt

lib/Service/Importer/Systems/DeckJsonService.php

@@ -211,6 +211,7 @@ public function getCards(): array {
 			$boardOwner = $this->getBoard()->getOwner();
 			$card->setOwner($this->mapOwner(is_string($boardOwner) ? $boardOwner : $boardOwner->getUID()));
 			$card->setDuedate($cardSource->duedate);
+			$card->setDone($cardSource->done ?? null);
 			$cards[$cardSource->id] = $card;
 		}
 		return $cards;

tests/data/deck.json

@@ -100,6 +100,7 @@
                             },
                             "order": 999,
                             "archived": false,
+                            "done": "2023-07-18T10:00:00+00:00",
                             "duedate": "2050-07-24T22:00:00+00:00",
                             "deletedAt": 0,
                             "commentsUnread": 0,

tests/integration/base-query-count.txt

@@ -1 +1 @@
-84323
+84627

tests/integration/import/ImportExportTest.php

@@ -328,6 +328,7 @@ public function assertDatabase(string $owner = 'admin') {
 			'lastModified' => 1689667779,
 			'createdAt' => 1689667569,
 			'owner' => $owner,
+			'done' => new \DateTime('2023-07-18T10:00:00+00:00'),
 			'duedate' => new \DateTime('2050-07-24T22:00:00.000000+0000'),
 			'order' => 999,
 			'stackId' => $stacks[0]->getId(),

tests/unit/Service/Importer/Systems/DeckJsonServiceTest.php

@@ -24,8 +24,6 @@
 namespace OCA\Deck\Service\Importer\Systems;
 
 use OCA\Deck\Service\Importer\BoardImportService;
-use OCP\IL10N;
-use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Server;
@@ -36,20 +34,12 @@
  */
 class DeckJsonServiceTest extends \Test\TestCase {
 	private DeckJsonService $service;
-	/** @var IURLGenerator|MockObject */
-	private $urlGenerator;
 	/** @var IUserManager|MockObject */
 	private $userManager;
-	/** @var IL10N */
-	private $l10n;
 	public function setUp(): void {
 		$this->userManager = $this->createMock(IUserManager::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->l10n = $this->createMock(IL10N::class);
 		$this->service = new DeckJsonService(
 			$this->userManager,
-			$this->urlGenerator,
-			$this->l10n
 		);
 	}
 
@@ -61,6 +51,59 @@ public function testGetBoardWithNoName() {
 	}
 
 	public function testGetBoardWithSuccess() {
+		$importService = $this->setUpImportService();
+
+		$boards = $this->service->getBoards();
+		$importService->setData($boards[0]);
+		$actual = $this->service->getBoard();
+		$this->assertEquals('My test board', $actual->getTitle());
+		$this->assertEquals('admin', $actual->getOwner());
+		$this->assertEquals('e0ed31', $actual->getColor());
+	}
+
+	public function testGetCards() {
+		$importService = $this->setUpImportService();
+
+		$boards = $this->service->getBoards();
+		$importService->setData($boards[0]);
+
+		$importService->getBoard()->setId(1);
+
+		$this->service->getLabels();
+
+		$stacks = $this->service->getStacks();
+		$stackId = 1;
+		foreach ($stacks as $code => $stack) {
+			$stack->setId($stackId++);
+			$this->service->updateStack($code, $stack);
+		}
+
+		$cards = $this->service->getCards();
+
+		$this->assertCount(6, $cards);
+
+		// Card 114 (title "1") has a done value set in the fixture
+		$card114 = $cards[114];
+		$this->assertEquals('1', $card114->getTitle());
+		$this->assertInstanceOf(\DateTime::class, $card114->getDone());
+		$this->assertEquals('2023-07-18T10:00:00+00:00', $card114->getDone()->format(\DateTime::ATOM));
+		$this->assertEquals('2050-07-24T22:00:00+00:00', $card114->getDuedate()->format(\DateTime::ATOM));
+		$this->assertFalse($card114->getArchived());
+		$this->assertEquals('admin', $card114->getOwner());
+
+		// Card 115 (title "2") has no done value in the fixture
+		$card115 = $cards[115];
+		$this->assertEquals('2', $card115->getTitle());
+		$this->assertNull($card115->getDone());
+
+		// Card 119 (title "6") — from stack B, no done value
+		$card119 = $cards[119];
+		$this->assertEquals('6', $card119->getTitle());
+		$this->assertNull($card119->getDone());
+		$this->assertEquals('# Test description' . "\n\n" . 'Hello world', $card119->getDescription());
+	}
+
+	private function setUpImportService(): BoardImportService {
 		$importService = Server::get(BoardImportService::class);
 
 		$data = json_decode(file_get_contents(__DIR__ . '/../../../../data/deck.json'));
@@ -77,11 +120,6 @@ public function testGetBoardWithSuccess() {
 
 		$this->service->setImportService($importService);
 
-		$boards = $this->service->getBoards();
-		$importService->setData($boards[0]);
-		$actual = $this->service->getBoard();
-		$this->assertEquals('My test board', $actual->getTitle());
-		$this->assertEquals('admin', $actual->getOwner());
-		$this->assertEquals('e0ed31', $actual->getColor());
+		return $importService;
 	}
 }