Skip to content

enh(performance): get deck share permissions in one query #8359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grnd-alt wants to merge 1 commit into
base: main
Choose a base branch
from
+69 −17
Open

enh(performance): get deck share permissions in one query #8359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions lib/Db/AclMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,33 @@ public function findAll(int $boardId, ?int $limit = null, ?int $offset = null) {
return $this->findEntities($qb);
}

/**
* @return array<int, Acl[]> Acl entries grouped by card id
* @throws \OCP\DB\Exception
*/
public function findInCards(array $cardIds, ?int $limit = null, ?int $offset = null): array {
$qb = $this->db->getQueryBuilder();
$qb->select('acl.id', 'acl.board_id', 'acl.type', 'acl.participant', 'acl.permission_edit', 'acl.permission_share', 'acl.permission_manage', 'acl.created_at', 'acl.last_modified_at', 'c.id AS card_id')
->from('deck_board_acl', 'acl')
->innerJoin('acl', 'deck_boards', 'b', 'acl.board_id = b.id')
->innerJoin('b', 'deck_stacks', 's', 's.board_id = b.id')
->innerJoin('s', 'deck_cards', 'c', 'c.stack_id = s.id')
->where($qb->expr()->in('c.id', $qb->createParameter('cardIds')))
->setMaxResults($limit)
->setFirstResult($offset);

$aclsByCardId = [];
foreach ($this->chunkQuery($cardIds, function (array $ids) use ($qb) {
$qb->setParameter('cardIds', $ids, IQueryBuilder::PARAM_INT_ARRAY);
return $qb->executeQuery()->fetchAll();
}) as $row) {
$cardId = (int)$row['card_id'];
unset($row['card_id']);
$aclsByCardId[$cardId][] = Acl::fromRow($row);
}
return $aclsByCardId;
}

public function findIn(array $boardIds, ?int $limit = null, ?int $offset = null): array {
$qb = $this->db->getQueryBuilder();
$qb->select('id', 'board_id', 'type', 'participant', 'permission_edit', 'permission_share', 'permission_manage', 'created_at', 'last_modified_at')
Expand Down
25 changes: 25 additions & 0 deletions lib/Service/PermissionService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,31 @@ public function setAccessToken(string $token) {
$this->accessToken = $token;
}

/**
* Get permissions for all supplied card ids
* @param int[] $cardIds
* @param ?string $userId
* @param bool $allowDeleted
* @return array<int, array<Acl::PERMISSION_*, bool>>
*/
public function getPermissionsForCards(array $cardIds, ?string $userId = null, bool $allowDeleted = false): array {

@benjaminfrueh benjaminfrueh Sep 10, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The param $allowDeleted is currently unused and should be maybe removed.

if ($userId === null) {
$userId = $this->userId;
}
$permissions = $this->aclMapper->findInCards($cardIds);
return array_map(
function (array $acls) use ($userId) {
return [
Acl::PERMISSION_READ => $this->userCan($acls, Acl::PERMISSION_READ, $userId),
Acl::PERMISSION_EDIT => $this->userCan($acls, Acl::PERMISSION_EDIT, $userId),
Acl::PERMISSION_MANAGE => $this->userCan($acls, Acl::PERMISSION_MANAGE, $userId),
Acl::PERMISSION_SHARE => $this->userCan($acls, Acl::PERMISSION_SHARE, $userId),
];
},
$permissions
);
}

/**
* Get current user permissions for a board by id
*
Expand Down
34 changes: 17 additions & 17 deletions lib/Sharing/DeckShareProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,22 +269,6 @@ private function createShareObject(array $data): IShare {
return $share;
}

private function applyBoardPermission($share, $permissions, $userId) {
try {
$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_EDIT, $userId, true);
} catch (NoPermissionException $e) {
$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE;
$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE;
}

try {
$this->permissionService->checkPermission($this->cardMapper, $share->getSharedWith(), Acl::PERMISSION_SHARE, $userId, true);
} catch (NoPermissionException $e) {
$permissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE;
}
$share->setPermissions($permissions);
}
/**
* @inheritDoc
*/
Expand Down Expand Up @@ -652,11 +636,13 @@ private function resolveSharesForRecipient(array $shares, string $userId): array

/** @var int[] $ids */
$ids = [];
$cardIds = [];
/** @var IShare[] $shareMap */
$shareMap = [];

foreach ($shareSlice as $share) {
$ids[] = (int)$share->getId();
$cardIds[] = (int)$share->getSharedWith();
$shareMap[$share->getId()] = $share;
}

Expand All @@ -673,8 +659,22 @@ private function resolveSharesForRecipient(array $shares, string $userId): array

$stmt = $query->executeQuery();

$permissions = $this->permissionService->getPermissionsForCards($cardIds, $userId);

while ($data = $stmt->fetch()) {
$this->applyBoardPermission($shareMap[$data['parent']], (int)$data['permissions'], $userId);
$parent = $shareMap[$data['parent']];
$sharePermissions = (int)$data['permissions'];
if (isset($permissions[(int)$parent->getSharedWith()])) {
if ($permissions[(int)$parent->getSharedWith()][Acl::PERMISSION_EDIT] === false) {
$sharePermissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE;
$sharePermissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE;
$sharePermissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE;
}
if ($permissions[(int)$parent->getSharedWith()][Acl::PERMISSION_SHARE] === false) {
$sharePermissions &= Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE;
}
}
$shareMap[$data['parent']]->setPermissions($sharePermissions);
$shareMap[$data['parent']]->setTarget($data['file_target']);
}

Expand Down
Loading