feat: return paginated users base on parameters

This commit is contained in:
Sergey Yarkov 2021-12-09 23:51:19 +03:00
parent 9238b4bd4a
commit 9eaca99e3b
2 changed files with 30 additions and 9 deletions

View File

@ -64,7 +64,7 @@ export default class UserRepository {
*/
public async getAll(params?: any) {
// eslint-disable-next-line @typescript-eslint/naming-convention
const { search, email, login, first_name, last_name, role, page = 1, limit = 10 }: any = params || {};
const { search, email, login, first_name, last_name, role, page, limit }: any = params || {};
const query = this.User.query();
@ -97,10 +97,23 @@ export default class UserRepository {
query.whereHas('roles', q => q.where('slug', role));
}
const data = await query.preload('contacts').preload('roles').orderBy('created_at', 'desc').paginate(page, limit);
query.preload('contacts').preload('roles').orderBy('created_at', 'desc');
/**
* Return paginated users if provided params
*/
if (limit && page) {
const data = await query.paginate(page, limit);
return data.toJSON();
}
/**
* Return all users
*/
const data = await query;
return data;
}
/**
* Create user
*

View File

@ -76,16 +76,24 @@ export default class UserService {
*/
public async fetchUsers(params?: any): Promise<IResponse> {
const users = await this.userRepository.getAll(params);
return {
const result: IResponse = {
success: true,
status: HttpStatusEnum.OK,
message: 'Fetched all users.',
data: users.data,
meta: {
pagination: users.meta,
},
data: {},
};
if (users instanceof Array) {
result.data = users;
return result;
}
result.data = users.data;
result.meta = {
pagination: users.meta,
};
return result;
}
/**