Merge pull request #7180 from nextcloud/backport/7177/stable31

[stable31] Clean attachment sharing records after permanent deleted

Author: luka-nextcloud

lib/Cron/DeleteCron.php

@@ -14,6 +14,7 @@
 use OCA\Deck\Db\StackMapper;
 use OCA\Deck\InvalidAttachmentType;
 use OCA\Deck\Service\AttachmentService;
+use OCA\Deck\Sharing\DeckShareProvider;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJob;
 use OCP\BackgroundJob\TimedJob;
@@ -30,14 +31,25 @@ class DeleteCron extends TimedJob {
 	private $attachmentMapper;
 	/** @var StackMapper */
 	private $stackMapper;
+	/** @var DeckShareProvider */
+	private $deckShareProvider;
 
-	public function __construct(ITimeFactory $time, BoardMapper $boardMapper, CardMapper $cardMapper, AttachmentService $attachmentService, AttachmentMapper $attachmentMapper, StackMapper $stackMapper) {
+	public function __construct(
+		ITimeFactory $time,
+		BoardMapper $boardMapper,
+		CardMapper $cardMapper,
+		AttachmentService $attachmentService,
+		AttachmentMapper $attachmentMapper,
+		StackMapper $stackMapper,
+		DeckShareProvider $deckShareProvider,
+	) {
 		parent::__construct($time);
 		$this->boardMapper = $boardMapper;
 		$this->cardMapper = $cardMapper;
 		$this->attachmentService = $attachmentService;
 		$this->attachmentMapper = $attachmentMapper;
 		$this->stackMapper = $stackMapper;
+		$this->deckShareProvider = $deckShareProvider;
 
 		$this->setInterval(60 * 60 * 24);
 		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
@@ -70,6 +82,12 @@ protected function run($argument) {
 			$this->attachmentMapper->delete($attachment);
 		}
 
+		// Delete orphaned attachment shares
+		$shares = $this->deckShareProvider->getOrphanedAttachmentShares();
+		foreach ($shares as $share) {
+			$this->deckShareProvider->delete($share);
+		}
+
 		$stacks = $this->stackMapper->findToDelete();
 		foreach ($stacks as $stack) {
 			$this->stackMapper->delete($stack);

lib/Db/CardMapper.php

@@ -645,4 +645,16 @@ public function remapCardOwner(int $boardId, string $userId, string $newUserId):
 
 		$result->closeCursor();
 	}
+
+	public function getAllCardIds(): array {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('id')
+			->from('deck_cards');
+		$result = $qb->executeQuery();
+		$ids = [];
+		while ($row = $result->fetch()) {
+			$ids[] = (int)$row['id'];
+		}
+		return $ids;
+	}
 }

lib/Sharing/DeckShareProvider.php

@@ -1046,4 +1046,21 @@ public function getAllShares(): iterable {
 		}
 		$cursor->closeCursor();
 	}
+
+	public function getOrphanedAttachmentShares(): array {
+		$allCardIds = $this->cardMapper->getAllCardIds();
+		$qb = $this->dbConnection->getQueryBuilder();
+		$qb->select('*')
+			->from('share', 's')
+			->where($qb->expr()->eq('s.share_type', $qb->createNamedParameter(IShare::TYPE_DECK)))
+			->andWhere($qb->expr()->notIn('s.share_with', $qb->createNamedParameter($allCardIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+		$cursor = $qb->execute();
+		$shares = [];
+		while ($data = $cursor->fetch()) {
+			$shares[] = $this->createShareObject($data);
+		}
+
+		return $shares;
+	}
 }

tests/unit/Cron/DeleteCronTest.php

@@ -35,6 +35,7 @@
 use OCA\Deck\InvalidAttachmentType;
 use OCA\Deck\Service\AttachmentService;
 use OCA\Deck\Service\IAttachmentService;
+use OCA\Deck\Sharing\DeckShareProvider;
 use OCP\AppFramework\Utility\ITimeFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
@@ -53,6 +54,8 @@ class DeleteCronTest extends TestCase {
 	private $attachmentMapper;
 	/** @var StackMapper|MockObject */
 	private $stackMapper;
+	/** @var DeckShareProvider */
+	private $deckShareProvider;
 	/** @var DeleteCron */
 	protected $deleteCron;
 
@@ -64,7 +67,16 @@ public function setUp(): void {
 		$this->attachmentService = $this->createMock(AttachmentService::class);
 		$this->attachmentMapper = $this->createMock(AttachmentMapper::class);
 		$this->stackMapper = $this->createMock(StackMapper::class);
-		$this->deleteCron = new DeleteCron($this->timeFactory, $this->boardMapper, $this->cardMapper, $this->attachmentService, $this->attachmentMapper, $this->stackMapper);
+		$this->deckShareProvider = $this->createMock(DeckShareProvider::class);
+		$this->deleteCron = new DeleteCron(
+			$this->timeFactory,
+			$this->boardMapper,
+			$this->cardMapper,
+			$this->attachmentService,
+			$this->attachmentMapper,
+			$this->stackMapper,
+			$this->deckShareProvider,
+		);
 	}
 
 	protected function getBoard($id) {