upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix: query refactored to support both the search by email and sort by login

Browse source 
Signed-off-by: yemkareems <yemkareems@gmail.com>
This commit is contained in:
yemkareems 2024-07-04 17:56:24 +05:30
parent ae95e46787
commit 0e6040289f
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/private/AllConfig.php
View file

@ -505,29 +505,31 @@ class AllConfig implements IConfig {
$query = $this->connection->getQueryBuilder();
$query->select('uid', 'displayname')
$query->selectDistinct('uid')
->from('users', 'u')
->leftJoin('u', 'preferences', 'p', $query->expr()->andX(
$query->expr()->eq('userid', 'uid'),
$query->expr()->eq('appid', $query->expr()->literal('login')),
$query->expr()->eq('configkey', $query->expr()->literal('lastLogin')))
$query->expr()->eq('p.userid', 'uid'),
$query->expr()->eq('p.appid', $query->expr()->literal('login')),
$query->expr()->eq('p.configkey', $query->expr()->literal('lastLogin')))
)->leftJoin('u', 'preferences', 'p1', $query->expr()->andX(
$query->expr()->eq('p1.userid', 'uid'),
$query->expr()->eq('p1.appid', $query->expr()->literal('settings')),
$query->expr()->eq('p1.configkey', $query->expr()->literal('email')))
)
// sqlite doesn't like re-using a single named parameter here
->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $this->connection->escapeLikeParameter($search) . '%')))
->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $this->connection->escapeLikeParameter($search) . '%')))
->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $this->connection->escapeLikeParameter($search) . '%')))
->orderBy($query->func()->lower('configvalue'), 'DESC')
->orWhere($query->expr()->iLike('p1.configvalue', $query->createPositionalParameter('%' . $this->connection->escapeLikeParameter($search) . '%')))
->orderBy($query->func()->lower('p.configvalue'), 'DESC')
->addOrderBy('uid_lower', 'ASC')
->setFirstResult($offset)
->setMaxResults($limit);
$result = $query->executeQuery();
$displayNames = [];
while ($row = $result->fetch()) {
$displayNames[(string)$row['uid']] = (string)$row['uid'];
}
$uids = $result->fetchAll(\PDO::FETCH_COLUMN);
$result->closeCursor();
return $displayNames;
return $uids;
}
/**

2
lib/public/IConfig.php
View file

@ -256,7 +256,7 @@ interface IConfig {
* @param int|null $limit how many records to fetch
* @param int $offset from which offset to fetch
* @param string $search search users based on search params
* @return array of user IDs
* @return list<string> list of user IDs
* @since 30.0.0
*/
public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array;