Skip to content

fix(cron): Split Card IDs into chunks #7348

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
solracsf wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(cron): Split Card IDs into chunks #7348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e26e59
fix(cron): Split Card IDs into chunks
solracsf Nov 8, 2025
bf56298
fix: lint
solracsf Nov 8, 2025
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
52 changes: 19 additions & 33 deletions lib/Sharing/DeckShareProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,39 +48,18 @@

public const SHARE_TYPE_DECK_USER = IShare::TYPE_DECK_USER;

private IDBConnection $dbConnection;
private IManager $shareManager;
private AttachmentCacheHelper $attachmentCacheHelper;
private BoardMapper $boardMapper;
private CardMapper $cardMapper;
private PermissionService $permissionService;
private ITimeFactory $timeFactory;
private IL10N $l;
private IMimeTypeLoader $mimeTypeLoader;
private ?string $userId;

public function __construct(
IDBConnection $connection,
IManager $shareManager,
BoardMapper $boardMapper,
CardMapper $cardMapper,
PermissionService $permissionService,
AttachmentCacheHelper $attachmentCacheHelper,
IL10N $l,
ITimeFactory $timeFactory,
IMimeTypeLoader $mimeTypeLoader,
?string $userId,
private IDBConnection $dbConnection,
private IManager $shareManager,
private BoardMapper $boardMapper,
private CardMapper $cardMapper,
private PermissionService $permissionService,
private AttachmentCacheHelper $attachmentCacheHelper,
private IL10N $l,
private ITimeFactory $timeFactory,
private IMimeTypeLoader $mimeTypeLoader,
private ?string $userId = null,
) {
$this->dbConnection = $connection;
$this->shareManager = $shareManager;
$this->boardMapper = $boardMapper;
$this->cardMapper = $cardMapper;
$this->attachmentCacheHelper = $attachmentCacheHelper;
$this->permissionService = $permissionService;
$this->l = $l;
$this->timeFactory = $timeFactory;
$this->mimeTypeLoader = $mimeTypeLoader;
$this->userId = $userId;
}

public static function register(IEventDispatcher $dispatcher): void {
Expand Down Expand Up @@ -419,7 +398,7 @@

$qb->executeStatement();

return $this->getShareById((int)$share->getId(), $recipient);

Check failure on line 401 in lib/Sharing/DeckShareProvider.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidArgument 

lib/Sharing/DeckShareProvider.php:401:30: InvalidArgument: Argument 1 of OCA\Deck\Sharing\DeckShareProvider::getShareById expects string, but int provided (see https://psalm.dev/004)
}

/**
Expand Down Expand Up @@ -1053,11 +1032,18 @@

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)));
->where($qb->expr()->eq('s.share_type', $qb->createNamedParameter(IShare::TYPE_DECK)));

$chunks = array_chunk($allCardIds, 1000);
foreach ($chunks as $chunk) {
$qb->andWhere(
$qb->expr()->notIn('s.share_with', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_STR_ARRAY))
);
}

$cursor = $qb->executeQuery();
$shares = [];
Expand Down
Loading