fix(dav): sync category changes outside card no-op updates

Signed-off-by: Jaggob <37583151+Jaggob@users.noreply.github.com>

Author: Jaggob

lib/DAV/DeckCalendarBackend.php

@@ -386,6 +386,12 @@ private function updateCardFromCalendar(Card $sourceItem, string $data, bool $re
 		}
 		$done = $this->mapDoneFromTodo($todo, $card);
 		$incomingDue = isset($todo->DUE) ? $todo->DUE->getDateTime() : null;
+		$categories = $this->extractCategories($todo);
+		if ($categories !== null) {
+			$categories = $this->normalizeCategoriesForLabelSync($boardId, $categories, $mode);
+		}
+		$categoriesChanged = $categories !== null
+			&& !$this->hasSameCategoryLabels($categories, $card);
 
 		$isNoopUpdate = $title === $card->getTitle()
 			&& $stackId === $card->getStackId()
@@ -394,7 +400,11 @@ private function updateCardFromCalendar(Card $sourceItem, string $data, bool $re
 			&& $this->isDateEqual($card->getDone(), $done->getValue())
 			&& (!$restoreDeleted || $card->getDeletedAt() === 0);
 
-		if ($isNoopUpdate) {
+		if ($isNoopUpdate && !$categoriesChanged) {
+			return $card;
+		}
+		if ($isNoopUpdate && $categories !== null) {
+			$this->syncCardCategories($card->getId(), $categories);
 			return $card;
 		}
 
@@ -412,9 +422,7 @@ private function updateCardFromCalendar(Card $sourceItem, string $data, bool $re
 			$done,
 			$boardId
 		);
-		$categories = $this->extractCategories($todo);
 		if ($categories !== null) {
-			$categories = $this->normalizeCategoriesForLabelSync($boardId, $categories, $mode);
 			$this->syncCardCategories($updatedCard->getId(), $categories);
 		}
 
@@ -896,6 +904,29 @@ private function normalizeDescriptionForCompare(string $value): string {
 		return str_replace(["\r\n", "\r"], "\n", $value);
 	}
 
+	/**
+	 * @param list<string> $categories
+	 */
+	private function hasSameCategoryLabels(array $categories, Card $card): bool {
+		$incoming = [];
+		foreach ($categories as $category) {
+			$key = mb_strtolower(trim($category));
+			if ($key !== '') {
+				$incoming[$key] = true;
+			}
+		}
+
+		$current = [];
+		foreach ($card->getLabels() ?? [] as $label) {
+			$key = mb_strtolower(trim($label->getTitle()));
+			if ($key !== '') {
+				$current[$key] = true;
+			}
+		}
+
+		return array_keys($incoming) === array_keys($current);
+	}
+
 	private function isDateEqual(?\DateTimeInterface $left, ?\DateTimeInterface $right): bool {
 		if ($left === null && $right === null) {
 			return true;

tests/unit/DAV/DeckCalendarBackendTest.php

@@ -844,6 +844,80 @@ public function testUpdateCardSyncsAppleTagsToLabels(): void {
 		$this->backend->updateCalendarObject($sourceCard, $calendarData);
 	}
 
+	public function testUpdateCardSyncsCategoriesEvenWhenOtherFieldsAreUnchanged(): void {
+		$sourceCard = new Card();
+		$sourceCard->setId(123);
+
+		$existingCard = new Card();
+		$existingCard->setId(123);
+		$existingCard->setTitle('Card');
+		$existingCard->setDescription('Description');
+		$existingCard->setStackId(42);
+		$existingCard->setType('plain');
+		$existingCard->setOrder(0);
+		$existingCard->setOwner('admin');
+		$existingCard->setDeletedAt(0);
+		$existingCard->setArchived(false);
+		$existingCard->setDone(null);
+		$existingCard->setLabels([]);
+
+		$this->cardService->expects($this->exactly(2))
+			->method('find')
+			->with(123)
+			->willReturnOnConsecutiveCalls($existingCard, $existingCard);
+
+		$currentStack = new Stack();
+		$currentStack->setId(42);
+		$currentStack->setBoardId(12);
+		$this->stackService->expects($this->once())
+			->method('find')
+			->with(42)
+			->willReturn($currentStack);
+
+		$label = new Label();
+		$label->setId(7);
+		$label->setTitle('Test');
+		$board = new Board();
+		$board->setId(12);
+		$board->setLabels([$label]);
+
+		$this->boardMapper->expects($this->once())
+			->method('find')
+			->with(12, true, false)
+			->willReturn($board);
+
+		$this->permissionService->expects($this->once())
+			->method('getPermissions')
+			->with(12)
+			->willReturn([
+				\OCA\Deck\Db\Acl::PERMISSION_MANAGE => true,
+			]);
+
+		$this->cardService->expects($this->never())
+			->method('update');
+		$this->labelService->expects($this->never())
+			->method('create');
+		$this->cardService->expects($this->once())
+			->method('assignLabel')
+			->with(123, 7);
+		$this->cardService->expects($this->never())
+			->method('removeLabel');
+
+		$calendarData = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VTODO
+UID:deck-card-123
+SUMMARY:Card
+DESCRIPTION:Description
+X-APPLE-TAGS:Test
+END:VTODO
+END:VCALENDAR
+ICS;
+
+		$this->backend->updateCalendarObject($sourceCard, $calendarData);
+	}
+
 	public function testUpdateCardDoesNotAutoCreateLabelsWithoutManagePermission(): void {
 		$sourceCard = new Card();
 		$sourceCard->setId(123);