feat: add page size in all the rest API
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
||||
import { EntityNotFoundError, Repository } from 'typeorm';
|
||||
import { Roles } from './entities/roles.entity';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { UpdateUserDto } from '../users/dto/update-user.dto';
|
||||
import { CommissionSetting } from './entities/commission_setting.entity';
|
||||
|
||||
@Injectable()
|
||||
@@ -12,10 +10,10 @@ export class CommissionService {
|
||||
private commissionRepository: Repository<CommissionSetting>,
|
||||
) {}
|
||||
|
||||
findAllCommission(page) {
|
||||
findAllCommission(page, pageSize?) {
|
||||
return this.commissionRepository.findAndCount({
|
||||
skip: page * 10,
|
||||
take: 10,
|
||||
skip: page * (pageSize || 10),
|
||||
take: pageSize || 10,
|
||||
order: {
|
||||
version: 'DESC',
|
||||
},
|
||||
|
||||
@@ -30,8 +30,11 @@ export class ConfigurableController {
|
||||
) {}
|
||||
|
||||
@Get('/roles')
|
||||
async findAll(@Query('page') page: number) {
|
||||
const [data, count] = await this.roleService.findAllRoles(page);
|
||||
async findAll(
|
||||
@Query('page') page: number,
|
||||
@Query('pageSize') pageSize: number,
|
||||
) {
|
||||
const [data, count] = await this.roleService.findAllRoles(page, pageSize);
|
||||
|
||||
return {
|
||||
data,
|
||||
@@ -42,8 +45,14 @@ export class ConfigurableController {
|
||||
}
|
||||
|
||||
@Get('/commission')
|
||||
async findCommission(@Query('page') page: number) {
|
||||
const [data, count] = await this.commissionService.findAllCommission(page);
|
||||
async findCommission(
|
||||
@Query('page') page: number,
|
||||
@Query('pageSize') pageSize: number,
|
||||
) {
|
||||
const [data, count] = await this.commissionService.findAllCommission(
|
||||
page,
|
||||
pageSize,
|
||||
);
|
||||
|
||||
return {
|
||||
data,
|
||||
@@ -54,9 +63,13 @@ export class ConfigurableController {
|
||||
}
|
||||
|
||||
@Get('/roles/for-membership')
|
||||
async findAllForMembership(@Query('page') page: number) {
|
||||
async findAllForMembership(
|
||||
@Query('page') page: number,
|
||||
@Query('pageSize') pageSize: number,
|
||||
) {
|
||||
const [data, count] = await this.roleService.findAllRolesForCreateMember(
|
||||
page,
|
||||
pageSize,
|
||||
);
|
||||
|
||||
return {
|
||||
|
||||
@@ -10,20 +10,20 @@ export class RoleService {
|
||||
private rolesRepository: Repository<Roles>,
|
||||
) {}
|
||||
|
||||
findAllRoles(page) {
|
||||
findAllRoles(page, pageSize?) {
|
||||
return this.rolesRepository.findAndCount({
|
||||
skip: page * 10,
|
||||
take: 10,
|
||||
skip: page * (pageSize || 10),
|
||||
take: pageSize || 10,
|
||||
order: {
|
||||
version: 'DESC',
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
findAllRolesForCreateMember(page) {
|
||||
findAllRolesForCreateMember(page, pageSize?) {
|
||||
return this.rolesRepository.findAndCount({
|
||||
skip: page * 10,
|
||||
take: 10,
|
||||
skip: page * (pageSize || 10),
|
||||
take: pageSize || 10,
|
||||
where: {
|
||||
id: Not(
|
||||
In([
|
||||
|
||||
Reference in New Issue
Block a user