Add pagination support

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2018-04-23 14:58:43 +02:00 committed by Daniel Calviño Sánchez
parent 1e16f7ecd9
commit ac2314e3d0
4 changed files with 42 additions and 21 deletions

View File

@ -50,27 +50,40 @@ class Provider extends \OCP\Search\Provider {
return []; return [];
} }
/** @var IComment[] $comments */
$comments = $cm->search($query, 'files', '', 'comment');
$result = []; $result = [];
foreach ($comments as $comment) { $numComments = 50;
if ($comment->getActorType() !== 'users') { $offset = 0;
continue;
while (\count($result) < $numComments) {
/** @var IComment[] $comments */
$comments = $cm->search($query, 'files', '', 'comment', $offset, $numComments);
foreach ($comments as $comment) {
if ($comment->getActorType() !== 'users') {
continue;
}
$displayName = $cm->resolveDisplayName('user', $comment->getActorId());
try {
$file = $this->getFileForComment($uf, $comment);
$result[] = new Result($query,
$comment,
$displayName,
$file->getPath()
);
} catch (NotFoundException $e) {
continue;
}
} }
$displayName = $cm->resolveDisplayName('user', $comment->getActorId()); if (\count($comments) < $numComments) {
// Didn't find more comments when we tried to get, so there are no more comments.
try { return $result;
$file = $this->getFileForComment($uf, $comment);
$result[] = new Result($query,
$comment,
$displayName,
$file->getPath()
);
} catch (NotFoundException $e) {
continue;
} }
$offset += $numComments;
$numComments = 50 - \count($result);
} }
return $result; return $result;

View File

@ -500,9 +500,11 @@ class Manager implements ICommentsManager {
* @param string $objectType Limit the search by object type * @param string $objectType Limit the search by object type
* @param string $objectId Limit the search by object id * @param string $objectId Limit the search by object id
* @param string $verb Limit the verb of the comment * @param string $verb Limit the verb of the comment
* @param int $offset
* @param int $limit
* @return IComment[] * @return IComment[]
*/ */
public function search(string $search, string $objectType, string $objectId, string $verb): array { public function search(string $search, string $objectType, string $objectId, string $verb, int $offset, int $limit = 50): array {
$query = $this->dbConn->getQueryBuilder(); $query = $this->dbConn->getQueryBuilder();
$query->select('*') $query->select('*')
@ -511,7 +513,8 @@ class Manager implements ICommentsManager {
'%' . $this->dbConn->escapeLikeParameter($search). '%' '%' . $this->dbConn->escapeLikeParameter($search). '%'
))) )))
->orderBy('creation_timestamp', 'DESC') ->orderBy('creation_timestamp', 'DESC')
->addOrderBy('id', 'DESC'); ->addOrderBy('id', 'DESC')
->setMaxResults($limit);
if ($objectType !== '') { if ($objectType !== '') {
$query->andWhere($query->expr()->eq('object_type', $query->createNamedParameter($objectType))); $query->andWhere($query->expr()->eq('object_type', $query->createNamedParameter($objectType)));
@ -522,6 +525,9 @@ class Manager implements ICommentsManager {
if ($verb !== '') { if ($verb !== '') {
$query->andWhere($query->expr()->eq('verb', $query->createNamedParameter($verb))); $query->andWhere($query->expr()->eq('verb', $query->createNamedParameter($verb)));
} }
if ($offset !== 0) {
$query->setFirstResult($offset);
}
$comments = []; $comments = [];
$result = $query->execute(); $result = $query->execute();

View File

@ -145,10 +145,12 @@ interface ICommentsManager {
* @param string $objectType Limit the search by object type * @param string $objectType Limit the search by object type
* @param string $objectId Limit the search by object id * @param string $objectId Limit the search by object id
* @param string $verb Limit the verb of the comment * @param string $verb Limit the verb of the comment
* @param int $offset
* @param int $limit
* @return IComment[] * @return IComment[]
* @since 14.0.0 * @since 14.0.0
*/ */
public function search(string $search, string $objectType, string $objectId, string $verb): array; public function search(string $search, string $objectType, string $objectId, string $verb, int $offset, int $limit = 50): array;
/** /**
* @param $objectType string the object type, e.g. 'files' * @param $objectType string the object type, e.g. 'files'

View File

@ -32,7 +32,7 @@ class FakeManager implements ICommentsManager {
public function getNumberOfCommentsForObject($objectType, $objectId, \DateTime $notOlderThan = null) {} public function getNumberOfCommentsForObject($objectType, $objectId, \DateTime $notOlderThan = null) {}
public function search(string $search, string $objectType, string $objectId, string $verb): array { public function search(string $search, string $objectType, string $objectId, string $verb, int $offset, int $limit = 50): array {
return []; return [];
} }