Merge branch 'development' into 'devops-staging'
add: new column in user See merge request empatnusabangsa/ppob/ppob-backend!92
This commit is contained in:
commit
cc00a32dd3
|
@ -1,4 +1,4 @@
|
||||||
import { IsNotEmpty, IsUUID } from 'class-validator';
|
import { IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
|
||||||
import { Partner } from '../entities/partner.entity';
|
import { Partner } from '../entities/partner.entity';
|
||||||
|
|
||||||
export class CreateUserDto {
|
export class CreateUserDto {
|
||||||
|
@ -20,6 +20,15 @@ export class CreateUserDto {
|
||||||
@IsNotEmpty()
|
@IsNotEmpty()
|
||||||
superior: boolean;
|
superior: boolean;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
identity_number: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
image_identity: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
image_store: string;
|
||||||
|
|
||||||
partner: Partner;
|
partner: Partner;
|
||||||
// @ValidateIf((o) => {
|
// @ValidateIf((o) => {
|
||||||
// return !!o.superior;
|
// return !!o.superior;
|
||||||
|
|
|
@ -15,4 +15,19 @@ export class UserDetail {
|
||||||
@OneToOne(() => User, (user) => user.userDetail)
|
@OneToOne(() => User, (user) => user.userDetail)
|
||||||
@JoinColumn()
|
@JoinColumn()
|
||||||
user: User;
|
user: User;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
})
|
||||||
|
identity_number: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
})
|
||||||
|
image_identity: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
})
|
||||||
|
image_store: string;
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,6 +82,9 @@ export class UsersService {
|
||||||
userDetailData.name = createUserDto.name;
|
userDetailData.name = createUserDto.name;
|
||||||
userDetailData.phone_number = createUserDto.phone_number;
|
userDetailData.phone_number = createUserDto.phone_number;
|
||||||
userDetailData.user = userData;
|
userDetailData.user = userData;
|
||||||
|
userDetailData.identity_number = createUserDto.identity_number;
|
||||||
|
userDetailData.image_identity = createUserDto.image_identity;
|
||||||
|
userDetailData.image_store = createUserDto.image_store;
|
||||||
|
|
||||||
const user_detail = await manager.insert(UserDetail, userDetailData);
|
const user_detail = await manager.insert(UserDetail, userDetailData);
|
||||||
|
|
||||||
|
@ -354,6 +357,9 @@ export class UsersService {
|
||||||
'userDetail.id',
|
'userDetail.id',
|
||||||
'userDetail.name',
|
'userDetail.name',
|
||||||
'userDetail.phone_number',
|
'userDetail.phone_number',
|
||||||
|
'userDetail.identity_number',
|
||||||
|
'userDetail.image_identity',
|
||||||
|
'userDetail.image_store',
|
||||||
])
|
])
|
||||||
.getOne();
|
.getOne();
|
||||||
const coa = await this.coaService.findByUser(id, coaType.WALLET);
|
const coa = await this.coaService.findByUser(id, coaType.WALLET);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user