From ede75108548febed0e9fb0b56595529927866721 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 Oct 2020 12:10:59 +0100 Subject: [PATCH] Add a function to get the unread count for multiple objects in one go Signed-off-by: Joas Schilling --- lib/private/Comments/Manager.php | 40 ++++++++++++++++++++++++ lib/public/Comments/ICommentsManager.php | 11 +++++++ tests/lib/Comments/FakeManager.php | 5 +++ 3 files changed, 56 insertions(+) diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 1830fb00f3..98c600add2 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -624,6 +624,46 @@ class Manager implements ICommentsManager { return (int)$data[0]; } + /** + * @param string $objectType the object type, e.g. 'files' + * @param string[] $objectIds the id of the object + * @param IUser $user + * @param string $verb Limit the verb of the comment - Added in 14.0.0 + * @return array Map with object id => # of unread comments + * @psalm-return array + * @since 21.0.0 + */ + public function getNumberOfUnreadCommentsForObjects(string $objectType, array $objectIds, IUser $user, $verb = ''): array { + $query = $this->dbConn->getQueryBuilder(); + $query->select('c.object_id', $query->func()->count('c.id', 'num_comments')) + ->from('comments', 'c') + ->leftJoin('c', 'comments_read_markers', 'm', $query->expr()->andX( + $query->expr()->eq('m.user_id', $query->createNamedParameter($user->getUID())), + $query->expr()->eq('c.object_type', 'm.object_type'), + $query->expr()->eq('c.object_id', 'm.object_id') + )) + ->where($query->expr()->eq('c.object_type', $query->createNamedParameter($objectType))) + ->andWhere($query->expr()->in('c.object_id', $query->createNamedParameter($objectIds, IQueryBuilder::PARAM_STR_ARRAY))) + ->andWhere($query->expr()->orX( + $query->expr()->gt('c.creation_timestamp', 'm.marker_datetime'), + $query->expr()->isNull('m.marker_datetime') + )) + ->groupBy('c.object_id'); + + if ($verb !== '') { + $query->andWhere($query->expr()->eq('c.verb', $query->createNamedParameter($verb))); + } + + $result = $query->execute(); + $unreadComments = array_fill_keys($objectIds, 0); + while ($row = $result->fetch()) { + $unreadComments[$row['object_id']] = (int) $row['num_comments']; + } + $result->closeCursor(); + + return $unreadComments; + } + /** * @param string $objectType * @param string $objectId diff --git a/lib/public/Comments/ICommentsManager.php b/lib/public/Comments/ICommentsManager.php index b179b8a746..c34358ddf9 100644 --- a/lib/public/Comments/ICommentsManager.php +++ b/lib/public/Comments/ICommentsManager.php @@ -180,6 +180,17 @@ interface ICommentsManager { */ public function getNumberOfCommentsForObject($objectType, $objectId, \DateTime $notOlderThan = null, $verb = ''); + /** + * @param string $objectType the object type, e.g. 'files' + * @param string[] $objectIds the id of the object + * @param IUser $user + * @param string $verb Limit the verb of the comment - Added in 14.0.0 + * @return array Map with object id => # of unread comments + * @psalm-return array + * @since 21.0.0 + */ + public function getNumberOfUnreadCommentsForObjects(string $objectType, array $objectIds, IUser $user, $verb = ''): array; + /** * @param string $objectType * @param string $objectId diff --git a/tests/lib/Comments/FakeManager.php b/tests/lib/Comments/FakeManager.php index 29fb393436..2434945762 100644 --- a/tests/lib/Comments/FakeManager.php +++ b/tests/lib/Comments/FakeManager.php @@ -82,6 +82,11 @@ class FakeManager implements ICommentsManager { public function getNumberOfUnreadCommentsForFolder($folderId, IUser $user) { } + public function getNumberOfUnreadCommentsForObjects(string $objectType, array $objectIds, IUser $user, $verb = ''): array { + return []; + } + + public function getActorsInTree($id) { }