archive
/
nextcloud
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: sort the user getDisplayNames based on lastLogin. Default sort order is lastLogin DESC

Browse Source 
Signed-off-by: yemkareems <yemkareems@gmail.com>
feature/add-ability-to-sort-by-last-login
yemkareems 2 weeks ago
parent b09a3fcd81
commit a8b1a1aee5
No known key found for this signature in database
GPG Key ID: 4293DA00B9478934
5 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
apps/provisioning_api/lib/Controller/UsersController.php
Unescape Escape View File

@ -130,7 +130,7 @@ class UsersController extends AUserData {
*
* 200: Users returned
*/
public function getUsers(string $search = '', ?int $limit = null, int $offset = 0, string $orderBy = 'last_login', string $sort = 'DESC'): DataResponse {
public function getUsers(string $search = '', ?int $limit = null, int $offset = 0, string $orderBy = 'lastLogin', string $sort = 'DESC'): DataResponse {
$user = $this->userSession->getUser();
$users = [];
@ -173,7 +173,7 @@ class UsersController extends AUserData {
*
* 200: Users details returned
*/
public function getUsersDetails(string $search = '', ?int $limit = null, int $offset = 0, string $orderBy = 'last_login', string $sort = 'DESC'): DataResponse {
public function getUsersDetails(string $search = '', ?int $limit = null, int $offset = 0, string $orderBy = 'lastLogin', string $sort = 'DESC'): DataResponse {
$currentUser = $this->userSession->getUser();
$users = [];

8
lib/private/User/Backend.php
Unescape Escape View File

@ -106,9 +106,11 @@ abstract class Backend implements UserInterface {
* @param string $search
* @param null|int $limit
* @param null|int $offset
* @param string $orderBy
* @param string $sort
* @return string[] an array of all uids
*/
public function getUsers($search = '', $limit = null, $offset = null) {
public function getUsers($search = '', $limit = null, $offset = null, $orderBy = 'lastLogin', $sort = 'DESC'): array {
return [];
}
@ -145,9 +147,11 @@ abstract class Backend implements UserInterface {
* @param string $search
* @param int|null $limit
* @param int|null $offset
* @param string $orderBy
* @param string $sort
* @return array an array of all displayNames (value) and the corresponding uids (key)
*/
public function getDisplayNames($search = '', $limit = null, $offset = null) {
public function getDisplayNames($search = '', $limit = null, $offset = null, string $orderBy = 'lastLogin', string $sort = 'DESC'): array {
$displayNames = [];
$users = $this->getUsers($search, $limit, $offset);
foreach ($users as $user) {

19
lib/private/User/Database.php
Unescape Escape View File

@ -264,27 +264,34 @@ class Database extends ABackend implements
* @param string $search
* @param int|null $limit
* @param int|null $offset
* @param string $orderBy
* @param string $sort
* @return array an array of all displayNames (value) and the corresponding uids (key)
*/
public function getDisplayNames($search = '', $limit = null, $offset = null) {
public function getDisplayNames($search = '', $limit = null, $offset = null, string $orderBy = 'lastLogin', string $sort = 'DESC'): array {
$limit = $this->fixLimit($limit);
$this->fixDI();
$query = $this->dbConn->getQueryBuilder();
$appId = 'settings'; $configKey = 'email';
if($orderBy == 'lastLogin') {
$appId = 'login'; $configKey = 'lastLogin';
}
$query->select('uid', 'displayname')
->from($this->table, 'u')
->leftJoin('u', 'preferences', 'p', $query->expr()->andX(
$query->expr()->eq('userid', 'uid'),
$query->expr()->eq('appid', $query->expr()->literal('settings')),
$query->expr()->eq('configkey', $query->expr()->literal('email')))
$query->expr()->eq('appid', $query->expr()->literal($appId)),
$query->expr()->eq('configkey', $query->expr()->literal($configKey)))
)
// sqlite doesn't like re-using a single named parameter here
->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $this->dbConn->escapeLikeParameter($search) . '%')))
->orderBy($query->func()->lower('displayname'), 'ASC')
->orderBy($query->func()->lower('configvalue'), $sort)
->addOrderBy('uid_lower', 'ASC')
->setMaxResults($limit)
->setFirstResult($offset);
@ -418,10 +425,10 @@ class Database extends ABackend implements
* @param null|int $offset
* @return string[] an array of all uids
*/
public function getUsers($search = '', $limit = null, $offset = null) {
public function getUsers($search = '', $limit = null, $offset = null, $orderBy = 'lastLogin', $sort = 'DESC'): array {
$limit = $this->fixLimit($limit);
$users = $this->getDisplayNames($search, $limit, $offset);
$users = $this->getDisplayNames($search, $limit, $offset, $orderBy, $sort);
$userIds = array_map(function ($uid) {
return (string)$uid;
}, array_keys($users));

12
lib/private/User/Manager.php
Unescape Escape View File

@ -288,10 +288,10 @@ class Manager extends PublicEmitter implements IUserManager {
* @return IUser[]
* @deprecated since 27.0.0, use searchDisplayName instead
*/
public function search($pattern, $limit = null, $offset = null, $orderBy = 'uid', $sort = 'ASC') {
public function search($pattern, $limit = null, $offset = null, $orderBy = 'uid', $sort = 'ASC'): array {
$users = [];
foreach ($this->backends as $backend) {
$backendUsers = $backend->getUsers($pattern, $limit, $offset);
$backendUsers = $backend->getUsers($pattern, $limit, $offset, $orderBy, $sort);
if (is_array($backendUsers)) {
foreach ($backendUsers as $uid) {
$users[$uid] = new LazyUser($uid, $this, null, $backend);
@ -304,12 +304,12 @@ class Manager extends PublicEmitter implements IUserManager {
return strcasecmp($b->getUID(), $a->getUID());
});
break;
case 'last_login ASC':
case 'lastLogin ASC':
uasort($users, function (IUser $a, IUser $b) {
return $a->getLastLogin() - $b->getLastLogin();
});
break;
case 'last_login DESC':
case 'lastLogin DESC':
uasort($users, function (IUser $a, IUser $b) {
return $b->getLastLogin() - $a->getLastLogin();
});
@ -364,12 +364,12 @@ class Manager extends PublicEmitter implements IUserManager {
return strcasecmp($b->getUID(), $a->getUID());
});
break;
case 'last_login ASC':
case 'lastLogin ASC':
uasort($users, function (IUser $a, IUser $b) {
return $a->getLastLogin() - $b->getLastLogin();
});
break;
case 'last_login DESC':
case 'lastLogin DESC':
uasort($users, function (IUser $a, IUser $b) {
return $b->getLastLogin() - $a->getLastLogin();
});

6
lib/public/UserInterface.php
Unescape Escape View File

@ -63,7 +63,7 @@ interface UserInterface {
* @return string[] an array of all uids
* @since 4.5.0
*/
public function getUsers($search = '', $limit = null, $offset = null);
public function getUsers($search = '', $limit = null, $offset = null, $orderBy = 'lastLogin', $sort = 'DESC'): array;
/**
* check if a user exists
@ -87,10 +87,12 @@ interface UserInterface {
* @param string $search
* @param int|null $limit
* @param int|null $offset
* @param string $orderBy
* @param string $sort
* @return array an array of all displayNames (value) and the corresponding uids (key)
* @since 4.5.0
*/
public function getDisplayNames($search = '', $limit = null, $offset = null);
public function getDisplayNames($search = '', $limit = null, $offset = null, string $orderBy = 'lastLogin', string $sort = 'DESC');
/**
* Check if a user list is available or not

Write Preview
Loading…
Cancel
Save