Merge pull request #7028 from nextcloud/backport/7027/stable30

[stable30] fix: update DeleteCron to remove deleted lists

Author: luka-nextcloud

lib/Cron/DeleteCron.php

@@ -10,6 +10,7 @@
 use OCA\Deck\Db\AttachmentMapper;
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\CardMapper;
+use OCA\Deck\Db\StackMapper;
 use OCA\Deck\InvalidAttachmentType;
 use OCA\Deck\Service\AttachmentService;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -26,13 +27,16 @@ class DeleteCron extends TimedJob {
 	private $attachmentService;
 	/** @var AttachmentMapper */
 	private $attachmentMapper;
+	/** @var StackMapper */
+	private $stackMapper;
 
-	public function __construct(ITimeFactory $time, BoardMapper $boardMapper, CardMapper $cardMapper, AttachmentService $attachmentService, AttachmentMapper $attachmentMapper) {
+	public function __construct(ITimeFactory $time, BoardMapper $boardMapper, CardMapper $cardMapper, AttachmentService $attachmentService, AttachmentMapper $attachmentMapper, StackMapper $stackMapper) {
 		parent::__construct($time);
 		$this->boardMapper = $boardMapper;
 		$this->cardMapper = $cardMapper;
 		$this->attachmentService = $attachmentService;
 		$this->attachmentMapper = $attachmentMapper;
+		$this->stackMapper = $stackMapper;
 
 		$this->setInterval(60 * 60 * 24);
 		$this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
@@ -64,5 +68,10 @@ protected function run($argument) {
 			}
 			$this->attachmentMapper->delete($attachment);
 		}
+
+		$stacks = $this->stackMapper->findToDelete();
+		foreach ($stacks as $stack) {
+			$this->stackMapper->delete($stack);
+		}
 	}
 }

lib/Db/StackMapper.php

@@ -163,4 +163,15 @@ public function findBoardId($id): ?int {
 
 		return $result !== false ? $result : null;
 	}
+
+	public function findToDelete(): array {
+		// add buffer of 5 min
+		$timeLimit = time() - (60 * 5);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->getTableName())
+			->where($qb->expr()->neq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
+			->andWhere($qb->expr()->lt('deleted_at', $qb->createNamedParameter($timeLimit, IQueryBuilder::PARAM_INT)));
+		return $this->findEntities($qb);
+	}
 }

tests/unit/Cron/DeleteCronTest.php

@@ -29,6 +29,8 @@
 use OCA\Deck\Db\BoardMapper;
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
+use OCA\Deck\Db\Stack;
+use OCA\Deck\Db\StackMapper;
 use OCA\Deck\InvalidAttachmentType;
 use OCA\Deck\Service\AttachmentService;
 use OCA\Deck\Service\IAttachmentService;
@@ -48,6 +50,8 @@ class DeleteCronTest extends TestCase {
 	private $attachmentService;
 	/** @var AttachmentMapper|MockObject */
 	private $attachmentMapper;
+	/** @var StackMapper|MockObject */
+	private $stackMapper;
 	/** @var DeleteCron */
 	protected $deleteCron;
 
@@ -58,7 +62,8 @@ public function setUp(): void {
 		$this->cardMapper = $this->createMock(CardMapper::class);
 		$this->attachmentService = $this->createMock(AttachmentService::class);
 		$this->attachmentMapper = $this->createMock(AttachmentMapper::class);
-		$this->deleteCron = new DeleteCron($this->timeFactory, $this->boardMapper, $this->cardMapper, $this->attachmentService, $this->attachmentMapper);
+		$this->stackMapper = $this->createMock(StackMapper::class);
+		$this->deleteCron = new DeleteCron($this->timeFactory, $this->boardMapper, $this->cardMapper, $this->attachmentService, $this->attachmentMapper, $this->stackMapper);
 	}
 
 	protected function getBoard($id) {
@@ -73,6 +78,12 @@ protected function getCard($id) {
 		return $card;
 	}
 
+	protected function getStack($id) {
+		$stack = new Stack();
+		$stack->setId($id);
+		return $stack;
+	}
+
 	public function testDeleteCron() {
 		$boards = [
 			$this->getBoard(1),
@@ -117,6 +128,21 @@ public function testDeleteCron() {
 		$this->attachmentMapper->expects($this->once())
 			->method('delete')
 			->with($attachment);
+
+		$stacks = [
+			$this->getStack(100),
+			$this->getStack(101),
+		];
+		$this->stackMapper->expects($this->once())
+			->method('findToDelete')
+			->willReturn($stacks);
+		$this->stackMapper->expects($this->exactly(count($stacks)))
+			->method('delete')
+			->withConsecutive(
+				[$stacks[0]],
+				[$stacks[1]]
+			);
+
 		$this->invokePrivate($this->deleteCron, 'run', [null]);
 	}