Permanently delete deck cards marked as deleted after 5 min in a cron job
Limit deleted cards in one cron job run to 500 Converted spaces to tabs Added missing import for CardMapper class Added another missing import for CardMapper class Fixed response object in findToDelete method + fixed 2 misspellings in API.md Fixed invalid parameter type Fix DeleteCronTest Signed-off-by: Marcel Klehr <mklehr@gmx.net> Fix lint errors Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
committed by
backportbot-nextcloud[bot]
parent
c93189ff9a
commit
d3a77e4a11
@@ -27,6 +27,8 @@ use OCA\Deck\Db\Attachment;
|
||||
use OCA\Deck\Db\AttachmentMapper;
|
||||
use OCA\Deck\Db\Board;
|
||||
use OCA\Deck\Db\BoardMapper;
|
||||
use OCA\Deck\Db\Card;
|
||||
use OCA\Deck\Db\CardMapper;
|
||||
use OCA\Deck\InvalidAttachmentType;
|
||||
use OCA\Deck\Service\AttachmentService;
|
||||
use OCA\Deck\Service\IAttachmentService;
|
||||
@@ -40,7 +42,9 @@ class DeleteCronTest extends TestCase {
|
||||
private $timeFactory;
|
||||
/** @var BoardMapper|MockObject */
|
||||
protected $boardMapper;
|
||||
/** @var AttachmentService|MockObject */
|
||||
/** @var CardMapper|\PHPUnit\Framework\MockObject\MockObject */
|
||||
protected $cardMapper;
|
||||
/** @var AttachmentService|\PHPUnit\Framework\MockObject\MockObject */
|
||||
private $attachmentService;
|
||||
/** @var AttachmentMapper|MockObject */
|
||||
private $attachmentMapper;
|
||||
@@ -51,9 +55,10 @@ class DeleteCronTest extends TestCase {
|
||||
parent::setUp();
|
||||
$this->timeFactory = $this->createMock(ITimeFactory::class);
|
||||
$this->boardMapper = $this->createMock(BoardMapper::class);
|
||||
$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->attachmentService, $this->attachmentMapper);
|
||||
$this->deleteCron = new DeleteCron($this->timeFactory, $this->boardMapper, $this->cardMapper, $this->attachmentService, $this->attachmentMapper);
|
||||
}
|
||||
|
||||
protected function getBoard($id) {
|
||||
@@ -62,6 +67,12 @@ class DeleteCronTest extends TestCase {
|
||||
return $board;
|
||||
}
|
||||
|
||||
protected function getCard($id) {
|
||||
$card = new Card();
|
||||
$card->setId($id);
|
||||
return $card;
|
||||
}
|
||||
|
||||
public function testDeleteCron() {
|
||||
$boards = [
|
||||
$this->getBoard(1),
|
||||
@@ -81,6 +92,14 @@ class DeleteCronTest extends TestCase {
|
||||
[$boards[3]]
|
||||
);
|
||||
|
||||
$cards = [ $this->getCard(10) ];
|
||||
$this->cardMapper->expects($this->once())
|
||||
->method('findToDelete')
|
||||
->willReturn($cards);
|
||||
$this->cardMapper->expects($this->once())
|
||||
->method('delete')
|
||||
->with($cards[0]);
|
||||
|
||||
$attachment = new Attachment();
|
||||
$attachment->setType('deck_file');
|
||||
$this->attachmentMapper->expects($this->once())
|
||||
@@ -107,6 +126,10 @@ class DeleteCronTest extends TestCase {
|
||||
->method('findToDelete')
|
||||
->willReturn($boards);
|
||||
|
||||
$this->cardMapper->expects($this->once())
|
||||
->method('findToDelete')
|
||||
->willReturn([]);
|
||||
|
||||
$attachment = new Attachment();
|
||||
$attachment->setType('deck_file_invalid');
|
||||
$this->attachmentMapper->expects($this->once())
|
||||
|
||||
Reference in New Issue
Block a user