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

fix(files_reminders): Delete reminders on node deleted

Browse source 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
This commit is contained in:
Christopher Ng 2023-08-14 18:09:24 -07:00 committed by backportbot-nextcloud[bot]
parent 6f879f24db
commit 95688ea412
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IDBConnection;
use OCP\IUser;
@ -111,11 +112,17 @@ class ReminderMapper extends QBMapper {
* @return Reminder[]
*/
public function findAllForNode(Node $node) {
try {
$nodeId = $node->getId();
} catch (NotFoundException $e) {
return [];
}
$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('file_id', $qb->createNamedParameter($node->getId(), IQueryBuilder::PARAM_INT)))
->where($qb->expr()->eq('file_id', $qb->createNamedParameter($nodeId, IQueryBuilder::PARAM_INT)))
->orderBy('due_date', 'ASC');
return $this->findEntities($qb);

6
apps/files_reminders/lib/Listener/NodeDeletedListener.php
View file

@ -26,8 +26,6 @@ declare(strict_types=1);
namespace OCA\FilesReminders\Listener;
use OC\Files\Node\NonExistingFile;
use OC\Files\Node\NonExistingFolder;
use OCA\FilesReminders\Service\ReminderService;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
@ -44,10 +42,6 @@ class NodeDeletedListener implements IEventListener {
}
$node = $event->getNode();
if ($node instanceof NonExistingFile || $node instanceof NonExistingFolder) {
return;
}
$this->reminderService->removeAllForNode($node);
}
}