Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into development
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { IsNotEmpty, IsUUID } from 'class-validator';
|
||||
import { IsNotEmpty, IsOptional, IsUUID, ValidateIf } from 'class-validator';
|
||||
|
||||
export class CreateUserDto {
|
||||
@IsNotEmpty()
|
||||
@@ -10,6 +10,9 @@ export class CreateUserDto {
|
||||
@IsUUID()
|
||||
roleId: string;
|
||||
|
||||
@ValidateIf((o) => {
|
||||
return !!o.superior;
|
||||
})
|
||||
@IsUUID()
|
||||
superior: string;
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
import { UsersService } from './users.service';
|
||||
import { CreateUserDto } from './dto/create-user.dto';
|
||||
import { UpdateUserDto } from './dto/update-user.dto';
|
||||
import {Public} from "../auth/public.decorator";
|
||||
|
||||
@Controller({
|
||||
path: 'users',
|
||||
@@ -32,6 +33,7 @@ export class UsersController {
|
||||
};
|
||||
}
|
||||
|
||||
@Public()
|
||||
@Get()
|
||||
async findAll(@Query('page') page: number) {
|
||||
const [data, count] = await this.usersService.findAll(page);
|
||||
|
||||
Reference in New Issue
Block a user