upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-20 17:43:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 51

Merge pull request #53548 from nextcloud/fixFilesRemindersJoins

Browse source 
fix(files_reminders): Join the reminders with the file system metadata
This commit is contained in:
Côme Chilliet 2025-06-23 12:24:56 +02:00 committed by GitHub
commit f980d94fad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/files_reminders/lib/Db/ReminderMapper.php
View file

@ -137,24 +137,14 @@ class ReminderMapper extends QBMapper {
* @return Reminder[]
*/
public function findAllInFolder(IUser $user, Folder $folder) {
$fileIds = array_values(array_filter(array_map(
function (Node $node) {
try {
return $node->getId();
} catch (NotFoundException $e) {
return null;
}
},
$folder->getDirectoryListing(),
)));
$qb = $this->db->getQueryBuilder();
$qb->select('id', 'user_id', 'file_id', 'due_date', 'updated_at', 'created_at', 'notified')
->from($this->getTableName())
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID(), IQueryBuilder::PARAM_STR)))
->andWhere($qb->expr()->in('file_id', $qb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)))
->orderBy('due_date', 'ASC');
$qb->select('r.id', 'r.user_id', 'r.file_id', 'r.due_date', 'r.updated_at', 'r.created_at', 'r.notified')
->from($this->getTableName(), 'r')
->innerJoin('r', 'oc_filecache', 'f', $qb->expr()->eq('r.file_id', 'f.fileid'))
->where($qb->expr()->eq('r.user_id', $qb->createNamedParameter($user->getUID(), IQueryBuilder::PARAM_STR)))
->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($folder->getId(), IQueryBuilder::PARAM_INT)))
->orderBy('r.due_date', 'ASC');
return $this->findEntities($qb);
}