fix(dav): prevent trailing deletes on stack moves and restore via createFile

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

Author: Jaggob

lib/DAV/Calendar.php

@@ -116,7 +116,7 @@ protected function validateFilterForObject($object, array $filters) {
 
 	public function createFile($name, $data = null) {
 		try {
-			$this->getChildNode($name, false)->put((string)$data);
+			$this->getChildNode($name, false, false)->put((string)$data);
 			$this->children = null;
 			return;
 		} catch (NotFound $e) {
@@ -135,10 +135,10 @@ public function createFile($name, $data = null) {
 	}
 
 	public function getChild($name) {
-		return $this->getChildNode($name, true);
+		return $this->getChildNode($name, true, true);
 	}
 
-	private function getChildNode(string $name, bool $allowPlaceholder) {
+	private function getChildNode(string $name, bool $allowPlaceholder, bool $includeDeletedFallback) {
 		foreach ($this->getBackendChildren() as $item) {
 			$canonicalName = $item->getCalendarPrefix() . '-' . $item->getId() . '.ics';
 			if ($this->isMatchingCalendarObjectName($name, $canonicalName)) {
@@ -151,7 +151,8 @@ private function getChildNode(string $name, bool $allowPlaceholder) {
 		$fallbackItem = $this->backend->findCalendarObjectByName(
 			$name,
 			$this->board->getId(),
-			$this->stack?->getId()
+			$this->stack?->getId(),
+			$includeDeletedFallback
 		);
 		if ($fallbackItem !== null) {
 			$canonicalName = $fallbackItem->getCalendarPrefix() . '-' . $fallbackItem->getId() . '.ics';
@@ -226,6 +227,10 @@ public function getBoardId(): int {
 		return $this->board->getId();
 	}
 
+	public function getStackId(): ?int {
+		return $this->stack?->getId();
+	}
+
 	public function propPatch(PropPatch $propPatch) {
 		$properties = [
 			'{DAV:}displayname',

lib/DAV/CalendarObject.php

@@ -81,7 +81,7 @@ public function getSize() {
 	}
 
 	public function delete() {
-		$this->backend->deleteCalendarObject($this->sourceItem, $this->calendar->getBoardId());
+		$this->backend->deleteCalendarObject($this->sourceItem, $this->calendar->getBoardId(), $this->calendar->getStackId());
 	}
 
 	public function getName() {

lib/DAV/DeckCalendarBackend.php

@@ -102,9 +102,17 @@ public function getStack(int $stackId): Stack {
 	 * @param string $name resource name like card-123.ics, deck-card-123.ics or stack-12.ics
 	 * @return Card|Stack|null
 	 */
-	public function findCalendarObjectByName(string $name, ?int $boardId = null, ?int $stackId = null) {
+	public function findCalendarObjectByName(string $name, ?int $boardId = null, ?int $stackId = null, bool $includeDeleted = true) {
 		if (preg_match('/^(?:deck-)?card-(\d+)\.ics$/', $name, $matches) === 1) {
-			$card = $this->findCardByIdIncludingDeleted((int)$matches[1]);
+			$cardId = (int)$matches[1];
+			$card = null;
+			try {
+				$card = $includeDeleted
+					? $this->findCardByIdIncludingDeleted($cardId)
+					: $this->cardService->find($cardId);
+			} catch (\Throwable $e) {
+				$card = null;
+			}
 			if ($card === null) {
 				return null;
 			}
@@ -296,7 +304,7 @@ public function updateCalendarObject($sourceItem, string $data) {
 	/**
 	 * @param Card|Stack $sourceItem
 	 */
-	public function deleteCalendarObject($sourceItem, ?int $expectedBoardId = null): void {
+	public function deleteCalendarObject($sourceItem, ?int $expectedBoardId = null, ?int $expectedStackId = null): void {
 		if ($sourceItem instanceof Card) {
 			$currentCard = $sourceItem;
 			if ($expectedBoardId !== null) {
@@ -307,6 +315,10 @@ public function deleteCalendarObject($sourceItem, ?int $expectedBoardId = null):
 						// Ignore trailing delete from source calendar after a cross-board move.
 						return;
 					}
+					if ($expectedStackId !== null && $currentCard->getStackId() !== $expectedStackId) {
+						// Ignore trailing delete from source list calendar after an in-board move.
+						return;
+					}
 				} catch (\Throwable $e) {
 					// If we cannot resolve the current card, continue with normal delete behavior.
 				}

tests/unit/DAV/DeckCalendarBackendTest.php

@@ -186,6 +186,46 @@ public function testDeleteStackFromCalendarObject(): void {
 		$this->backend->deleteCalendarObject($sourceStack);
 	}
 
+	public function testDeleteCardFromCalendarObjectSkipsTrailingDeleteAfterSameBoardStackMove(): void {
+		$sourceCard = new Card();
+		$sourceCard->setId(321);
+		$sourceCard->setStackId(10);
+
+		$currentCard = new Card();
+		$currentCard->setId(321);
+		$currentCard->setStackId(11);
+
+		$currentStack = new Stack();
+		$currentStack->setId(11);
+		$currentStack->setBoardId(12);
+
+		$this->cardService->expects($this->once())
+			->method('find')
+			->with(321)
+			->willReturn($currentCard);
+		$this->stackService->expects($this->once())
+			->method('find')
+			->with(11)
+			->willReturn($currentStack);
+		$this->cardService->expects($this->never())
+			->method('delete');
+
+		$this->backend->deleteCalendarObject($sourceCard, 12, 10);
+	}
+
+	public function testFindCalendarObjectByNameWithoutDeletedFallbackSkipsSoftDeletedCard(): void {
+		$this->cardService->expects($this->once())
+			->method('find')
+			->with(321)
+			->willThrowException(new \Exception('Card not found'));
+		$this->cardService->expects($this->never())
+			->method('findIncludingDeletedLite');
+
+		$object = $this->backend->findCalendarObjectByName('card-321.ics', 12, null, false);
+
+		$this->assertNull($object);
+	}
+
 	public function testUpdateCardWithCompletedWithoutStatusMarksDone(): void {
 		$sourceCard = new Card();
 		$sourceCard->setId(123);