Skip to content

fix(files_reminders): Join the reminders with the file system metadata #53548

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

Merged
come-nc merged 1 commit into from
Jun 23, 2025
Merged

fix(files_reminders): Join the reminders with the file system metadata #53548

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
fix(files_reminders): Join the reminders with the file system metadat… 
…a table

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
  • Loading branch information
@solracsf
solracsf authored Jun 17, 2025
commit 4eb357e91ae6415852c759b262109a5b8db66ffe
22 changes: 6 additions & 16 deletions apps/files_reminders/lib/Db/ReminderMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,24 +137,14 @@ public function findNotified(DateTime $buffer, ?int $limit = null) {
* @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);
}
Expand Down
Loading