Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Command/UserExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$stacks = $this->stackMapper->findAll($board->getId());
foreach ($stacks as $stack) {
$data[$board->getId()]['stacks'][$stack->getId()] = $stack->jsonSerialize();
$cards = $this->cardMapper->findAllByStack($stack->getId());
$cards = $this->cardMapper->findAllByStack($stackId = $stack->getId(), null, null, $includeDeleted = true);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is something out of place, and probably something missing.

foreach ($cards as $card) {
if ($card->getDeletedAt() > 0) {
continue;
Expand Down
18 changes: 12 additions & 6 deletions lib/Db/CardMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -276,28 +276,34 @@ public function findAllArchivedForStacks(array $stackIds): array {
return $cards;
}

public function findAllByStack(int $stackId, ?int $limit = null, ?int $offset = null): array {
public function findAllByStack(int $stackId, ?int $limit = null, ?int $offset = null, bool $includeDeleted = false): array {
$qb = $this->db->getQueryBuilder();
$qb->select('*')
->from('deck_cards')
->where($qb->expr()->eq('stack_id', $qb->createNamedParameter($stackId, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
->setMaxResults($limit)
->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)));
if (!$includeDeleted) {
$qb->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
}
$qb->setMaxResults($limit)
->setFirstResult($offset)
->orderBy('order')
->addOrderBy('id');
return $this->findEntities($qb);
}

public function findAllByBoardId(int $boardId, ?int $limit = null, ?int $offset = null): array {
public function findAllByBoardId(int $boardId, ?int $limit = null, ?int $offset = null, bool $includeDeleted = false): array {
$qb = $this->db->getQueryBuilder();
$qb->select('c.*')
->from('deck_cards', 'c')
->innerJoin('c', 'deck_stacks', 's', 's.id = c.stack_id')
->innerJoin('s', 'deck_boards', 'b', 'b.id = s.board_id')
->where($qb->expr()->eq('board_id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
->setMaxResults($limit)
->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)));
if (!$includeDeleted) {
$qb->andWhere($qb->expr()->eq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
}
$qb->setMaxResults($limit)
->setFirstResult($offset)
->orderBy('c.lastmodified')
->addOrderBy('c.id');
Expand Down
Loading