edit ios & api
This commit is contained in:
@@ -0,0 +1,27 @@
|
|||||||
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
import { IsBoolean, IsEnum, IsOptional, IsString, MaxLength } from 'class-validator';
|
||||||
|
import { IsIranMobile } from '../../../common/decorators/is-iran-mobile.decorator';
|
||||||
|
import { UserRole } from '../../../entities/user.entity';
|
||||||
|
|
||||||
|
export class CreateUserDto {
|
||||||
|
@ApiProperty({ example: '09121234567' })
|
||||||
|
@IsString()
|
||||||
|
@IsIranMobile()
|
||||||
|
mobile!: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ example: 'علی رضایی', nullable: true })
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(150)
|
||||||
|
fullName?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ enum: UserRole, default: UserRole.CUSTOMER })
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(UserRole)
|
||||||
|
role?: UserRole;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ default: true })
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
isActive?: boolean;
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
Get,
|
Get,
|
||||||
Param,
|
Param,
|
||||||
Patch,
|
Patch,
|
||||||
|
Post,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { PublicUser } from '../../common/utils/user-serialize.util';
|
import { PublicUser } from '../../common/utils/user-serialize.util';
|
||||||
@@ -12,6 +13,7 @@ import { Roles } from '../auth/decorators/roles.decorator';
|
|||||||
import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
|
import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
|
||||||
import { RolesGuard } from '../auth/guards/roles.guard';
|
import { RolesGuard } from '../auth/guards/roles.guard';
|
||||||
import { AdminSetUserPasswordDto } from './dto/admin-set-user-password.dto';
|
import { AdminSetUserPasswordDto } from './dto/admin-set-user-password.dto';
|
||||||
|
import { CreateUserDto } from './dto/create-user.dto';
|
||||||
import { UpdateUserDto } from './dto/update-user.dto';
|
import { UpdateUserDto } from './dto/update-user.dto';
|
||||||
import { UsersService } from './users.service';
|
import { UsersService } from './users.service';
|
||||||
|
|
||||||
@@ -26,6 +28,11 @@ export class UsersController {
|
|||||||
return this.service.findAll();
|
return this.service.findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
create(@Body() payload: CreateUserDto): Promise<PublicUser> {
|
||||||
|
return this.service.create(payload);
|
||||||
|
}
|
||||||
|
|
||||||
@Get(':id')
|
@Get(':id')
|
||||||
findOne(@Param('id') id: string): Promise<PublicUser> {
|
findOne(@Param('id') id: string): Promise<PublicUser> {
|
||||||
return this.service.findOne(id);
|
return this.service.findOne(id);
|
||||||
|
|||||||
@@ -1,10 +1,20 @@
|
|||||||
import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
ConflictException,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { Repository } from 'typeorm';
|
import { Repository } from 'typeorm';
|
||||||
import { hashPassword } from '../../common/utils/password.util';
|
import { hashPassword } from '../../common/utils/password.util';
|
||||||
|
import {
|
||||||
|
isValidIranMobile,
|
||||||
|
normalizeIranMobile,
|
||||||
|
} from '../../common/utils/iran-mobile.util';
|
||||||
import { PublicUser, serializeUser } from '../../common/utils/user-serialize.util';
|
import { PublicUser, serializeUser } from '../../common/utils/user-serialize.util';
|
||||||
import { UserEntity } from '../../entities/user.entity';
|
import { UserEntity, UserRole } from '../../entities/user.entity';
|
||||||
import { AdminSetUserPasswordDto } from './dto/admin-set-user-password.dto';
|
import { AdminSetUserPasswordDto } from './dto/admin-set-user-password.dto';
|
||||||
|
import { CreateUserDto } from './dto/create-user.dto';
|
||||||
import { UpdateUserDto } from './dto/update-user.dto';
|
import { UpdateUserDto } from './dto/update-user.dto';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@@ -23,6 +33,28 @@ export class UsersService {
|
|||||||
return users.map(serializeUser);
|
return users.map(serializeUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async create(dto: CreateUserDto): Promise<PublicUser> {
|
||||||
|
const mobile = normalizeIranMobile(dto.mobile);
|
||||||
|
if (!isValidIranMobile(mobile)) {
|
||||||
|
throw new BadRequestException('Invalid mobile number');
|
||||||
|
}
|
||||||
|
|
||||||
|
const existing = await this.repo.findOne({ where: { mobile } });
|
||||||
|
if (existing) {
|
||||||
|
throw new ConflictException('کاربری با این شماره موبایل قبلاً ثبت شده است');
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = this.repo.create({
|
||||||
|
mobile,
|
||||||
|
fullName: dto.fullName ?? null,
|
||||||
|
role: dto.role ?? UserRole.CUSTOMER,
|
||||||
|
isActive: dto.isActive ?? true,
|
||||||
|
});
|
||||||
|
|
||||||
|
const saved = await this.repo.save(user);
|
||||||
|
return serializeUser(saved);
|
||||||
|
}
|
||||||
|
|
||||||
async findOne(id: string): Promise<PublicUser> {
|
async findOne(id: string): Promise<PublicUser> {
|
||||||
const user = await this.repo
|
const user = await this.repo
|
||||||
.createQueryBuilder('user')
|
.createQueryBuilder('user')
|
||||||
|
|||||||
Reference in New Issue
Block a user